Merge pull request #18166 from asha15/api-server

Bump api server version
wso2 · Nov 29, 2023 · 681751a · 681751a
2 parents 6cd15dd + ced959b
commit 681751a
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 23 deletions.
diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
@@ -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>

diff --git a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml
@@ -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"/>
@@ -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"/>

diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml
@@ -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>
@@ -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>

diff --git a/modules/distribution/src/repository/resources/conf/catalina.properties b/modules/distribution/src/repository/resources/conf/catalina.properties
@@ -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,\

diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/testng.xml
@@ -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"/>

diff --git a/pom.xml b/pom.xml
@@ -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>