From a6ae14e10245e7fa6730a7dee0e25a3a4ef01ad5 Mon Sep 17 00:00:00 2001
From: asha15 <165079T@uom.lk>
Date: Wed, 29 Nov 2023 11:12:46 +0530
Subject: [PATCH 1/2] bump api server version

---
 modules/api-resources/api-resources-full/pom.xml       |  8 --------
 .../src/main/webapp/WEB-INF/beans.xml                  |  2 --
 modules/api-resources/pom.xml                          | 10 ----------
 .../src/repository/resources/conf/catalina.properties  |  1 -
 pom.xml                                                |  2 +-
 5 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
index 019d6a3b39..c6e277eaea 100644
--- 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
index 0af5503606..73dd2f07ec 100644
--- 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
index 1a43a02f1e..e25fc71bb5 100644
--- 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
index e5d2638422..b8e8a08dcb 100644
--- 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/pom.xml b/pom.xml
index b9982f9179..2138c02bc5 100755
--- 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>

From ced959bf40afd61d29c931cd578b45d3f1de5a71 Mon Sep 17 00:00:00 2001
From: Asha Sulaiman <165079T@uom.lk>
Date: Wed, 29 Nov 2023 13:18:21 +0530
Subject: [PATCH 2/2] Update testng.xml

comment ServerChallenge TestCase
---
 .../tests-backend/src/test/resources/testng.xml                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index 939b340274..32f35c0582 100644
--- 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"/>