Resolve merge conflicts

wso2 · Oct 2, 2023 · dfab6bb · dfab6bb
2 parents ab67522 + a53fac3
commit dfab6bb
Show file tree

Hide file tree

Showing 44 changed files with 1,698 additions and 44 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -727,7 +727,8 @@ org.wso2.carbon.identity.api.server.notification.sender.v1-1.2.61.jar
 org.wso2.carbon.identity.api.server.fetch.remote.common-1.2.61.jar                                  bundle         apache2
 org.wso2.carbon.identity.api.user.functionality.common-1.3.13.jar                                   bundle         apache2
 org.wso2.carbon.identity.api.user.idv.common-1.3.13.jar                                             bundle         apache2
-org.wso2.carbon.identity.rest.api.user.recovery.v1-1.3.13.jar                                       bundle         apache2
+org.wso2.carbon.identity.rest.api.user.recovery.v1-1.3.20.jar                                       bundle         apache2
+org.wso2.carbon.identity.rest.api.user.recovery.v2-1.3.20.jar                                       bundle         apache2
 org.wso2.carbon.identity.api.server.idv.provider.common-1.2.61.jar                                  bundle         apache2
 org.wso2.carbon.identity.rest.api.user.authorized.apps.v2-1.3.13.jar                                bundle         apache2
 org.wso2.carbon.identity.api.server.identity.governance.common-1.2.61.jar                           bundle         apache2
@@ -758,7 +759,7 @@ org.wso2.carbon.identity.rest.api.user.backupcode.v1-1.3.13.jar
 org.wso2.carbon.api.server.consent.mgt-2.5.2.jar                                                    bundle         apache2
 org.wso2.carbon.identity.api.server.oidc.scope.management.common-1.2.61.jar                         bundle         apache2
 org.wso2.carbon.identity.api.server.script.library.common-1.2.61.jar                                bundle         apache2
-org.wso2.carbon.identity.api.user.recovery.commons-1.3.13.jar                                       bundle         apache2
+org.wso2.carbon.identity.api.user.recovery.commons-1.3.20.jar                                       bundle         apache2
 org.wso2.carbon.identity.api.server.branding.preference.management.v1-1.2.61.jar                    bundle         apache2
 org.wso2.carbon.identity.api.server.authenticators.v1-1.2.61.jar                                    bundle         apache2
 org.wso2.carbon.identity.api.server.configs.v1-1.2.61.jar                                           bundle         apache2

diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>api-resources</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>api-resources-full</artifactId>
-    <version>7.0.0-alpha-SNAPSHOT</version>
+    <version>7.0.0-m3-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>WSO2 Identity Server - All Rest API</name>
@@ -138,6 +138,10 @@
             <groupId>org.wso2.carbon.identity.user.api</groupId>
             <artifactId>org.wso2.carbon.identity.rest.api.user.recovery.v1</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.user.api</groupId>
+            <artifactId>org.wso2.carbon.identity.rest.api.user.recovery.v2</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.user.api</groupId>
             <artifactId>org.wso2.carbon.identity.api.user.recovery.commons</artifactId>
@@ -239,6 +243,15 @@
             <artifactId>org.wso2.carbon.identity.api.user.organization.common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.api.resource.v1</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.api.resource.common</artifactId>
+        </dependency>
+
         <!-- Server REST API Dependencies. -->
         <dependency>
             <groupId>org.wso2.carbon.identity.server.api</groupId>
@@ -480,5 +493,13 @@
             <groupId>org.wso2.carbon.identity.server.api</groupId>
             <artifactId>org.wso2.carbon.identity.api.server.organization.role.management.common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
+        </dependency>
     </dependencies>
 </project>
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
@@ -40,6 +40,7 @@
     <import resource="classpath:META-INF/cxf/idp-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/oidc-scope-management-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/user-recovery-v1-cxf.xml"/>
+    <import resource="classpath:META-INF/cxf/user-recovery-v2-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/script-libraries-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/configs-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/notification-sender-server-v1-cxf.xml"/>
@@ -58,6 +59,7 @@
     <import resource="classpath:META-INF/cxf/user-functionality-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/rfc-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/organization-user-invitation-mgt-v1-cxf.xml"/>
