Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade carbon-multitenancy version #156

Closed
wants to merge 2 commits into from
Closed

Upgrade carbon-multitenancy version #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26e4f2f
Upgrade carbon-multitenancy version
asha15 Nov 1, 2024
c8966ba
Add testUtil dependency
asha15 Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions components/org.wso2.carbon.identity.organization.management.service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.testutil</artifactId>
<scope>test</scope>
</dependency>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason to add this dependency?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the version upgrade one of the test case started to fail, to resolve it added this dependency.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are already using organization management in framework [1]so ideally we shouldn't add dependency of framework in organization management. Otherwise we will be ended up with cycle dependency.
[1] https://github.com/wso2/carbon-identity-framework/blob/master/pom.xml#L1148-L1152

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack.

</dependencies>

<build>
Expand Down
11 changes: 9 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@
<scope>test</scope>
</dependency>

<!-- Common test utility -->
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.identity.testutil</artifactId>
<version>${carbon.identity.framework.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -274,6 +280,7 @@

<carbon.commons.imp.pkg.version.range>[4.7.0, 5.0.0)</carbon.commons.imp.pkg.version.range>

<carbon.identity.framework.version>7.6.1</carbon.identity.framework.version>
<osgi.framework.imp.pkg.version.range>[1.7.0, 2.0.0)</osgi.framework.imp.pkg.version.range>
<osgi.service.component.imp.pkg.version.range>[1.2.0, 2.0.0)</osgi.service.component.imp.pkg.version.range>

Expand All @@ -286,7 +293,7 @@
<org.wso2.identity.organization.mgt.imp.pkg.version.range>[1.0.0,2.0.0)
</org.wso2.identity.organization.mgt.imp.pkg.version.range>

<carbon.multitenancy.version>4.10.1</carbon.multitenancy.version>
<carbon.multitenancy.version>4.11.29</carbon.multitenancy.version>
<carbon.multitenancy.package.import.version.range>[4.7.0,5.0.0)
</carbon.multitenancy.package.import.version.range>

Expand All @@ -304,7 +311,7 @@

<mockito-core.version>4.6.1</mockito-core.version>
<jacoco.version>0.8.6</jacoco.version>
<testng.version>6.9.10</testng.version>
<testng.version>7.10.1</testng.version>
<maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
<h2database.version>1.4.199</h2database.version>

Expand Down
Loading