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

Jump to bottom

Bump api server version #18166

Merged
merged 2 commits into from
Nov 29, 2023
Merged

Bump api server version #18166

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
a6ae14e
bump api server version
asha15 Nov 29, 2023
ced959b
Update testng.xml
asha15 Nov 29, 2023
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
8 changes: 0 additions & 8 deletions modules/api-resources/api-resources-full/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,6 @@
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
Expand Down
2 changes: 0 additions & 2 deletions modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<import resource="classpath:META-INF/cxf/permission-management-v1-cxf.xml"/>
<!--<import resource="classpath:META-INF/cxf/workflow-engine-server-v1-cxf.xml"/>-->
<import resource="classpath:META-INF/cxf/claim-management-server-v1-cxf.xml"/>
<import resource="classpath:META-INF/cxf/challenge-server-v1-cxf.xml"/>
<import resource="classpath:META-INF/cxf/email-template-server-v1-cxf.xml"/>
<import resource="classpath:META-INF/cxf/applications-server-v1-cxf.xml"/>
<import resource="classpath:META-INF/cxf/application-user-v1-cxf.xml"/>
Expand Down Expand Up @@ -92,7 +91,6 @@
</bean>
<jaxrs:server id="server" address="/server/v1">
<jaxrs:serviceBeans>
<bean class="org.wso2.carbon.identity.rest.api.server.challenge.v1.ChallengesApi"/>
<bean class="org.wso2.carbon.identity.rest.api.server.claim.management.v1.ClaimManagementApi"/>
<bean class="org.wso2.carbon.identity.rest.api.server.email.template.v1.EmailApi"/>
<bean class="org.wso2.carbon.identity.api.server.identity.governance.v1.IdentityGovernanceApi"/>
Expand Down
10 changes: 0 additions & 10 deletions modules/api-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,6 @@
<artifactId>org.wso2.carbon.identity.api.server.common</artifactId>
<version>${identity.server.api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
<version>${identity.server.api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
Expand All @@ -161,11 +156,6 @@
<artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management.common</artifactId>
<version>${identity.server.api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
<version>${identity.server.api.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
Expand Down
1 change: 0 additions & 1 deletion modules/distribution/src/repository/resources/conf/catalina.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ oauth-provider-*.jar,\
olingo-odata2-api-incubating-*.jar,\
olingo-odata2-core-incubating-*.jar,\
org.wso2.carbon.bootstrap-*.jar,\
org.wso2.carbon.identity.api.server.challenge.common-*.jar,\
org.wso2.carbon.identity.api.server.claim.management.common-*.jar,\
org.wso2.carbon.identity.api.server.common-*.jar,\
org.wso2.carbon.identity.api.user.approval.common-*.jar,\
Expand Down
3 changes: 2 additions & 1 deletion modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@
<class name="org.wso2.identity.integration.test.rest.api.user.application.v1.UserDiscoverableApplicationSuccessTest"/>
<class name="org.wso2.identity.integration.test.rest.api.user.application.v1.UserDiscoverableApplicationFailureTest"/>
<!--Test cases for server REST APIs-->
<class name="org.wso2.identity.integration.test.rest.api.server.challenge.v1.ServerChallengeTestCase"/>
<!--Disabling since the Challenge Question is provided as a connector and it does not exist in the product by default.-->
<!--<class name="org.wso2.identity.integration.test.rest.api.server.challenge.v1.ServerChallengeTestCase"/>-->
<class name="org.wso2.identity.integration.test.rest.api.server.claim.management.v1.ClaimManagementSuccessTest"/>
<class name="org.wso2.identity.integration.test.rest.api.server.claim.management.v1.ClaimManagementNegativeTest"/>
<class name="org.wso2.identity.integration.test.rest.api.server.email.template.v1.EmailTemplatesPositiveTest"/>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2410,7 +2410,7 @@
<!-- Identity REST API feature -->
<identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
<identity.user.api.version>1.3.27</identity.user.api.version>
<identity.server.api.version>1.2.128</identity.server.api.version>
<identity.server.api.version>1.2.130</identity.server.api.version>

<identity.agent.sso.version>5.5.9</identity.agent.sso.version>
<identity.tool.samlsso.validator.version>5.5.7</identity.tool.samlsso.validator.version>
Expand Down