[Spring Cleanup] Remove Spring Dependency from API user and recovery …

…endpoints (#22283)

* Add non spring custom servlet component

* Revert "Add non spring custom servlet component"

This reverts commit e6f9c88.

* Remove spring dependency from api user and recovery endpoints

* bump governance version

modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml

@@ -65,8 +65,6 @@
 
     <!-- Legacy identity APIs   -->
     <import resource="classpath:META-INF/cxf/config-mgt-server-v1-cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/user-recovery-v0-9-cxf.xml"/>
-    <import resource="classpath:META-INF/cxf/user-governance-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/user-fido2-v2-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/oauth2-dcr-v1-1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/oauth2-scope-v1-cxf.xml"/>
@@ -427,37 +425,6 @@
             <bean class="org.apache.cxf.jaxrs.ext.search.SearchContextProvider"/>
         </jaxrs:providers>
     </jaxrs:server>
-    <jaxrs:server id="recovery" address="/identity/recovery/v0.9">
-        <jaxrs:serviceBeans>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.ClaimsApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.RecoverPasswordApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.RecoverUsernameApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.SetPasswordApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.ValidateCodeApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.CaptchaApi"/>
-        </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.filter.ResponseValidationFilter" />
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.Exceptions.RecoveryEndpointExceptionMapper"/>
-        </jaxrs:providers>
-    </jaxrs:server>
-    <jaxrs:server id="userGovernance" address="/identity/user/v1.0">
-        <jaxrs:serviceBeans>
-            <bean class="org.wso2.carbon.identity.user.endpoint.IntrospectCodeApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.LiteApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.MeApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.PiInfoApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.ResendCodeApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.UpdateUsernameApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.ValidateCodeApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.ValidateUsernameApi"/>
-        </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.exceptions.UserEndpointExceptionMapper"/>
-        </jaxrs:providers>
-    </jaxrs:server>
     <jaxrs:server id="fido2v2" address="/users/v2/me/webauthn">
         <jaxrs:serviceBeans>
             <bean class="org.wso2.carbon.identity.application.authenticator.fido2.endpoint.DefaultApi"/>

modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/web.xml

@@ -35,14 +35,78 @@
         </listener-class>
     </listener>
 
+    <!--  Servlet instance for /identity/user/v1.0 -->
+    <servlet>
+        <servlet-name>IdentityUserV1ApiServlet</servlet-name>
+        <servlet-class>
+            org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
+        </servlet-class>
+        <load-on-startup>1</load-on-startup>
+        <init-param>
+            <param-name>jaxrs.serviceClasses</param-name>
+            <param-value>
+                org.wso2.carbon.identity.user.endpoint.IntrospectCodeApi,
+                org.wso2.carbon.identity.user.endpoint.LiteApi,
+                org.wso2.carbon.identity.user.endpoint.MeApi,
+                org.wso2.carbon.identity.user.endpoint.PiInfoApi,
+                org.wso2.carbon.identity.user.endpoint.ResendCodeApi,
+                org.wso2.carbon.identity.user.endpoint.UpdateUsernameApi,
+                org.wso2.carbon.identity.user.endpoint.ValidateCodeApi,
+                org.wso2.carbon.identity.user.endpoint.ValidateUsernameApi
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jaxrs.providers</param-name>
+            <param-value>
+                com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider,
+                org.wso2.carbon.identity.user.endpoint.exceptions.UserEndpointExceptionMapper
+            </param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>IdentityUserV1ApiServlet</servlet-name>
+        <url-pattern>/identity/user/v1.0/*</url-pattern>
+    </servlet-mapping>
+
+    <!--  Servlet instance for /identity/recovery/v0.9 -->
+    <servlet>
+        <servlet-name>IdentityRecoveryV0_9ApiServlet</servlet-name>
+        <servlet-class>
+            org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
+        </servlet-class>
+        <load-on-startup>1</load-on-startup>
+        <init-param>
+            <param-name>jaxrs.serviceClasses</param-name>
+            <param-value>
+                org.wso2.carbon.identity.recovery.endpoint.ClaimsApi,
+                org.wso2.carbon.identity.recovery.endpoint.RecoverPasswordApi,
+                org.wso2.carbon.identity.recovery.endpoint.RecoverUsernameApi,
+                org.wso2.carbon.identity.recovery.endpoint.SetPasswordApi,
+                org.wso2.carbon.identity.recovery.endpoint.ValidateCodeApi,
+                org.wso2.carbon.identity.recovery.endpoint.CaptchaApi
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jaxrs.providers</param-name>
+            <param-value>
+                com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider,
+                org.wso2.carbon.identity.recovery.endpoint.filter.ResponseValidationFilter,
+                org.wso2.carbon.identity.recovery.endpoint.Exceptions.RecoveryEndpointExceptionMapper
+            </param-value>
+        </init-param>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>IdentityRecoveryV0_9ApiServlet</servlet-name>
+        <url-pattern>/identity/recovery/v0.9/*</url-pattern>
+    </servlet-mapping>
+
     <servlet>
         <servlet-name>CXFServlet</servlet-name>
         <servlet-class>
             org.apache.cxf.transport.servlet.CXFServlet
         </servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-
     <servlet-mapping>
         <servlet-name>CXFServlet</servlet-name>
         <url-pattern>/*</url-pattern>

pom.xml

@@ -2367,7 +2367,7 @@
         <carbon.consent.mgt.version>2.6.4</carbon.consent.mgt.version>
 
         <!--Identity Governance Version-->
-        <identity.governance.version>1.11.26</identity.governance.version>
+        <identity.governance.version>1.11.30</identity.governance.version>
 
         <!--Identity Carbon Versions-->
         <identity.carbon.auth.saml2.version>5.9.8</identity.carbon.auth.saml2.version>