From f221bc5ffcbde5997b9a9e78c576197c7def0bb9 Mon Sep 17 00:00:00 2001
From: JeethJJ <jihanjeed49@gmail.com>
Date: Mon, 11 Dec 2023 12:26:24 +0530
Subject: [PATCH 1/4] Add offline-invite-link API.

---
 modules/api-resources/api-resources-full/pom.xml  |  8 ++++++++
 .../src/main/webapp/WEB-INF/beans.xml             |  3 +++
 modules/api-resources/pom.xml                     | 15 +++++++++++++++
 modules/p2-profile-gen/pom.xml                    |  9 +++++++++
 pom.xml                                           |  9 +++++++--
 5 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
index 247b0b96686..c51c6ae0382 100644
--- a/modules/api-resources/api-resources-full/pom.xml
+++ b/modules/api-resources/api-resources-full/pom.xml
@@ -408,6 +408,14 @@
             <groupId>org.wso2.carbon.identity.server.api</groupId>
             <artifactId>org.wso2.carbon.identity.api.expired.password.identification.common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.user.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.user.onboard.v1</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.user.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.user.onboard.common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.local.auth.fido</groupId>
             <artifactId>org.wso2.carbon.identity.api.user.fido2</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 0e899a5e058..0ee0ff52f46 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
@@ -49,6 +49,7 @@
     <import resource="classpath:META-INF/cxf/input-validation-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/idle-account-identification-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/expired-password-identification-cxf.xml"/>
+    <import resource="classpath:META-INF/cxf/user-onboard-management-cxf.xml"/>
 
     <import resource="classpath:META-INF/cxf/identity-governance-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/admin-advisory-management-server-v1-cxf.xml"/>
@@ -214,6 +215,7 @@
             <bean class="org.wso2.carbon.identity.rest.api.user.totp.v1.MeApi"/>
             <bean class="org.wso2.carbon.identity.rest.api.user.idv.v1.MeApi"/>
             <bean class="org.wso2.carbon.identity.rest.api.user.idv.v1.DefaultApi"/>
+            <bean class="org.wso2.carbon.identity.api.user.onboard.v1.OfflineInviteLinkApi"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">
@@ -251,6 +253,7 @@
             <bean class="org.wso2.carbon.identity.rest.api.user.totp.v1.MeApi"/>
             <bean class="org.wso2.carbon.identity.rest.api.user.idv.v1.MeApi"/>
             <bean class="org.wso2.carbon.identity.rest.api.user.idv.v1.DefaultApi"/>
+            <bean class="org.wso2.carbon.identity.api.user.onboard.v1.OfflineInviteLinkApi"/>
         </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