+    <import resource="classpath:META-INF/cxf/organization-configs-server-v1-cxf.xml"/>
 
     <!-- Legacy identity APIs   -->
     <import resource="classpath:META-INF/cxf/config-mgt-server-v1-cxf.xml"/>
@@ -74,6 +76,7 @@
     <import resource="classpath:META-INF/cxf/org-mgt-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/org-role-mgt-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/user-organization-v1-cxf.xml"/>
+    <import resource="classpath:META-INF/cxf/api-resource-server-v1-cxf.xml"/>
 
     <context:property-placeholder/>
     <context:annotation-config/>
@@ -116,7 +119,10 @@
             <bean class="org.wso2.carbon.identity.api.server.organization.management.v1.OrganizationsApi"/>
             <bean class="org.wso2.carbon.identity.api.server.organization.role.management.v1.OrganizationsApi"/>
             <bean class="org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.GuestsApi"/>
+            <bean class="org.wso2.carbon.identity.api.server.organization.configs.v1.OrganizationConfigsApi"/>
             <bean class="org.wso2.carbon.identity.api.expired.password.identification.v1.PasswordExpiredUsersApi"/>
+            <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.ApiResourcesApi"/>
+            <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApi"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">
@@ -216,6 +222,7 @@
             <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.MeApi"/>
             <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.UserIdApi"/>
             <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.AuthorizedAppsApi"/>
+            <bean class="org.wso2.carbon.identity.rest.api.user.recovery.v2.RecoveryApi"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">

diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>api-resources</artifactId>
-    <version>7.0.0-alpha-SNAPSHOT</version>
+    <version>7.0.0-m3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>WSO2 Identity Server - Rest API</name>
@@ -228,6 +228,11 @@
                 <artifactId>org.wso2.carbon.identity.rest.api.user.recovery.v1</artifactId>
                 <version>${identity.user.api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.user.api</groupId>
+                <artifactId>org.wso2.carbon.identity.rest.api.user.recovery.v2</artifactId>
+                <version>${identity.user.api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.user.api</groupId>
                 <artifactId>org.wso2.carbon.identity.api.user.recovery.commons</artifactId>
@@ -480,6 +485,16 @@
                 <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.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.organization.configs.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.organization.configs.common</artifactId>
+                <version>${identity.server.api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.server.api</groupId>
                 <artifactId>org.wso2.carbon.identity.api.expired.password.identification.v1</artifactId>
@@ -490,6 +505,16 @@
                 <artifactId>org.wso2.carbon.identity.api.expired.password.identification.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.api.resource.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.api.resource.common</artifactId>
+                <version>${identity.server.api.version}</version>
+            </dependency>
 
             <!-- Legacy API dependencies -->
             <dependency>

diff --git a/modules/authenticators/pom.xml b/modules/authenticators/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/callhome/pom.xml b/modules/callhome/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/connectors/pom.xml b/modules/connectors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/distribution/src/repository/resources/conf/catalina.properties b/modules/distribution/src/repository/resources/conf/catalina.properties
@@ -239,6 +239,7 @@ org.wso2.carbon.identity.rest.api.server.email.template.v1-*.jar,\
 org.wso2.carbon.identity.rest.api.user.application.v1-*.jar,\
 org.wso2.carbon.identity.rest.api.user.functionality.v1-*.jar,\
 org.wso2.carbon.identity.rest.api.user.recovery.v1-*.jar,\
+org.wso2.carbon.identity.rest.api.user.recovery.v2-*.jar,\
 org.wso2.carbon.identity.rest.api.user.totp.common-*.jar,\
 org.wso2.carbon.identity.rest.api.user.totp.v1-*.jar,\
 org.wso2.carbon.security.mgt.ui_*.jar,\

diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.0.0-alpha-SNAPSHOT</version>
+		<version>7.0.0-m3-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.0.0-alpha-SNAPSHOT</version>
+		<version>7.0.0-m3-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>7.0.0-alpha-SNAPSHOT</version>
+		<version>7.0.0-m3-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/modules/features/pom.xml b/modules/features/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>7.0.0-alpha-SNAPSHOT</version>
+    	<version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>7.0.0-alpha-SNAPSHOT</version>
+        <version>7.0.0-m3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>