index 3d7ad93cc0e..0dd7882cc07 100644
--- a/modules/api-resources/pom.xml
+++ b/modules/api-resources/pom.xml
@@ -213,6 +213,21 @@
                 <artifactId>org.wso2.carbon.identity.api.user.idv.common</artifactId>
                 <version>${identity.user.api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.user.api</groupId>
+                <artifactId>org.wso2.carbon.identity.api.user.onboard.v1</artifactId>
+                <version>${identity.user.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.user.api</groupId>
+                <artifactId>org.wso2.carbon.identity.api.user.onboard.common</artifactId>
+                <version>${identity.user.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.user.onboard.core.service</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.server.api</groupId>
                 <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index b23ac3f32ed..39e90d10876 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -370,6 +370,10 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.association.account:org.wso2.carbon.identity.user.account.association.feature:${identity.user.account.association.version}
                                 </featureArtifactDef>
+                                <!-- User Offline Onboard Feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.onboard.core.service.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
                                 <!-- Cipher tool feature -->
                                 <featureArtifactDef>
                                     org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher-tool.version}
@@ -1120,6 +1124,11 @@
                                     <id>org.wso2.ciphertool.feature.group</id>
                                     <version>${cipher-tool.version}</version>
                                 </feature>
+                                <!-- User Offline Onboard Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.onboard.core.service.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
                             </features>
                         </configuration>
                     </execution>
diff --git a/pom.xml b/pom.xml
index da42783a6ae..00c42d6f126 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2193,6 +2193,11 @@
                 <version>${apacheds.api.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.user.onboard.core.service</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -2253,7 +2258,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.600</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.605</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->
@@ -2368,7 +2373,7 @@
 
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
-        <identity.user.api.version>1.3.29</identity.user.api.version>
+        <identity.user.api.version>1.3.30</identity.user.api.version>
         <identity.server.api.version>1.2.137</identity.server.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>

From e5e3868090215880995362d43daeaa40c3fb7edc Mon Sep 17 00:00:00 2001
From: JeethJJ <jihanjeed49@gmail.com>
Date: Wed, 13 Dec 2023 11:54:54 +0530
Subject: [PATCH 2/4] Update dependency.

---
 modules/p2-profile-gen/pom.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 39e90d10876..839ede366fc 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -126,6 +126,11 @@
                                     org.wso2.carbon.identity.governance:org.wso2.carbon.identity.tenant.resource.manager.feature:${identity.governance.version}
                                 </featureArtifactDef>
 
+                                <!-- User Offline Onboard Feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.governance:org.wso2.carbon.identity.user.onboard.core.service.feature:${identity.governance.version}
+                                </featureArtifactDef>
+
                                 <!-- registry related features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version}
@@ -370,10 +375,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.association.account:org.wso2.carbon.identity.user.account.association.feature:${identity.user.account.association.version}
                                 </featureArtifactDef>
-                                <!-- User Offline Onboard Feature -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.onboard.core.service.feature:${carbon.identity.framework.version}
-                                </featureArtifactDef>
                                 <!-- Cipher tool feature -->
                                 <featureArtifactDef>
                                     org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher-tool.version}
@@ -758,6 +759,12 @@
                                     <version>${identity.governance.version}</version>
                                 </feature>
 
+                                <!-- User Offline Onboard Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.onboard.core.service</id>
+                                    <version>${identity.governance.version}</version>
+                                </feature>
+
                                 <!-- Features required for Cloud Identity -->
                                 <feature>
                                     <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
@@ -1124,11 +1131,6 @@
                                     <id>org.wso2.ciphertool.feature.group</id>
                                     <version>${cipher-tool.version}</version>
                                 </feature>
-                                <!-- User Offline Onboard Feature -->
-                                <feature>
-                                    <id>org.wso2.carbon.identity.user.onboard.core.service.feature.group</id>
-                                    <version>${carbon.identity.framework.version}</version>
-                                </feature>
                             </features>
                         </configuration>
                     </execution>

From bdfebbd4034213505f02b3afc7d3640adc343cfd Mon Sep 17 00:00:00 2001
From: JeethJJ <jihanjeed49@gmail.com>
Date: Thu, 14 Dec 2023 09:05:46 +0530
Subject: [PATCH 3/4] Update versions and dependencies.

---
 modules/api-resources/pom.xml |  5 -----
 pom.xml                       | 10 +++++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml
index 0dd7882cc07..c843dc8bc65 100644
--- a/modules/api-resources/pom.xml
+++ b/modules/api-resources/pom.xml
@@ -223,11 +223,6 @@
                 <artifactId>org.wso2.carbon.identity.api.user.onboard.common</artifactId>
                 <version>${identity.user.api.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.identity.framework</groupId>
-                <artifactId>org.wso2.carbon.identity.user.onboard.core.service</artifactId>
-                <version>${carbon.identity.framework.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.server.api</groupId>
                 <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/pom.xml b/pom.xml
index acb778e58b4..4cd6bb97189 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2194,9 +2194,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <groupId>org.wso2.carbon.identity.governance</groupId>
                 <artifactId>org.wso2.carbon.identity.user.onboard.core.service</artifactId>
-                <version>${carbon.identity.framework.version}</version>
+                <version>${identity.governance.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -2258,7 +2258,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.609</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.614</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->
@@ -2269,7 +2269,7 @@
         <carbon.consent.mgt.version>2.5.2</carbon.consent.mgt.version>
 
         <!--Identity Governance Version-->
-        <identity.governance.version>1.8.97</identity.governance.version>
+        <identity.governance.version>1.8.98</identity.governance.version>
 
         <!--Identity Carbon Versions-->
         <identity.carbon.auth.saml2.version>5.8.5</identity.carbon.auth.saml2.version>
@@ -2373,7 +2373,7 @@
 
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
-        <identity.user.api.version>1.3.29</identity.user.api.version>
+        <identity.user.api.version>1.3.30</identity.user.api.version>
         <identity.server.api.version>1.2.140</identity.server.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>

From b4157bfb1c5670f3dd2941d53e5954c96ff87f08 Mon Sep 17 00:00:00 2001
From: JeethJJ <jihanjeed49@gmail.com>
Date: Thu, 14 Dec 2023 09:09:11 +0530
Subject: [PATCH 4/4] Remove unwanted new line.

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 96191c976ae..40585d6c0a4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2376,7 +2376,6 @@
         <identity.user.api.version>1.3.30</identity.user.api.version>
         <identity.server.api.version>1.2.141</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>
         <identity.app.authz.xacml.version>2.3.1</identity.app.authz.xacml.version>