From 44a2aa00a3c1bc3c340b1bbd95522b290a2ec26e Mon Sep 17 00:00:00 2001
From: ImalshaG <imalsha.sg@gmail.com>
Date: Mon, 18 Sep 2023 08:47:11 +0530
Subject: [PATCH 01/17] Add trusted tags to yaml loader options

---
 .../v1/core/ServerApplicationManagementService.java | 13 ++++++++++++-
 .../v1/core/ServerClaimManagementService.java       | 13 ++++++++++++-
 .../idp/v1/core/ServerIdpManagementService.java     | 11 ++++++++++-
 .../userstore/v1/core/ServerUserStoreService.java   | 11 ++++++++++-
 4 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationManagementService.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationManagementService.java
index 45c29a5228..2d21cc0176 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationManagementService.java
@@ -125,6 +125,8 @@
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.inspector.TagInspector;
+import org.yaml.snakeyaml.inspector.TrustedPrefixesTagInspector;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -686,7 +688,16 @@ private ServiceProvider parseServiceProviderFromYaml(SpFileContent spFileContent
             throws IdentityApplicationManagementException {
 
         try {
-            Yaml yaml = new Yaml(new Constructor(ServiceProvider.class, new LoaderOptions()));
+            // Add trusted tags included in the SP YAML file.
+            List<String> trustedTagList = new ArrayList<>();
+            trustedTagList.add(ServiceProvider.class.getName());
+            trustedTagList.add(OAuthAppDO.class.getName());
+            trustedTagList.add(SAMLSSOServiceProviderDTO.class.getName());
+
+            LoaderOptions loaderOptions = new LoaderOptions();
+            TagInspector tagInspector = new TrustedPrefixesTagInspector(trustedTagList);
+            loaderOptions.setTagInspector(tagInspector);
+            Yaml yaml = new Yaml(new Constructor(ServiceProvider.class, loaderOptions));
             return yaml.loadAs(spFileContent.getContent(), ServiceProvider.class);
         } catch (YAMLException e) {
             throw new IdentityApplicationManagementException(String.format("Error in reading YAML Service Provider " +
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/main/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/core/ServerClaimManagementService.java b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/main/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/core/ServerClaimManagementService.java
index 97ca0dc8df..51369de3a1 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/main/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/core/ServerClaimManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/src/main/java/org/wso2/carbon/identity/rest/api/server/claim/management/v1/core/ServerClaimManagementService.java
@@ -62,6 +62,8 @@
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.inspector.TagInspector;
+import org.yaml.snakeyaml.inspector.TrustedPrefixesTagInspector;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -1155,7 +1157,16 @@ private ClaimDialectConfiguration parseClaimDialectFromJson(FileContent fileCont
     private ClaimDialectConfiguration parseClaimDialectFromYaml(FileContent fileContent) throws ClaimMetadataException {
 
         try {
-            Yaml yaml = new Yaml(new Constructor(ClaimDialectConfiguration.class, new LoaderOptions()));
+            // Add trusted tags included in the Claims YAML files.
+            List<String> trustedTagList = new ArrayList<>();
+            trustedTagList.add(ClaimDialectConfiguration.class.getName());
+            trustedTagList.add(ExternalClaimResDTO.class.getName());
+            trustedTagList.add(LocalClaimResDTO.class.getName());
+
+            LoaderOptions loaderOptions = new LoaderOptions();
+            TagInspector tagInspector = new TrustedPrefixesTagInspector(trustedTagList);
+            loaderOptions.setTagInspector(tagInspector);
+            Yaml yaml = new Yaml(new Constructor(ClaimDialectConfiguration.class, loaderOptions));
             return yaml.loadAs(fileContent.getContent(), ClaimDialectConfiguration.class);
         } catch (YAMLException e) {
             throw new ClaimMetadataException(String.format(
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/java/org/wso2/carbon/identity/api/server/idp/v1/core/ServerIdpManagementService.java b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/java/org/wso2/carbon/identity/api/server/idp/v1/core/ServerIdpManagementService.java
index 30f1f70d0d..6d3fcb5fb2 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/java/org/wso2/carbon/identity/api/server/idp/v1/core/ServerIdpManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/src/main/java/org/wso2/carbon/identity/api/server/idp/v1/core/ServerIdpManagementService.java
@@ -118,6 +118,8 @@
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.inspector.TagInspector;
+import org.yaml.snakeyaml.inspector.TrustedPrefixesTagInspector;
 import org.yaml.snakeyaml.representer.Representer;
 
 import java.io.IOException;
@@ -3696,7 +3698,14 @@ private IdentityProvider parseIdpFromYaml(FileContent fileContent)
             throws IdentityProviderManagementClientException {
 
         try {
-            Yaml yaml = new Yaml(new Constructor(IdentityProvider.class, new LoaderOptions()));
+            // Add trusted tags included in the IDP YAML files.
+            List<String> trustedTagList = new ArrayList<>();
+            trustedTagList.add(IdentityProvider.class.getName());
+
+            LoaderOptions loaderOptions = new LoaderOptions();
+            TagInspector tagInspector = new TrustedPrefixesTagInspector(trustedTagList);
+            loaderOptions.setTagInspector(tagInspector);
+            Yaml yaml = new Yaml(new Constructor(IdentityProvider.class, loaderOptions));
             return yaml.loadAs(fileContent.getContent(), IdentityProvider.class);
         } catch (YAMLException e) {
             throw new IdentityProviderManagementClientException(String.format("Error in reading YAML file " +
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/core/ServerUserStoreService.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/core/ServerUserStoreService.java
index 2fea6c2b1c..f4726e3218 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/core/ServerUserStoreService.java
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/core/ServerUserStoreService.java
@@ -80,6 +80,8 @@
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.inspector.TagInspector;
+import org.yaml.snakeyaml.inspector.TrustedPrefixesTagInspector;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -1661,7 +1663,14 @@ private UserStoreConfigurations parseUserStoreFromXml(FileContent fileContent) t
     private UserStoreConfigurations parseUserStoreFromYaml(FileContent fileContent) throws UserStoreException {
 
         try {
-            Yaml yaml = new Yaml(new Constructor(UserStoreConfigurations.class, new LoaderOptions()));
+            // Add trusted tags included in the Userstore YAML files.
+            List<String> trustedTagList = new ArrayList<>();
+            trustedTagList.add(UserStoreConfigurations.class.getName());
+
+            LoaderOptions loaderOptions = new LoaderOptions();
+            TagInspector tagInspector = new TrustedPrefixesTagInspector(trustedTagList);
+            loaderOptions.setTagInspector(tagInspector);
+            Yaml yaml = new Yaml(new Constructor(UserStoreConfigurations.class, loaderOptions));
             return yaml.loadAs(fileContent.getContent(), UserStoreConfigurations.class);
         } catch (YAMLException e) {
             throw new UserStoreException(String.format("Error in reading YAML file " +

From aa3aaa1ea901569f12a014c570fc6dd3babd5094 Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Mon, 18 Sep 2023 11:27:18 +0530
Subject: [PATCH 02/17] Bump framework

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

diff --git a/pom.xml b/pom.xml
index 61bc07d953..0e183b1778 100644
--- a/pom.xml
+++ b/pom.xml
@@ -706,7 +706,7 @@
         <maven.buildnumber.plugin.version>1.4</maven.buildnumber.plugin.version>
         <org.apache.felix.annotations.version>1.2.4</org.apache.felix.annotations.version>
         <identity.governance.version>1.8.62</identity.governance.version>
-        <carbon.identity.framework.version>5.25.305</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.337</carbon.identity.framework.version>
         <maven.findbugsplugin.version>3.0.5</maven.findbugsplugin.version>
         <identity.workflow.impl.bps.version>5.2.0</identity.workflow.impl.bps.version>
         <maven.checkstyleplugin.excludes>**/gen/**/*</maven.checkstyleplugin.excludes>

From bf7c7f79607d07292944c0648fd997b5d64e9d9f Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 18 Sep 2023 06:40:11 +0000
Subject: [PATCH 03/17] [WSO2 Release] [Jenkins #817] [Release 1.2.81] prepare
 release v1.2.81

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.challenge/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.fetch.remote/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 88 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index 6225c90db9..ba9b8cba60 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 451edb8873..39468e33c0 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 0e888b3cde..8bba94afd8 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 512e3e4161..046640c303 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 5a4a360cb0..8501dd950f 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index 5046ea302e..dbd58116db 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 3e2e7b4369..3b60491857 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 7afb07eb6a..736f27fe69 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 4e7582ab77..0d348f647d 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 71a764c371..ce2fee6bbd 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.81-SNAPSHOT</version>
+    <version>1.2.81</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 25b06f9c32..9068d72587 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.2.81-SNAPSHOT</version>
+    <version>1.2.81</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 1a5cfeba77..bb4a42ce5e 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.81-SNAPSHOT</version>
+    <version>1.2.81</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 0bc7b28500..3d4215bdb1 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index abdf873403..317f85d7ed 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 83b5f638c4..34bce61f86 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 509e9bc062..65c41a8e48 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index 7aab644482..b260f2d00b 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 5037d25d8f..c59490a7bc 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
index d5074e08e2..a5c1f2618b 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
index bfd9a56865..75836652fc 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
index a54e116059..5ccea332eb 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 1ff0ff4010..429302ec18 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 8107a83d12..d82d798f78 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 784fa99b15..7034d7b86b 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index 8d7d4337f4..53a5d0f8f0 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 08adae3e23..8b785760f9 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 27a6f36696..6420b02e1f 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index b94b19f523..6f0f3ed252 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index 602f08740e..96b4756b4e 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index e812493f6d..cdf735a9b5 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 19d1551788..8e0cfab4fd 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index efa7453715..c5fc560f49 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 255e43de01..b132b3dea7 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index c9ae192df3..613f24ff60 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index c0239b3997..87b18813dc 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 3a6dc09b43..80d370443e 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 68d1df9c0f..61b9db57e4 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
index cfd32d247e..4a58088d08 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
index 949b6d82f4..37b78418bb 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
index c6e29f47f6..2abb33dd1c 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 4aba601351..16b7839b24 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index 08b3510c34..6adb32ed7b 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 490ba72bbe..312bf3cc13 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index e0eeeaf768..94051220a0 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index f96d8c5a19..3688a65dee 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 99c7bc8594..24986943f9 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 49f5f52dba..eb4e4b9b1d 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index b6e61e8f33..7fafe174f9 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 90585faf40..1664558c16 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 24f78e1002..1e76a4c31f 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 597a7938e6..028e1cd1b6 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.2.81-SNAPSHOT</version>
+    <version>1.2.81</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 86d9164506..0921e08cb8 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index c0d612416a..33eeddfeea 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 3863c4e4aa..97ffa7ffc6 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index e8fbfbedc1..7f8721c465 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index c5c78a94b5..0103e01138 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index f35fa70e74..8ed38c682f 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 1fa1a4db33..6bc5ea0038 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index f431d212d2..89e98353b2 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index d5451b340c..30d2688ab3 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 4214098884..23c761251c 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 0612e3636b..da9058fa8e 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 4ae7bd7944..44b51e6b5d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 41a27c50bc..f526c2519d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 3e4f0d0f58..7c095197b2 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index dd0e2a878a..c58cdb1784 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index b0910d334a..14d35ae7a5 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index c7a8f7ccb7..5e69b19a75 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 8e029b805c..e9732783c0 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 9274a2a1c1..464a66515b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 77753e7187..50f995980f 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index bd52d77bf8..a5932d9a8d 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index b7db6e5130..66e255531d 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 4aa9df1666..6afde8c55f 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index 9f88c19816..f42ced43c3 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index c37a6886de..eea0fb5c31 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 72d592edc5..3b73453ef3 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 808a484b6c..2279d8e14f 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index be7addcc36..b582b9c420 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 951297580a..82189c104f 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 84637dc3e2..7e72f49fcb 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index fb516fb02f..8c47dc871f 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 35eab550c6..572375970b 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 94341e475b..873cf98f92 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 8d2cd35f46..78add29d1c 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
index 267edc8345..761081ccea 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.workflow.engine</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
index d795402818..d0010756ad 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.81</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 61bc07d953..ac62e2de16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.81-SNAPSHOT</version>
+    <version>1.2.81</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.2.81</tag>
     </scm>
 
 

From f64d32421f3f9dbd7724f3e83fcbdcfd3d1da1b3 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 18 Sep 2023 06:40:14 +0000
Subject: [PATCH 04/17] [WSO2 Release] [Jenkins #817] [Release 1.2.81] prepare
 for next development iteration

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.challenge/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.fetch.remote/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 88 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index ba9b8cba60..ca22c3df21 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 39468e33c0..6d09b964df 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 8bba94afd8..fb1a959856 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 046640c303..09e771df99 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 8501dd950f..651c9a4e52 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index dbd58116db..d53d0f6019 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 3b60491857..d8023150aa 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 736f27fe69..85cad15476 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 0d348f647d..d3220e3965 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index ce2fee6bbd..456cdfcbb7 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.81</version>
+    <version>1.2.82-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 9068d72587..fb533c8264 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.2.81</version>
+    <version>1.2.82-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index bb4a42ce5e..2238898f6d 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.81</version>
+    <version>1.2.82-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 3d4215bdb1..281c19640e 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 317f85d7ed..5cedaa7e3a 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 34bce61f86..33e39bb6d7 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 65c41a8e48..9fe3b2f5f8 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index b260f2d00b..b758fc7573 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index c59490a7bc..20837cb267 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
index a5c1f2618b..384cd7e279 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
index 75836652fc..0714c924dd 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
index 5ccea332eb..5a65114d9a 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 429302ec18..5faba17d2b 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index d82d798f78..dd66d6dd84 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 7034d7b86b..3753943164 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index 53a5d0f8f0..e295c61b20 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 8b785760f9..8751337647 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 6420b02e1f..71a4ff4eff 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 6f0f3ed252..569fb11e63 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index 96b4756b4e..1c736ed3d4 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index cdf735a9b5..ad1957c6e8 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 8e0cfab4fd..663322f21f 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index c5fc560f49..a83e963000 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index b132b3dea7..9e9e70f041 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 613f24ff60..b115d352b8 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 87b18813dc..ea47b202af 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 80d370443e..7399a01372 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 61b9db57e4..2c4306f0bc 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
index 4a58088d08..111fa579e2 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
index 37b78418bb..577c1b8945 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
index 2abb33dd1c..652463d6e2 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 16b7839b24..c615a4d36b 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index 6adb32ed7b..2a5368729b 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 312bf3cc13..33dec82dbe 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index 94051220a0..7d36d0f752 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 3688a65dee..a8901673f2 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 24986943f9..8e9d01728e 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index eb4e4b9b1d..58fa34043b 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 7fafe174f9..206d6a416e 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 1664558c16..172a9aa9d2 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 1e76a4c31f..f9e4f872b4 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 028e1cd1b6..669f80ba0d 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.2.81</version>
+    <version>1.2.82-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 0921e08cb8..08b6902ec3 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 33eeddfeea..2fb4c093fd 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 97ffa7ffc6..c0b083afd2 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 7f8721c465..4a0276d1c2 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 0103e01138..eea6f8f5ff 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 8ed38c682f..d77aa2248a 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 6bc5ea0038..d110c82aa9 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 89e98353b2..d700e60dbf 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 30d2688ab3..4f5239549a 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 23c761251c..afc2eddabb 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index da9058fa8e..b620f8fd9b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 44b51e6b5d..27f668dd9a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index f526c2519d..770b9863ff 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 7c095197b2..cb6687a245 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index c58cdb1784..cf1b4b0453 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index 14d35ae7a5..fa21166965 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 5e69b19a75..fef2c3e65c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index e9732783c0..536f7e7cde 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 464a66515b..7825bd072d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 50f995980f..09dc7c4e3f 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index a5932d9a8d..62508e2891 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index 66e255531d..bec119a9f8 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 6afde8c55f..915f2e1350 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index f42ced43c3..c38c9cb79c 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index eea0fb5c31..4a8c3d2098 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 3b73453ef3..e6e576dbae 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 2279d8e14f..927c648aca 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index b582b9c420..95c426d760 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 82189c104f..ea29c60895 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 7e72f49fcb..b4a8f41982 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 8c47dc871f..f13252ef97 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 572375970b..576234310b 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 873cf98f92..15fd41de82 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 78add29d1c..012e33c581 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
index 761081ccea..c09877d09f 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.workflow.engine</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
index d0010756ad..d3da4f54b0 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index ac62e2de16..05df457b37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.81</version>
+    <version>1.2.82-SNAPSHOT</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>v1.2.81</tag>
+        <tag>HEAD</tag>
     </scm>
 
 

From bdf2a5daa680f160120d9d0692d85f209b59e8d2 Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Wed, 23 Aug 2023 11:18:16 +0530
Subject: [PATCH 05/17] Add api resource mgt API

---
 .../pom.xml                                   |  73 ++
 .../APIResourceManagementServiceHolder.java   |  71 ++
 .../APIResourceMgtOSGiServiceFactory.java     |  50 ++
 .../factory/OAuthAdminOSGiServiceFactory.java |  53 ++
 .../pom.xml                                   | 192 +++++
 .../resource/v1/APIResourceCreationModel.java | 198 +++++
 .../api/resource/v1/APIResourceListItem.java  | 211 +++++
 .../resource/v1/APIResourceListResponse.java  | 161 ++++
 .../resource/v1/APIResourcePatchModel.java    | 183 ++++
 .../api/resource/v1/APIResourceResponse.java  | 296 +++++++
 .../api/resource/v1/ApiResourcesApi.java      | 224 +++++
 .../resource/v1/ApiResourcesApiService.java   |  43 +
 .../api/server/api/resource/v1/Error.java     | 161 ++++
 .../api/resource/v1/PaginationLink.java       | 119 +++
 .../api/resource/v1/ScopeCreationModel.java   | 142 ++++
 .../server/api/resource/v1/ScopeGetModel.java | 167 ++++
 .../api/server/api/resource/v1/ScopesApi.java |  69 ++
 .../api/resource/v1/ScopesApiService.java     |  35 +
 .../v1/SubscribedApplicationGetModel.java     | 119 +++
 .../ApiResourcesApiServiceFactory.java        |  32 +
 .../v1/factories/ScopesApiServiceFactory.java |  32 +
 .../APIResourceMgtEndpointConstants.java      | 122 +++
 .../ServerAPIResourceManagementService.java   | 468 +++++++++++
 .../APIResourceMgtEndpointException.java      |  38 +
 .../v1/impl/ApiResourcesApiServiceImpl.java   | 103 +++
 .../v1/impl/ScopesApiServiceImpl.java         |  39 +
 .../v1/util/APIResourceMgtEndpointUtil.java   | 183 ++++
 .../src/main/resources/APIResources.yaml      | 780 ++++++++++++++++++
 .../cxf/api-resource-server-v1-cxf.xml        |  38 +
 .../pom.xml                                   |  38 +
 pom.xml                                       |  13 +
 31 files changed, 4453 insertions(+)
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceCreationModel.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceListItem.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceListResponse.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourcePatchModel.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceResponse.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApiService.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/Error.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/PaginationLink.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopeCreationModel.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopeGetModel.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApiService.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/SubscribedApplicationGetModel.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ApiResourcesApiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ScopesApiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/constants/APIResourceMgtEndpointConstants.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/exception/APIResourceMgtEndpointException.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ApiResourcesApiServiceImpl.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/util/APIResourceMgtEndpointUtil.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/APIResources.yaml
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/META-INF/cxf/api-resource-server-v1-cxf.xml
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/pom.xml

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
new file mode 100644
index 0000000000..a150b8a81b
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wso2.carbon.identity.server.api</groupId>
+        <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
+        <version>1.2.79-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.wso2.carbon.identity.api.server.api.resource.common</artifactId>
+    <version>1.2.79-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.api.resource.mgt</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
+            <artifactId>org.wso2.carbon.identity.oauth</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java
new file mode 100644
index 0000000000..01042f8d08
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.common;
+
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
+import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
+
+/**
+ * Service holder class for api resource management.
+ */
+public class APIResourceManagementServiceHolder {
+
+    private static APIResourceManager apiResourceManager;
+    private static OAuthAdminServiceImpl oAuthAdminServiceImpl;
+
+    /**
+     * Get APIResourceManager osgi service.
+     *
+     * @return APIResourceManager.
+     */
+    public static APIResourceManager getApiResourceManager() {
+
+        return apiResourceManager;
+    }
+
+    /**
+     * Set APIResourceManager osgi service.
+     *
+     * @param apiResourceManager APIResourceManager.
+     */
+    public static void setApiResourceManager(APIResourceManager apiResourceManager) {
+
+        APIResourceManagementServiceHolder.apiResourceManager = apiResourceManager;
+    }
+
+    /**
+     * Get OAuthAdminServiceImpl instance.
+     *
+     * @return OAuthAdminServiceImpl instance.
+     */
+    public static OAuthAdminServiceImpl getOAuthAdminServiceImpl() {
+
+        return oAuthAdminServiceImpl;
+    }
+
+    /**
+     * Set OAuthAdminServiceImpl instance.
+     *
+     * @param oAuthAdminServiceImpl OAuthAdminServiceImpl instance.
+     */
+    public static void setOAuthAdminServiceImpl(OAuthAdminServiceImpl oAuthAdminServiceImpl) {
+
+        APIResourceManagementServiceHolder.oAuthAdminServiceImpl = oAuthAdminServiceImpl;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java
new file mode 100644
index 0000000000..953bd1cfd5
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.common.factory;
+
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
+
+/**
+ * Factory class for APIResourceManagementOSGiService.
+ */
+public class APIResourceMgtOSGiServiceFactory extends AbstractFactoryBean<APIResourceManager> {
+
+    private APIResourceManager apiResourceManager;
+
+    @Override
+    public Class<?> getObjectType() {
+
+        return Object.class;
+    }
+
+    @Override
+    protected APIResourceManager createInstance() throws Exception {
+
+        if (this.apiResourceManager == null) {
+            apiResourceManager = (APIResourceManager) PrivilegedCarbonContext.
+                    getThreadLocalCarbonContext().getOSGiService(APIResourceManager.class, null);
+            if (apiResourceManager == null) {
+                throw new Exception("Unable to retrieve APIResourceManager service.");
+            }
+        }
+        return this.apiResourceManager;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java
new file mode 100644
index 0000000000..e160b1eb4b
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.common.factory;
+
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
+
+/**
+ * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
+ * instantiate the OAuthAdminServiceImpl type of object inside the container.
+ */
+public class OAuthAdminOSGiServiceFactory extends AbstractFactoryBean<OAuthAdminServiceImpl> {
+
+    private OAuthAdminServiceImpl oauthAdminService;
+
+    @Override
+    public Class<?> getObjectType() {
+
+        return Object.class;
+    }
+
+    @Override
+    protected OAuthAdminServiceImpl createInstance() throws Exception {
+
+        if (this.oauthAdminService == null) {
+            oauthAdminService = (OAuthAdminServiceImpl) PrivilegedCarbonContext
+                    .getThreadLocalCarbonContext().getOSGiService(OAuthAdminServiceImpl.class, null);
+
+            if (oauthAdminService == null) {
+                throw new Exception("Unable to retrieve OAuthAdminServiceImpl service.");
+            }
+        }
+        return this.oauthAdminService;
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
new file mode 100644
index 0000000000..68d3c26206
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wso2.carbon.identity.server.api</groupId>
+        <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
+        <version>1.2.79-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <name>WSO2 Identity Server - Applications Rest API</name>
+    <description>WSO2 Identity Server - API Resource Rest API</description>
+    <artifactId>org.wso2.carbon.identity.api.server.api.resource.v1</artifactId>
+    <version>1.2.79-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.organization.management.core</groupId>
+            <artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-service-description</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-jaxrs</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-yaml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>jsr311-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.api.resource.mgt</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-extension-search</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.api.resource.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <artifactId>org.wso2.carbon.identity.application.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
+            <artifactId>org.wso2.carbon.identity.oauth</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+<!--                        <plugin>-->
+<!--                            <groupId>org.openapitools</groupId>-->
+<!--                            <artifactId>openapi-generator-maven-plugin</artifactId>-->
+<!--                            <version>4.1.2</version>-->
+<!--                            <executions>-->
+<!--                                <execution>-->
+<!--                                    <goals>-->
+<!--                                        <goal>generate</goal>-->
+<!--                                    </goals>-->
+<!--                                    <configuration>-->
+<!--                                        <inputSpec>${project.basedir}/src/main/resources/apiResources.yaml</inputSpec>-->
+<!--                                        <generatorName>org.wso2.carbon.codegen.CxfWso2Generator</generatorName>-->
+<!--                                        <configOptions>-->
+<!--                                            <sourceFolder>src/gen/java</sourceFolder>-->
+<!--                                            <apiPackage>org.wso2.carbon.identity.api.server.api.resource.v1</apiPackage>-->
+<!--                                            <modelPackage>org.wso2.carbon.identity.api.server.api.resource.v1-->
+<!--                                            </modelPackage>-->
+<!--                                            <packageName>org.wso2.carbon.identity.api.server.api.resource.v1</packageName>-->
+<!--                                            <dateLibrary>java17</dateLibrary>-->
+<!--                                            <hideGenerationTimestamp>true</hideGenerationTimestamp>-->
+<!--                                            <ignoreFileOverride>${project.basedir}/.openapi-generator-ignore</ignoreFileOverride>-->
+<!--                                        </configOptions>-->
+<!--                                        <output>.</output>-->
+<!--                                        <skipOverwrite>false</skipOverwrite>-->
+<!--                                    </configuration>-->
+<!--                                </execution>-->
+<!--                            </executions>-->
+<!--                            <dependencies>-->
+<!--                                <dependency>-->
+<!--                                    <groupId>org.openapitools</groupId>-->
+<!--                                    <artifactId>cxf-wso2-openapi-generator</artifactId>-->
+<!--                                    <version>1.0.0</version>-->
+<!--                                </dependency>-->
+<!--                            </dependencies>-->
+<!--                        </plugin>-->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/gen/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceCreationModel.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceCreationModel.java
new file mode 100644
index 0000000000..3e60430092
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceCreationModel.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeCreationModel;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class APIResourceCreationModel  {
+  
+    private String name;
+    private String identifier;
+    private String description;
+    private Boolean requiresAuthorization;
+    private List<ScopeCreationModel> scopes = null;
+
+
+    /**
+    **/
+    public APIResourceCreationModel name(String name) {
+
+        this.name = name;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Greetings API", required = true, value = "")
+    @JsonProperty("name")
+    @Valid
+    @NotNull(message = "Property name cannot be null.")
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+    **/
+    public APIResourceCreationModel identifier(String identifier) {
+
+        this.identifier = identifier;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "greetings_api", required = true, value = "")
+    @JsonProperty("identifier")
+    @Valid
+    @NotNull(message = "Property identifier cannot be null.")
+
+    public String getIdentifier() {
+        return identifier;
+    }
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    /**
+    **/
+    public APIResourceCreationModel description(String description) {
+
+        this.description = description;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Greetings API representation", value = "")
+    @JsonProperty("description")
+    @Valid
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+    **/
+    public APIResourceCreationModel requiresAuthorization(Boolean requiresAuthorization) {
+
+        this.requiresAuthorization = requiresAuthorization;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "true", value = "")
+    @JsonProperty("requiresAuthorization")
+    @Valid
+    public Boolean getRequiresAuthorization() {
+        return requiresAuthorization;
+    }
+    public void setRequiresAuthorization(Boolean requiresAuthorization) {
+        this.requiresAuthorization = requiresAuthorization;
+    }
+
+    /**
+    **/
+    public APIResourceCreationModel scopes(List<ScopeCreationModel> scopes) {
+
+        this.scopes = scopes;
+        return this;
+    }
+    
+    @ApiModelProperty(value = "")
+    @JsonProperty("scopes")
+    @Valid
+    public List<ScopeCreationModel> getScopes() {
+        return scopes;
+    }
+    public void setScopes(List<ScopeCreationModel> scopes) {
+        this.scopes = scopes;
+    }
+
+    public APIResourceCreationModel addScopesItem(ScopeCreationModel scopesItem) {
+        if (this.scopes == null) {
+            this.scopes = new ArrayList<ScopeCreationModel>();
+        }
+        this.scopes.add(scopesItem);
+        return this;
+    }
+
+    
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        APIResourceCreationModel apIResourceCreationModel = (APIResourceCreationModel) o;
+        return Objects.equals(this.name, apIResourceCreationModel.name) &&
+            Objects.equals(this.identifier, apIResourceCreationModel.identifier) &&
+            Objects.equals(this.description, apIResourceCreationModel.description) &&
+            Objects.equals(this.requiresAuthorization, apIResourceCreationModel.requiresAuthorization) &&
+            Objects.equals(this.scopes, apIResourceCreationModel.scopes);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, identifier, description, requiresAuthorization, scopes);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class APIResourceCreationModel {\n");
+        
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    identifier: ").append(toIndentedString(identifier)).append("\n");
+        sb.append("    description: ").append(toIndentedString(description)).append("\n");
+        sb.append("    requiresAuthorization: ").append(toIndentedString(requiresAuthorization)).append("\n");
+        sb.append("    scopes: ").append(toIndentedString(scopes)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceListItem.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceListItem.java
new file mode 100644
index 0000000000..ef343a122c
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceListItem.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class APIResourceListItem  {
+  
+    private String id;
+    private String name;
+    private String identifier;
+    private String type;
+    private Boolean requiresAuthorization;
+    private String self;
+
+    /**
+    **/
+    public APIResourceListItem id(String id) {
+
+        this.id = id;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "gh43-jk34-vb34-df67", required = true, value = "")
+    @JsonProperty("id")
+    @Valid
+    @NotNull(message = "Property id cannot be null.")
+
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+    **/
+    public APIResourceListItem name(String name) {
+
+        this.name = name;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Greetings API", required = true, value = "")
+    @JsonProperty("name")
+    @Valid
+    @NotNull(message = "Property name cannot be null.")
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+    **/
+    public APIResourceListItem identifier(String identifier) {
+
+        this.identifier = identifier;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "greetings_api", required = true, value = "")
+    @JsonProperty("identifier")
+    @Valid
+    @NotNull(message = "Property identifier cannot be null.")
+
+    public String getIdentifier() {
+        return identifier;
+    }
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    /**
+    **/
+    public APIResourceListItem type(String type) {
+
+        this.type = type;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "SYSTEM", value = "")
+    @JsonProperty("type")
+    @Valid
+    public String getType() {
+        return type;
+    }
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+    **/
+    public APIResourceListItem requiresAuthorization(Boolean requiresAuthorization) {
+
+        this.requiresAuthorization = requiresAuthorization;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "true", value = "")
+    @JsonProperty("requiresAuthorization")
+    @Valid
+    public Boolean getRequiresAuthorization() {
+        return requiresAuthorization;
+    }
+    public void setRequiresAuthorization(Boolean requiresAuthorization) {
+        this.requiresAuthorization = requiresAuthorization;
+    }
+
+    /**
+    **/
+    public APIResourceListItem self(String self) {
+
+        this.self = self;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "/t/carbon.super/api/server/v1/api-resources/eDUwOUNlcnRpZmljYXRlQXV0aGVudGljYXRvcg", required = true, value = "")
+    @JsonProperty("self")
+    @Valid
+    @NotNull(message = "Property self cannot be null.")
+
+    public String getSelf() {
+        return self;
+    }
+    public void setSelf(String self) {
+        this.self = self;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        APIResourceListItem apIResourceListItem = (APIResourceListItem) o;
+        return Objects.equals(this.id, apIResourceListItem.id) &&
+            Objects.equals(this.name, apIResourceListItem.name) &&
+            Objects.equals(this.identifier, apIResourceListItem.identifier) &&
+            Objects.equals(this.type, apIResourceListItem.type) &&
+            Objects.equals(this.requiresAuthorization, apIResourceListItem.requiresAuthorization) &&
+            Objects.equals(this.self, apIResourceListItem.self);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, identifier, type, requiresAuthorization, self);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class APIResourceListItem {\n");
+        
+        sb.append("    id: ").append(toIndentedString(id)).append("\n");
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    identifier: ").append(toIndentedString(identifier)).append("\n");
+        sb.append("    type: ").append(toIndentedString(type)).append("\n");
+        sb.append("    requiresAuthorization: ").append(toIndentedString(requiresAuthorization)).append("\n");
+        sb.append("    self: ").append(toIndentedString(self)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceListResponse.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceListResponse.java
new file mode 100644
index 0000000000..3fcf0ec56e
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceListResponse.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceListItem;
+import org.wso2.carbon.identity.api.server.api.resource.v1.PaginationLink;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class APIResourceListResponse  {
+  
+    private Integer totalResults;
+    private List<PaginationLink> links = new ArrayList<PaginationLink>();
+
+    private List<APIResourceListItem> apiResources = null;
+
+
+    /**
+    **/
+    public APIResourceListResponse totalResults(Integer totalResults) {
+
+        this.totalResults = totalResults;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "1", value = "")
+    @JsonProperty("totalResults")
+    @Valid
+    public Integer getTotalResults() {
+        return totalResults;
+    }
+    public void setTotalResults(Integer totalResults) {
+        this.totalResults = totalResults;
+    }
+
+    /**
+    **/
+    public APIResourceListResponse links(List<PaginationLink> links) {
+
+        this.links = links;
+        return this;
+    }
+    
+    @ApiModelProperty(required = true, value = "")
+    @JsonProperty("links")
+    @Valid
+    @NotNull(message = "Property links cannot be null.")
+
+    public List<PaginationLink> getLinks() {
+        return links;
+    }
+    public void setLinks(List<PaginationLink> links) {
+        this.links = links;
+    }
+
+    public APIResourceListResponse addLinksItem(PaginationLink linksItem) {
+        this.links.add(linksItem);
+        return this;
+    }
+
+        /**
+    **/
+    public APIResourceListResponse apiResources(List<APIResourceListItem> apiResources) {
+
+        this.apiResources = apiResources;
+        return this;
+    }
+    
+    @ApiModelProperty(value = "")
+    @JsonProperty("apiResources")
+    @Valid
+    public List<APIResourceListItem> getApiResources() {
+        return apiResources;
+    }
+    public void setApiResources(List<APIResourceListItem> apiResources) {
+        this.apiResources = apiResources;
+    }
+
+    public APIResourceListResponse addApiResourcesItem(APIResourceListItem apiResourcesItem) {
+        if (this.apiResources == null) {
+            this.apiResources = new ArrayList<APIResourceListItem>();
+        }
+        this.apiResources.add(apiResourcesItem);
+        return this;
+    }
+
+    
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        APIResourceListResponse apIResourceListResponse = (APIResourceListResponse) o;
+        return Objects.equals(this.totalResults, apIResourceListResponse.totalResults) &&
+            Objects.equals(this.links, apIResourceListResponse.links) &&
+            Objects.equals(this.apiResources, apIResourceListResponse.apiResources);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(totalResults, links, apiResources);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class APIResourceListResponse {\n");
+        
+        sb.append("    totalResults: ").append(toIndentedString(totalResults)).append("\n");
+        sb.append("    links: ").append(toIndentedString(links)).append("\n");
+        sb.append("    apiResources: ").append(toIndentedString(apiResources)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourcePatchModel.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourcePatchModel.java
new file mode 100644
index 0000000000..ba00307b2e
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourcePatchModel.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeCreationModel;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class APIResourcePatchModel  {
+  
+    private String name;
+    private String description;
+    private List<ScopeCreationModel> addedScopes = null;
+
+    private List<String> removedScopes = null;
+
+
+    /**
+    **/
+    public APIResourcePatchModel name(String name) {
+
+        this.name = name;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Greetings API", value = "")
+    @JsonProperty("name")
+    @Valid
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+    **/
+    public APIResourcePatchModel description(String description) {
+
+        this.description = description;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Greetings API representation", value = "")
+    @JsonProperty("description")
+    @Valid
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+    **/
+    public APIResourcePatchModel addedScopes(List<ScopeCreationModel> addedScopes) {
+
+        this.addedScopes = addedScopes;
+        return this;
+    }
+    
+    @ApiModelProperty(value = "")
+    @JsonProperty("addedScopes")
+    @Valid
+    public List<ScopeCreationModel> getAddedScopes() {
+        return addedScopes;
+    }
+    public void setAddedScopes(List<ScopeCreationModel> addedScopes) {
+        this.addedScopes = addedScopes;
+    }
+
+    public APIResourcePatchModel addAddedScopesItem(ScopeCreationModel addedScopesItem) {
+        if (this.addedScopes == null) {
+            this.addedScopes = new ArrayList<ScopeCreationModel>();
+        }
+        this.addedScopes.add(addedScopesItem);
+        return this;
+    }
+
+        /**
+    * This field is not supported yet.
+    **/
+    public APIResourcePatchModel removedScopes(List<String> removedScopes) {
+
+        this.removedScopes = removedScopes;
+        return this;
+    }
+    
+    @ApiModelProperty(value = "This field is not supported yet.")
+    @JsonProperty("removedScopes")
+    @Valid
+    public List<String> getRemovedScopes() {
+        return removedScopes;
+    }
+    public void setRemovedScopes(List<String> removedScopes) {
+        this.removedScopes = removedScopes;
+    }
+
+    public APIResourcePatchModel addRemovedScopesItem(String removedScopesItem) {
+        if (this.removedScopes == null) {
+            this.removedScopes = new ArrayList<String>();
+        }
+        this.removedScopes.add(removedScopesItem);
+        return this;
+    }
+
+    
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        APIResourcePatchModel apIResourcePatchModel = (APIResourcePatchModel) o;
+        return Objects.equals(this.name, apIResourcePatchModel.name) &&
+            Objects.equals(this.description, apIResourcePatchModel.description) &&
+            Objects.equals(this.addedScopes, apIResourcePatchModel.addedScopes) &&
+            Objects.equals(this.removedScopes, apIResourcePatchModel.removedScopes);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, description, addedScopes, removedScopes);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class APIResourcePatchModel {\n");
+        
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    description: ").append(toIndentedString(description)).append("\n");
+        sb.append("    addedScopes: ").append(toIndentedString(addedScopes)).append("\n");
+        sb.append("    removedScopes: ").append(toIndentedString(removedScopes)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceResponse.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceResponse.java
new file mode 100644
index 0000000000..22b3d7b93e
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/APIResourceResponse.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeGetModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.SubscribedApplicationGetModel;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class APIResourceResponse  {
+  
+    private String id;
+    private String name;
+    private String description;
+    private String identifier;
+    private String type;
+    private Boolean requiresAuthorization;
+    private List<ScopeGetModel> scopes = null;
+
+    private List<SubscribedApplicationGetModel> subscribedApplications = null;
+
+    private String self;
+
+    /**
+    **/
+    public APIResourceResponse id(String id) {
+
+        this.id = id;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "gh43-jk34-vb34-df67", required = true, value = "")
+    @JsonProperty("id")
+    @Valid
+    @NotNull(message = "Property id cannot be null.")
+
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+    **/
+    public APIResourceResponse name(String name) {
+
+        this.name = name;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Greetings API", required = true, value = "")
+    @JsonProperty("name")
+    @Valid
+    @NotNull(message = "Property name cannot be null.")
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+    **/
+    public APIResourceResponse description(String description) {
+
+        this.description = description;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Greeting API representation", value = "")
+    @JsonProperty("description")
+    @Valid
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+    **/
+    public APIResourceResponse identifier(String identifier) {
+
+        this.identifier = identifier;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "greetings_api", required = true, value = "")
+    @JsonProperty("identifier")
+    @Valid
+    @NotNull(message = "Property identifier cannot be null.")
+
+    public String getIdentifier() {
+        return identifier;
+    }
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    /**
+    **/
+    public APIResourceResponse type(String type) {
+
+        this.type = type;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "SYSTEM", value = "")
+    @JsonProperty("type")
+    @Valid
+    public String getType() {
+        return type;
+    }
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+    **/
+    public APIResourceResponse requiresAuthorization(Boolean requiresAuthorization) {
+
+        this.requiresAuthorization = requiresAuthorization;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "true", value = "")
+    @JsonProperty("requiresAuthorization")
+    @Valid
+    public Boolean getRequiresAuthorization() {
+        return requiresAuthorization;
+    }
+    public void setRequiresAuthorization(Boolean requiresAuthorization) {
+        this.requiresAuthorization = requiresAuthorization;
+    }
+
+    /**
+    **/
+    public APIResourceResponse scopes(List<ScopeGetModel> scopes) {
+
+        this.scopes = scopes;
+        return this;
+    }
+    
+    @ApiModelProperty(value = "")
+    @JsonProperty("scopes")
+    @Valid
+    public List<ScopeGetModel> getScopes() {
+        return scopes;
+    }
+    public void setScopes(List<ScopeGetModel> scopes) {
+        this.scopes = scopes;
+    }
+
+    public APIResourceResponse addScopesItem(ScopeGetModel scopesItem) {
+        if (this.scopes == null) {
+            this.scopes = new ArrayList<ScopeGetModel>();
+        }
+        this.scopes.add(scopesItem);
+        return this;
+    }
+
+        /**
+    **/
+    public APIResourceResponse subscribedApplications(List<SubscribedApplicationGetModel> subscribedApplications) {
+
+        this.subscribedApplications = subscribedApplications;
+        return this;
+    }
+    
+    @ApiModelProperty(value = "")
+    @JsonProperty("subscribedApplications")
+    @Valid
+    public List<SubscribedApplicationGetModel> getSubscribedApplications() {
+        return subscribedApplications;
+    }
+    public void setSubscribedApplications(List<SubscribedApplicationGetModel> subscribedApplications) {
+        this.subscribedApplications = subscribedApplications;
+    }
+
+    public APIResourceResponse addSubscribedApplicationsItem(SubscribedApplicationGetModel subscribedApplicationsItem) {
+        if (this.subscribedApplications == null) {
+            this.subscribedApplications = new ArrayList<SubscribedApplicationGetModel>();
+        }
+        this.subscribedApplications.add(subscribedApplicationsItem);
+        return this;
+    }
+
+        /**
+    **/
+    public APIResourceResponse self(String self) {
+
+        this.self = self;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "/t/carbon.super/api/server/v1/api-resources/eDUwOUNlcnRpZmljYXRlQXV0aGVudGljYXRvcg", required = true, value = "")
+    @JsonProperty("self")
+    @Valid
+    @NotNull(message = "Property self cannot be null.")
+
+    public String getSelf() {
+        return self;
+    }
+    public void setSelf(String self) {
+        this.self = self;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        APIResourceResponse apIResourceResponse = (APIResourceResponse) o;
+        return Objects.equals(this.id, apIResourceResponse.id) &&
+            Objects.equals(this.name, apIResourceResponse.name) &&
+            Objects.equals(this.description, apIResourceResponse.description) &&
+            Objects.equals(this.identifier, apIResourceResponse.identifier) &&
+            Objects.equals(this.type, apIResourceResponse.type) &&
+            Objects.equals(this.requiresAuthorization, apIResourceResponse.requiresAuthorization) &&
+            Objects.equals(this.scopes, apIResourceResponse.scopes) &&
+            Objects.equals(this.subscribedApplications, apIResourceResponse.subscribedApplications) &&
+            Objects.equals(this.self, apIResourceResponse.self);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, description, identifier, type, requiresAuthorization, scopes, subscribedApplications, self);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class APIResourceResponse {\n");
+        
+        sb.append("    id: ").append(toIndentedString(id)).append("\n");
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    description: ").append(toIndentedString(description)).append("\n");
+        sb.append("    identifier: ").append(toIndentedString(identifier)).append("\n");
+        sb.append("    type: ").append(toIndentedString(type)).append("\n");
+        sb.append("    requiresAuthorization: ").append(toIndentedString(requiresAuthorization)).append("\n");
+        sb.append("    scopes: ").append(toIndentedString(scopes)).append("\n");
+        sb.append("    subscribedApplications: ").append(toIndentedString(subscribedApplications)).append("\n");
+        sb.append("    self: ").append(toIndentedString(self)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java
new file mode 100644
index 0000000000..0bc88af4c9
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+import javax.validation.Valid;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import io.swagger.annotations.*;
+
+@Path("/api-resources")
+@Api(description = "The api-resources API")
+
+public class ApiResourcesApi  {
+
+    @Autowired
+    private ApiResourcesApiService delegate;
+
+    @Valid
+    @POST
+    
+    @Consumes({ "application/json" })
+    @Produces({ "application/json", "application/xml",  })
+    @ApiOperation(value = "Add a new API resource", notes = "Add a new API resource", response = APIResourceResponse.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resources", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "OK", response = APIResourceResponse.class),
+        @ApiResponse(code = 400, message = "Bad Request", response = Error.class),
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 404, message = "Not Found", response = Error.class),
+        @ApiResponse(code = 409, message = "Conflict", response = Error.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class)
+    })
+    public Response addAPIResource(@ApiParam(value = "This represents the API resource to be created." ,required=true) @Valid APIResourceCreationModel apIResourceCreationModel) {
+
+        return delegate.addAPIResource(apIResourceCreationModel );
+    }
+
+    @Valid
+    @DELETE
+    @Path("/{apiResourceId}")
+    
+    @Produces({ "application/json" })
+    @ApiOperation(value = "Delete API resource specified by the id", notes = "Delete API resource specified by the id", response = Void.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resources", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 204, message = "No Content", response = Void.class),
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class)
+    })
+    public Response apiResourcesApiResourceIdDelete(@ApiParam(value = "ID of the API Resource.",required=true) @PathParam("apiResourceId") String apiResourceId) {
+
+        return delegate.apiResourcesApiResourceIdDelete(apiResourceId );
+    }
+
+    @Valid
+    @GET
+    @Path("/{apiResourceId}")
+    
+    @Produces({ "application/json" })
+    @ApiOperation(value = "Get API resource specified by the id", notes = "Get API resource specified by the id", response = APIResourceResponse.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resources", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "OK", response = APIResourceResponse.class),
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class)
+    })
+    public Response apiResourcesApiResourceIdGet(@ApiParam(value = "ID of the API Resource.",required=true) @PathParam("apiResourceId") String apiResourceId) {
+
+        return delegate.apiResourcesApiResourceIdGet(apiResourceId );
+    }
+
+    @Valid
+    @PATCH
+    @Path("/{apiResourceId}")
+    @Consumes({ "application/json" })
+    @Produces({ "application/json", "application/xml",  })
+    @ApiOperation(value = "Patch API resource specified by the id", notes = "Patch API resource specified by the id. Patch operation only supports \"name\", \"description\" updating and \"addedScopes\" fields at the moment.", response = APIResourceResponse.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resources", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "OK", response = APIResourceResponse.class),
+        @ApiResponse(code = 400, message = "Bad Request", response = Error.class),
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 404, message = "Not Found", response = Error.class),
+        @ApiResponse(code = 409, message = "Conflict", response = Error.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class),
+        @ApiResponse(code = 501, message = "Not Implemented", response = Error.class)
+    })
+    public Response apiResourcesApiResourceIdPatch(@ApiParam(value = "ID of the API Resource.",required=true) @PathParam("apiResourceId") String apiResourceId, @ApiParam(value = "This represents the API resource to be patched." ,required=true) @Valid APIResourcePatchModel apIResourcePatchModel) {
+
+        return delegate.apiResourcesApiResourceIdPatch(apiResourceId,  apIResourcePatchModel );
+    }
+
+    @Valid
+    @GET
+    @Path("/{apiResourceId}/scopes")
+    
+    @Produces({ "application/json" })
+    @ApiOperation(value = "Get API resource scopes", notes = "Get API resource scopes specified by the id", response = ScopeGetModel.class, responseContainer = "List", authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resource Scopes", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "OK", response = ScopeGetModel.class, responseContainer = "List"),
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 404, message = "Not Found", response = Error.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class)
+    })
+    public Response apiResourcesApiResourceIdScopesGet(@ApiParam(value = "ID of the API Resource.",required=true) @PathParam("apiResourceId") String apiResourceId) {
+
+        return delegate.apiResourcesApiResourceIdScopesGet(apiResourceId );
+    }
+
+    @Valid
+    @PUT
+    @Path("/{apiResourceId}/scopes")
+    @Consumes({ "application/json" })
+    @Produces({ "application/json", "application/xml",  })
+    @ApiOperation(value = "Add scopes to API resource", notes = "Put scopes API resource specified by the id", response = Void.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resource Scopes", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 204, message = "No Content", response = Void.class),
+        @ApiResponse(code = 400, message = "Bad Request", response = Error.class),
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 404, message = "Not Found", response = Error.class),
+        @ApiResponse(code = 409, message = "Conflict", response = Error.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class)
+    })
+    public Response apiResourcesApiResourceIdScopesPut(@ApiParam(value = "ID of the API Resource.",required=true) @PathParam("apiResourceId") String apiResourceId, @ApiParam(value = "This represents the API resource to be patched." ,required=true) @Valid List<ScopeCreationModel> scopeCreationModel) {
+
+        return delegate.apiResourcesApiResourceIdScopesPut(apiResourceId,  scopeCreationModel );
+    }
+
+    @Valid
+    @DELETE
+    @Path("/{apiResourceId}/scopes/{scopeId}")
+    
+    @Produces({ "application/json" })
+    @ApiOperation(value = "Delete API resource specified by the id", notes = "Delete API resource specified by the id", response = Void.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resource Scopes", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class)
+    })
+    public Response apiResourcesApiResourceIdScopesScopeIdDelete(@ApiParam(value = "ID of the API Resource.",required=true) @PathParam("apiResourceId") String apiResourceId, @ApiParam(value = "ID of the Scope.",required=true) @PathParam("scopeId") String scopeId) {
+
+        return delegate.apiResourcesApiResourceIdScopesScopeNameDelete(apiResourceId,  scopeId );
+    }
+
+    @Valid
+    @GET
+    
+    
+    @Produces({ "application/json" })
+    @ApiOperation(value = "List all API resources in the server", notes = "List all API resources in the server", response = APIResourceListResponse.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resources", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "OK", response = APIResourceListResponse.class),
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class)
+    })
+    public Response getAPIResources(    @Valid@ApiParam(value = "Base64 encoded cursor value for backward pagination. ")  @QueryParam("before") String before,     @Valid@ApiParam(value = "Base64 encoded cursor value for forward pagination. ")  @QueryParam("after") String after,     @Valid@ApiParam(value = "Condition to filter the retrieval of records. Supports 'sw', 'co', 'ew' and 'eq' operations. ")  @QueryParam("filter") String filter,     @Valid@ApiParam(value = "Maximum number of records to return. ")  @QueryParam("limit") Integer limit,     @Valid@ApiParam(value = "Specifies the required parameters in the response. This parameter is not supported yet")  @QueryParam("requiredAttributes") String requiredAttributes) {
+
+        return delegate.getAPIResources(before,  after,  filter,  limit,  requiredAttributes );
+    }
+
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApiService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApiService.java
new file mode 100644
index 0000000000..d7d087d2d5
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApiService.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import java.util.List;
+
+import javax.ws.rs.core.Response;
+
+
+public interface ApiResourcesApiService {
+
+      public Response addAPIResource(APIResourceCreationModel apIResourceCreationModel);
+
+      public Response apiResourcesApiResourceIdDelete(String apiResourceId);
+
+      public Response apiResourcesApiResourceIdGet(String apiResourceId);
+
+      public Response apiResourcesApiResourceIdPatch(String apiResourceId, APIResourcePatchModel apIResourcePatchModel);
+
+      public Response apiResourcesApiResourceIdScopesGet(String apiResourceId);
+
+      public Response apiResourcesApiResourceIdScopesPut(String apiResourceId, List<ScopeCreationModel> scopeCreationModel);
+
+      public Response apiResourcesApiResourceIdScopesScopeNameDelete(String apiResourceId, String scopeName);
+
+      public Response getAPIResources(String before, String after, String filter, Integer limit, String requiredAttributes);
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/Error.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/Error.java
new file mode 100644
index 0000000000..5fe989b98e
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/Error.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class Error  {
+  
+    private String code;
+    private String message;
+    private String description;
+    private String traceId;
+
+    /**
+    **/
+    public Error code(String code) {
+
+        this.code = code;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "AAA-00000", value = "")
+    @JsonProperty("code")
+    @Valid
+    public String getCode() {
+        return code;
+    }
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+    **/
+    public Error message(String message) {
+
+        this.message = message;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Some Error Message", value = "")
+    @JsonProperty("message")
+    @Valid
+    public String getMessage() {
+        return message;
+    }
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    /**
+    **/
+    public Error description(String description) {
+
+        this.description = description;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Some Error Description", value = "")
+    @JsonProperty("description")
+    @Valid
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+    **/
+    public Error traceId(String traceId) {
+
+        this.traceId = traceId;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "e0fbcfeb-3617-43c4-8dd0-7b7d38e13047", value = "")
+    @JsonProperty("traceId")
+    @Valid
+    public String getTraceId() {
+        return traceId;
+    }
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Error error = (Error) o;
+        return Objects.equals(this.code, error.code) &&
+            Objects.equals(this.message, error.message) &&
+            Objects.equals(this.description, error.description) &&
+            Objects.equals(this.traceId, error.traceId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(code, message, description, traceId);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Error {\n");
+        
+        sb.append("    code: ").append(toIndentedString(code)).append("\n");
+        sb.append("    message: ").append(toIndentedString(message)).append("\n");
+        sb.append("    description: ").append(toIndentedString(description)).append("\n");
+        sb.append("    traceId: ").append(toIndentedString(traceId)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/PaginationLink.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/PaginationLink.java
new file mode 100644
index 0000000000..3403c2f707
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/PaginationLink.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class PaginationLink  {
+  
+    private String rel;
+    private String href;
+
+    /**
+    **/
+    public PaginationLink rel(String rel) {
+
+        this.rel = rel;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "before", value = "")
+    @JsonProperty("rel")
+    @Valid
+    public String getRel() {
+        return rel;
+    }
+    public void setRel(String rel) {
+        this.rel = rel;
+    }
+
+    /**
+    **/
+    public PaginationLink href(String href) {
+
+        this.href = href;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "/o/orgName/api-resources?after=NDoy", value = "")
+    @JsonProperty("href")
+    @Valid
+    public String getHref() {
+        return href;
+    }
+    public void setHref(String href) {
+        this.href = href;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        PaginationLink paginationLink = (PaginationLink) o;
+        return Objects.equals(this.rel, paginationLink.rel) &&
+            Objects.equals(this.href, paginationLink.href);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(rel, href);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class PaginationLink {\n");
+        
+        sb.append("    rel: ").append(toIndentedString(rel)).append("\n");
+        sb.append("    href: ").append(toIndentedString(href)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopeCreationModel.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopeCreationModel.java
new file mode 100644
index 0000000000..d269682d48
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopeCreationModel.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class ScopeCreationModel  {
+  
+    private String name;
+    private String displayName;
+    private String description;
+
+    /**
+    **/
+    public ScopeCreationModel name(String name) {
+
+        this.name = name;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "greetings:write", required = true, value = "")
+    @JsonProperty("name")
+    @Valid
+    @NotNull(message = "Property name cannot be null.")
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+    **/
+    public ScopeCreationModel displayName(String displayName) {
+
+        this.displayName = displayName;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Write Greetings", value = "")
+    @JsonProperty("displayName")
+    @Valid
+    public String getDisplayName() {
+        return displayName;
+    }
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+    **/
+    public ScopeCreationModel description(String description) {
+
+        this.description = description;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Allows writing greetings", value = "")
+    @JsonProperty("description")
+    @Valid
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ScopeCreationModel scopeCreationModel = (ScopeCreationModel) o;
+        return Objects.equals(this.name, scopeCreationModel.name) &&
+            Objects.equals(this.displayName, scopeCreationModel.displayName) &&
+            Objects.equals(this.description, scopeCreationModel.description);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, displayName, description);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ScopeCreationModel {\n");
+        
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    displayName: ").append(toIndentedString(displayName)).append("\n");
+        sb.append("    description: ").append(toIndentedString(description)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopeGetModel.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopeGetModel.java
new file mode 100644
index 0000000000..b357201c91
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopeGetModel.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class ScopeGetModel  {
+  
+    private String id;
+    private String displayName;
+    private String name;
+    private String description;
+
+    /**
+    **/
+    public ScopeGetModel id(String id) {
+
+        this.id = id;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "sf23-fg34-fy53-hj23", required = true, value = "")
+    @JsonProperty("id")
+    @Valid
+    @NotNull(message = "Property id cannot be null.")
+
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+    **/
+    public ScopeGetModel displayName(String displayName) {
+
+        this.displayName = displayName;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Write", required = true, value = "")
+    @JsonProperty("displayName")
+    @Valid
+    @NotNull(message = "Property displayName cannot be null.")
+
+    public String getDisplayName() {
+        return displayName;
+    }
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    /**
+    **/
+    public ScopeGetModel name(String name) {
+
+        this.name = name;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "greetings:write", required = true, value = "")
+    @JsonProperty("name")
+    @Valid
+    @NotNull(message = "Property name cannot be null.")
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+    **/
+    public ScopeGetModel description(String description) {
+
+        this.description = description;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Allow writing greetings", value = "")
+    @JsonProperty("description")
+    @Valid
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ScopeGetModel scopeGetModel = (ScopeGetModel) o;
+        return Objects.equals(this.id, scopeGetModel.id) &&
+            Objects.equals(this.displayName, scopeGetModel.displayName) &&
+            Objects.equals(this.name, scopeGetModel.name) &&
+            Objects.equals(this.description, scopeGetModel.description);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, displayName, name, description);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class ScopeGetModel {\n");
+        
+        sb.append("    id: ").append(toIndentedString(id)).append("\n");
+        sb.append("    displayName: ").append(toIndentedString(displayName)).append("\n");
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    description: ").append(toIndentedString(description)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java
new file mode 100644
index 0000000000..e44caef832
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import java.io.InputStream;
+import java.util.List;
+
+import org.wso2.carbon.identity.api.server.api.resource.v1.Error;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeGetModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApiService;
+
+import javax.validation.Valid;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import io.swagger.annotations.*;
+
+import javax.validation.constraints.*;
+
+@Path("/scopes")
+@Api(description = "The scopes API")
+
+public class ScopesApi  {
+
+    @Autowired
+    private ScopesApiService delegate;
+
+    @Valid
+    @GET
+    
+    
+    @Produces({ "application/json" })
+    @ApiOperation(value = "Get all scopes in the tenant", notes = "Get all scopes in the tenant", response = ScopeGetModel.class, responseContainer = "List", authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "API Resource Scopes" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "OK", response = ScopeGetModel.class, responseContainer = "List"),
+        @ApiResponse(code = 401, message = "Unauthorized", response = Void.class),
+        @ApiResponse(code = 403, message = "Forbidden", response = Void.class),
+        @ApiResponse(code = 404, message = "Not Found", response = Error.class),
+        @ApiResponse(code = 500, message = "Server Error", response = Error.class)
+    })
+    public Response scopesGet(    @Valid@ApiParam(value = "Condition to filter the retrieval of records. Supports 'sw', 'co', 'ew' and 'eq' operations. ")  @QueryParam("filter") String filter) {
+
+        return delegate.scopesGet(filter );
+    }
+
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApiService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApiService.java
new file mode 100644
index 0000000000..3880555282
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApiService.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import org.wso2.carbon.identity.api.server.api.resource.v1.*;
+import org.wso2.carbon.identity.api.server.api.resource.v1.*;
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import java.io.InputStream;
+import java.util.List;
+import org.wso2.carbon.identity.api.server.api.resource.v1.Error;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeGetModel;
+import javax.ws.rs.core.Response;
+
+
+public interface ScopesApiService {
+
+      public Response scopesGet(String filter);
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/SubscribedApplicationGetModel.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/SubscribedApplicationGetModel.java
new file mode 100644
index 0000000000..7705c673ad
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/SubscribedApplicationGetModel.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class SubscribedApplicationGetModel  {
+  
+    private String name;
+    private String id;
+
+    /**
+    **/
+    public SubscribedApplicationGetModel name(String name) {
+
+        this.name = name;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Application1", value = "")
+    @JsonProperty("name")
+    @Valid
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+    **/
+    public SubscribedApplicationGetModel id(String id) {
+
+        this.id = id;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "23fd-23gd-54vv-sdhf", value = "")
+    @JsonProperty("id")
+    @Valid
+    public String getId() {
+        return id;
+    }
+    public void setId(String id) {
+        this.id = id;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        SubscribedApplicationGetModel subscribedApplicationGetModel = (SubscribedApplicationGetModel) o;
+        return Objects.equals(this.name, subscribedApplicationGetModel.name) &&
+            Objects.equals(this.id, subscribedApplicationGetModel.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, id);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class SubscribedApplicationGetModel {\n");
+        
+        sb.append("    name: ").append(toIndentedString(name)).append("\n");
+        sb.append("    id: ").append(toIndentedString(id)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ApiResourcesApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ApiResourcesApiServiceFactory.java
new file mode 100644
index 0000000000..1d89750b24
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ApiResourcesApiServiceFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.factories;
+
+import org.wso2.carbon.identity.api.server.api.resource.v1.ApiResourcesApiService;
+import org.wso2.carbon.identity.api.server.api.resource.v1.impl.ApiResourcesApiServiceImpl;
+
+public class ApiResourcesApiServiceFactory {
+
+   private final static ApiResourcesApiService service = new ApiResourcesApiServiceImpl();
+
+   public static ApiResourcesApiService getApiResourcesApi()
+   {
+      return service;
+   }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ScopesApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ScopesApiServiceFactory.java
new file mode 100644
index 0000000000..cb91296d06
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ScopesApiServiceFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.factories;
+
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApiService;
+import org.wso2.carbon.identity.api.server.api.resource.v1.impl.ScopesApiServiceImpl;
+
+public class ScopesApiServiceFactory {
+
+   private final static ScopesApiService service = new ScopesApiServiceImpl();
+
+   public static ScopesApiService getScopesApi()
+   {
+      return service;
+   }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/constants/APIResourceMgtEndpointConstants.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/constants/APIResourceMgtEndpointConstants.java
new file mode 100644
index 0000000000..6e212893ae
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/constants/APIResourceMgtEndpointConstants.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.constants;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Constants related to API resource management.
+ */
+public class APIResourceMgtEndpointConstants {
+
+    private APIResourceMgtEndpointConstants() {
+    }
+
+    public static final String API_RESOURCE_TYPE = "BUSINESS";
+    public static final String API_RESOURCE_MANAGEMENT_PREFIX = "API-RESOURCE-";
+    public static final String API_RESOURCE_PATH_COMPONENT = "/api-resources";
+    private static final List<String> allowedAttributeList = new ArrayList<>();
+    public static final List<String> ALLOWED_SEARCH_ATTRIBUTES = Collections.unmodifiableList(allowedAttributeList);
+    public static final String RESTRICTED_OAUTH2_SCOPES = "OAuth.RestrictedScopes.RestrictedScope";
+    public static final Integer DEFAULT_LIMIT = 10;
+    public static final String ASC_SORT_ORDER = "ASC";
+    public static final String DESC_SORT_ORDER = "DESC";
+
+    static {
+        allowedAttributeList.add("description");
+        allowedAttributeList.add("type");
+        allowedAttributeList.add("requires_authorization");
+        allowedAttributeList.add("scopes");
+    }
+
+    /**
+     * Enum for error messages.
+     */
+    public enum ErrorMessage {
+
+        // Client errors.
+        ERROR_CODE_API_RESOURCE_LIMIT_REACHED("60001",
+                "Unable to create an API resource.",
+                "Maximum number of allowed API resources have been reached."),
+        ERROR_CODE_API_RESOURCE_NOT_FOUND("60002",
+                "Unable to find the API resource.",
+                "Unable to find the API resource with the id: %s in the tenant domain."),
+        ERROR_CODE_INVALID_API_RESOURCE_NAME("60003",
+                "Invalid API resource name provided.", "API resource name is required."),
+        ERROR_CODE_INVALID_API_RESOURCE_IDENTIFIER("60004",
+                "Invalid API resource identifier provided.", "API resource identifier is required."),
+        ERROR_CODE_INVALID_SCOPE_NAME("60005",
+                "Invalid scope name provided.", "Scope name is required."),
+        ERROR_CODE_REMOVED_SCOPES_PATCH_NOT_SUPPORTED("60006",
+                "Removed scopes patching is not supported yet.",
+                "Removed scopes patching is not supported yet for API resources."),
+        ERROR_CODE_INVALID_SEARCH_ATTRIBUTE("60007",
+                "Invalid search attribute.",
+                "Invalid search attribute: %s."),
+        ERROR_CODE_RESTRICTED_SCOPE_NAME("60008",
+                "Restricted scope name provided.", "Scope name is restricted."),
+        ERROR_CODE_RESTRICTED_OIDC_SCOPES("60009", "Existing OIDC scope name provided.",
+                "Provided scopes name is already exists in the system as an OIDC scope."),
+        ERROR_CODE_INVALID_LIMIT("60010", "Invalid limit provided.",
+                "Limit should be a positive integer."),
+        ERROR_CODE_BOTH_BEFORE_AFTER_PROVIDED("60011", "Invalid before/after provided.",
+                "Both before and after parameters cannot be provided at the same time."),
+
+        // Server errors.
+        ERROR_CODE_ADD_API_RESOURCE("65001", "Error while adding api resource.", "Server encountered an error while " +
+                "adding the api resource."),
+
+        ERROR_CODE_VALIDATE_SCOPES("65002", "Error while validating scopes.", "Server encountered an error while " +
+                "validating the scopes."),
+        ;
+        private final String code;
+        private final String message;
+        private final String description;
+
+        ErrorMessage(String code, String message, String description) {
+
+            this.code = code;
+            this.message = message;
+            this.description = description;
+        }
+
+        public String getCode() {
+
+            return API_RESOURCE_MANAGEMENT_PREFIX + code;
+        }
+
+        public String getMessage() {
+
+            return message;
+        }
+
+        public String getDescription() {
+
+            return description;
+        }
+
+        @Override
+        public String toString() {
+
+            return code + " | " + message;
+        }
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
new file mode 100644
index 0000000000..c31252fd4d
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
@@ -0,0 +1,468 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.core;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceMgtException;
+import org.wso2.carbon.identity.api.resource.mgt.model.APIResourceSearchResult;
+import org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCreationModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceListItem;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceListResponse;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourcePatchModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceResponse;
+import org.wso2.carbon.identity.api.server.api.resource.v1.PaginationLink;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeCreationModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeGetModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants;
+import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage;
+import org.wso2.carbon.identity.api.server.api.resource.v1.exception.APIResourceMgtEndpointException;
+import org.wso2.carbon.identity.api.server.api.resource.v1.util.APIResourceMgtEndpointUtil;
+import org.wso2.carbon.identity.api.server.common.ContextLoader;
+import org.wso2.carbon.identity.application.common.model.APIResource;
+import org.wso2.carbon.identity.application.common.model.Scope;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.core.Response;
+
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ASC_SORT_ORDER;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.DEFAULT_LIMIT;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.DESC_SORT_ORDER;
+import static org.wso2.carbon.identity.api.server.common.Constants.V1_API_PATH_COMPONENT;
+
+/**
+ * Server API Resource Management Service.
+ */
+public class ServerAPIResourceManagementService {
+
+    private static final ServerAPIResourceManagementService instance = new ServerAPIResourceManagementService();
+
+    private static final Log LOG = LogFactory.getLog(ServerAPIResourceManagementService.class);
+
+    private ServerAPIResourceManagementService() {
+
+    }
+
+    public static ServerAPIResourceManagementService getInstance() {
+
+        return instance;
+    }
+
+    /**
+     * Add API resource.
+     *
+     * @param apIResourceCreationModel API resource creation model.
+     * @return Response.
+     */
+    public APIResourceResponse addAPIResourceWithResourceId(APIResourceCreationModel apIResourceCreationModel) {
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Adding API resource with resource id: " + apIResourceCreationModel.getIdentifier());
+        }
+        try {
+            APIResource apiResource = createAPIResource(apIResourceCreationModel);
+            APIResource createdAPIResource = APIResourceManagementServiceHolder.getApiResourceManager()
+                    .addAPIResource(apiResource, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            if (createdAPIResource == null) {
+                LOG.error(ErrorMessage.ERROR_CODE_ADD_API_RESOURCE.getDescription());
+                throw APIResourceMgtEndpointUtil.handleException(Response.Status.INTERNAL_SERVER_ERROR,
+                        ErrorMessage.ERROR_CODE_ADD_API_RESOURCE);
+            }
+            return buildAPIResourceResponse(createdAPIResource);
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+    }
+
+    /**
+     * Get API Resources.
+     *
+     * @param before - before parameter for cursor based pagination.
+     * @param after  - after parameter for cursor based pagination.
+     * @param filter - filter parameter.
+     * @return Response with API Resources list.
+     */
+    public APIResourceListResponse getAPIResources(String before, String after, String filter, Integer limit) {
+
+        APIResourceListResponse apiResourceListResponse = new APIResourceListResponse();
+
+        try {
+            // Set default values if the parameters are not set.
+            limit = validatedLimit(limit);
+
+            // Validate before and after parameters.
+            if (StringUtils.isNotBlank(before) && StringUtils.isNotBlank(after)) {
+                throw APIResourceMgtEndpointUtil.handleException(Response.Status.BAD_REQUEST,
+                        APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_BOTH_BEFORE_AFTER_PROVIDED);
+            }
+
+            // Set the pagination sort order.
+            String paginationSortOrder = StringUtils.isNotBlank(before) ? DESC_SORT_ORDER : ASC_SORT_ORDER;
+
+            APIResourceSearchResult apiResourceSearchResult = APIResourceManagementServiceHolder.getApiResourceManager()
+                    .getAPIResources(before, after, limit + 1, filter, paginationSortOrder,
+                            CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            List<APIResource> apiResources = apiResourceSearchResult.getAPIResources();
+
+            if (limit != 0 && CollectionUtils.isNotEmpty(apiResources)) {
+                boolean hasMoreItems = apiResources.size() > limit;
+                boolean needsReverse = StringUtils.isNotBlank(before);
+                boolean isFirstPage = (StringUtils.isBlank(before) && StringUtils.isBlank(after)) ||
+                        (StringUtils.isNotBlank(before) && !hasMoreItems);
+                boolean isLastPage = !hasMoreItems && (StringUtils.isNotBlank(after) || StringUtils.isBlank(before));
+
+                String url = "?limit=" + limit;
+
+                if (StringUtils.isNotBlank(filter)) {
+                    try {
+                        url += "&filter=" + URLEncoder.encode(filter, StandardCharsets.UTF_8.name());
+                    } catch (UnsupportedEncodingException e) {
+                        LOG.error("Server encountered an error while building pagination URL for the response.", e);
+                    }
+                }
+
+                if (hasMoreItems) {
+                    apiResources.remove(apiResources.size() - 1);
+                }
+                if (needsReverse) {
+                    Collections.reverse(apiResources);
+                }
+                if (!isFirstPage) {
+                    String encodedString = Base64.getEncoder().encodeToString(apiResources.get(0).getCursorKey()
+                            .toString().getBytes(StandardCharsets.UTF_8));
+                    apiResourceListResponse.addLinksItem(buildPaginationLink(url + "&before=" + encodedString,
+                            "previous"));
+                }
+                if (!isLastPage) {
+                    String encodedString = Base64.getEncoder().encodeToString(apiResources.get(apiResources.size() - 1)
+                            .getCursorKey().toString().getBytes(StandardCharsets.UTF_8));
+                    apiResourceListResponse.addLinksItem(buildPaginationLink(url + "&after=" + encodedString, "next"));
+                }
+            }
+            if (apiResources == null || apiResources.isEmpty()) {
+                apiResourceListResponse.setTotalResults(0);
+                apiResourceListResponse.setApiResources(new ArrayList<>());
+                return apiResourceListResponse;
+            }
+            apiResourceListResponse.setTotalResults(apiResourceSearchResult.getTotalCount());
+            apiResourceListResponse.setApiResources(apiResourceSearchResult.getAPIResources().stream()
+                    .map(this::buildAPIResourceListItem).collect(Collectors.toList()));
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+        return apiResourceListResponse;
+    }
+
+    /**
+     * Get API Resource by ID.
+     *
+     * @param apiResourceID API Resource ID.
+     * @return API Resource.
+     */
+    public APIResource getAPIResourceById(String apiResourceID) {
+
+        try {
+            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
+                    .getAPIResourceById(apiResourceID, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            if (apiResource == null) {
+                throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
+                        APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_API_RESOURCE_NOT_FOUND, apiResourceID);
+            }
+            return apiResource;
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+    }
+
+    /**
+     * Patch API Resource by ID.
+     *
+     * @param apiResourceID         API Resource ID.
+     * @param apiResourcePatchModel API Resource Patch Model.
+     */
+    public void patchAPIResourceById(String apiResourceID, APIResourcePatchModel apiResourcePatchModel) {
+
+        try {
+            APIResource currentAPIResource = getAPIResourceById(apiResourceID);
+
+            if (apiResourcePatchModel.getRemovedScopes() != null) {
+                LOG.debug("Removed scopes field is not supported in patch operation.");
+                throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_IMPLEMENTED,
+                        APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_REMOVED_SCOPES_PATCH_NOT_SUPPORTED);
+            }
+
+            String displayName = apiResourcePatchModel.getName() == null ? currentAPIResource.getName() :
+                    apiResourcePatchModel.getName();
+            String description = apiResourcePatchModel.getDescription() == null ? currentAPIResource.getDescription() :
+                    apiResourcePatchModel.getDescription();
+            List<Scope> addedScopes = createScopes(apiResourcePatchModel.getAddedScopes());
+            // Creating an empty list of removed scope names since operation is not supported.
+            List<String> removedScopeNames = new ArrayList<>();
+
+            APIResource.APIResourceBuilder apiResourceBuilder = new APIResource.APIResourceBuilder()
+                    .name(displayName)
+                    .id(apiResourceID)
+                    .description(description);
+            APIResource apiResource = apiResourceBuilder.build();
+            APIResourceManagementServiceHolder.getApiResourceManager().updateAPIResource(apiResource, addedScopes,
+                    removedScopeNames, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+    }
+
+    /**
+     * Delete API Resource by ID.
+     *
+     * @param apiResourceID API Resource ID.
+     */
+    public void deleteAPIResource(String apiResourceID) {
+
+        try {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Deleting API Resource with ID: " + apiResourceID);
+            }
+            APIResourceManagementServiceHolder.getApiResourceManager().deleteAPIResourceById(apiResourceID,
+                    CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+    }
+
+    /**
+     * Get scopes by API ID.
+     *
+     * @param apiResourceId API resource id.
+     * @return List of scopes.
+     */
+    public List<Scope> getScopesByAPIId(String apiResourceId) {
+
+        try {
+            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
+                    .getAPIResourceById(apiResourceId, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            if (apiResource == null) {
+                throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
+                        APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_API_RESOURCE_NOT_FOUND, apiResourceId);
+            }
+            return apiResource.getScopes();
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+    }
+
+    /**
+     * Put scopes by API ID. This replaces existing scopes.
+     *
+     * @param apiResourceId       API resource id.
+     * @param scopeCreationModels Scope creation models.
+     */
+    public void putScopesByAPIId(String apiResourceId, List<ScopeCreationModel> scopeCreationModels) {
+
+        try {
+            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
+                    .getAPIResourceById(apiResourceId, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            if (apiResource == null) {
+                throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
+                        APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_API_RESOURCE_NOT_FOUND, apiResourceId);
+            }
+            List<Scope> scopes = createScopes(scopeCreationModels);
+            APIResourceManagementServiceHolder.getApiResourceManager().putScopes(apiResourceId, apiResource.getScopes(),
+                    scopes, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+    }
+
+    /**
+     * Delete scopes by the scope ID.
+     *
+     * @param apiResourceId API Resource ID.
+     * @param scopeName     Scope Name.
+     */
+    public void deleteScopeByScopeName(String apiResourceId, String scopeName) {
+
+        try {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Deleting scope with ID: " + scopeName + " of API Resource ID: " + apiResourceId);
+            }
+            APIResourceManagementServiceHolder.getApiResourceManager()
+                    .deleteAPIScopeByScopeName(apiResourceId, scopeName,
+                            CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+    }
+
+    /**
+     * Search Scopes registered in the tenant.
+     *
+     * @param filter Filter query.
+     * @return List of scopes.
+     */
+    public List<Scope> getScopesByTenant(String filter) {
+
+        try {
+            return APIResourceManagementServiceHolder.getApiResourceManager()
+                    .getScopesByTenantDomain(CarbonContext.getThreadLocalCarbonContext().getTenantDomain(), filter);
+        } catch (APIResourceMgtException e) {
+            throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
+        }
+    }
+
+    /**
+     * Build APIResourceResponse from APIResource.
+     *
+     * @param apiResource APIResource object.
+     * @return APIResourceResponse object.
+     */
+    private APIResourceResponse buildAPIResourceResponse(APIResource apiResource) {
+
+        return new APIResourceResponse()
+                .id(apiResource.getId())
+                .name(apiResource.getName())
+                .identifier(apiResource.getIdentifier())
+                .description(apiResource.getDescription())
+                .scopes(apiResource.getScopes().stream().map(this::buildScopeGetResponse)
+                        .collect(Collectors.toList()))
+                .requiresAuthorization(apiResource.isRequiresAuthorization());
+    }
+
+    /**
+     * Build ScopeGetModel from Scope.
+     *
+     * @param scope Scope object.
+     * @return ScopeGetModel object.
+     */
+    private ScopeGetModel buildScopeGetResponse(Scope scope) {
+
+        return new ScopeGetModel()
+                .id(scope.getId())
+                .name(scope.getName())
+                .displayName(scope.getDisplayName())
+                .description(scope.getDescription());
+    }
+
+    /**
+     * Create API resource from the API resource creation model.
+     *
+     * @param apIResourceCreationModel API resource creation model.
+     * @return API resource.
+     */
+    private APIResource createAPIResource(APIResourceCreationModel apIResourceCreationModel)
+            throws APIResourceMgtException {
+
+        APIResourceMgtEndpointUtil.validateAPIResource(apIResourceCreationModel);
+        APIResource.APIResourceBuilder apiResourceBuilder = new APIResource.APIResourceBuilder()
+                .name(apIResourceCreationModel.getName())
+                .identifier(apIResourceCreationModel.getIdentifier())
+                .description(apIResourceCreationModel.getDescription())
+                .scopes(createScopes(apIResourceCreationModel.getScopes()))
+                .requiresAuthorization(apIResourceCreationModel.getRequiresAuthorization() != null ?
+                        apIResourceCreationModel.getRequiresAuthorization() : true)
+                .type(APIResourceMgtEndpointConstants.API_RESOURCE_TYPE);
+        return apiResourceBuilder.build();
+    }
+
+    /**
+     * Create scopes from the scope creation models.
+     *
+     * @param scopeCreationModels Scope creation models.
+     * @return List of scopes.
+     */
+    private List<Scope> createScopes(List<ScopeCreationModel> scopeCreationModels)
+            throws APIResourceMgtException {
+
+        APIResourceMgtEndpointUtil.validateScopes(scopeCreationModels);
+        List<Scope> scopes = new ArrayList<>();
+        if (scopeCreationModels == null) {
+            return scopes;
+        }
+        for (ScopeCreationModel scopeCreationModel : scopeCreationModels) {
+            Scope.ScopeBuilder scopeBuilder = new Scope.ScopeBuilder()
+                    .name(scopeCreationModel.getName())
+                    .displayName(scopeCreationModel.getDisplayName() != null ? scopeCreationModel.getDisplayName() :
+                            scopeCreationModel.getName())
+                    .description(scopeCreationModel.getDescription());
+            scopes.add(scopeBuilder.build());
+        }
+        return scopes;
+    }
+
+    /**
+     * Build API Resource List Item from API Resource.
+     *
+     * @param apiResource API Resource.
+     * @return API Resource List Item.
+     */
+    private APIResourceListItem buildAPIResourceListItem(APIResource apiResource) {
+
+        return new APIResourceListItem()
+                .id(apiResource.getId())
+                .name(apiResource.getName())
+                .identifier(apiResource.getIdentifier())
+                .type(apiResource.getType())
+                .requiresAuthorization(apiResource.isRequiresAuthorization())
+                .self(V1_API_PATH_COMPONENT + APIResourceMgtEndpointConstants.API_RESOURCE_PATH_COMPONENT + "/"
+                        + apiResource.getId());
+    }
+
+    /**
+     * Build Pagination Link.
+     *
+     * @param url URL
+     * @param rel Rel
+     * @return Pagination Link
+     */
+    private PaginationLink buildPaginationLink(String url, String rel) {
+
+        return new PaginationLink()
+                .href(ContextLoader.buildURIForHeader(V1_API_PATH_COMPONENT +
+                        APIResourceMgtEndpointConstants.API_RESOURCE_PATH_COMPONENT + url).toString())
+                .rel(rel);
+    }
+
+    /**
+     * Validate limit parameter.
+     *
+     * @param limit Limit parameter.
+     * @return Validated limit.
+     * @throws APIResourceMgtEndpointException if the limit is invalid.
+     */
+    private static Integer validatedLimit(Integer limit) throws APIResourceMgtEndpointException {
+
+        limit = limit == null ? DEFAULT_LIMIT : limit;
+        if (limit == 0 || limit < 0) {
+            throw APIResourceMgtEndpointUtil.handleException(Response.Status.BAD_REQUEST,
+                    ErrorMessage.ERROR_CODE_INVALID_LIMIT);
+        }
+        return limit;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/exception/APIResourceMgtEndpointException.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/exception/APIResourceMgtEndpointException.java
new file mode 100644
index 0000000000..9976a6f910
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/exception/APIResourceMgtEndpointException.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.exception;
+
+import org.wso2.carbon.identity.api.server.api.resource.v1.Error;
+
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+/**
+ * Exception class for API resource management endpoint.
+ */
+public class APIResourceMgtEndpointException extends WebApplicationException {
+
+    public APIResourceMgtEndpointException(Response.Status status, Error error) {
+
+        super(Response.status(status).entity(error).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+                .build());
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ApiResourcesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ApiResourcesApiServiceImpl.java
new file mode 100644
index 0000000000..8a32305721
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ApiResourcesApiServiceImpl.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCreationModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourcePatchModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceResponse;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ApiResourcesApiService;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeCreationModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants;
+import org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceManagementService;
+import org.wso2.carbon.identity.api.server.common.ContextLoader;
+
+import java.net.URI;
+import java.util.List;
+
+import javax.ws.rs.core.Response;
+
+import static org.wso2.carbon.identity.api.server.common.Constants.V1_API_PATH_COMPONENT;
+
+/**
+ * Implementation of the Api resources REST Api.
+ */
+public class ApiResourcesApiServiceImpl implements ApiResourcesApiService {
+
+    @Autowired
+    ServerAPIResourceManagementService serverAPIResourceManagementService;
+
+    @Override
+    public Response addAPIResource(APIResourceCreationModel apIResourceCreationModel) {
+
+        APIResourceResponse apiResourceResponse =
+                serverAPIResourceManagementService.addAPIResourceWithResourceId(apIResourceCreationModel);
+        URI location = ContextLoader.buildURIForHeader(V1_API_PATH_COMPONENT +
+                APIResourceMgtEndpointConstants.API_RESOURCE_PATH_COMPONENT + "/" + apiResourceResponse.getId());
+        return Response.created(location).entity(apiResourceResponse).build();
+    }
+
+    @Override
+    public Response apiResourcesApiResourceIdDelete(String apiResourceId) {
+
+        serverAPIResourceManagementService.deleteAPIResource(apiResourceId);
+        return Response.noContent().build();
+    }
+
+    @Override
+    public Response apiResourcesApiResourceIdGet(String apiResourceId) {
+
+        return Response.ok().entity(serverAPIResourceManagementService.getAPIResourceById(apiResourceId)).build();
+    }
+
+    @Override
+    public Response apiResourcesApiResourceIdPatch(String apiResourceId, APIResourcePatchModel apIResourcePatchModel) {
+
+        serverAPIResourceManagementService.patchAPIResourceById(apiResourceId, apIResourcePatchModel);
+        return Response.noContent().build();
+    }
+
+    @Override
+    public Response apiResourcesApiResourceIdScopesGet(String apiResourceId) {
+
+        return Response.ok().entity(serverAPIResourceManagementService.getScopesByAPIId(apiResourceId)).build();
+    }
+
+    @Override
+    public Response apiResourcesApiResourceIdScopesPut(String apiResourceId,
+                                                       List<ScopeCreationModel> scopeCreationModel) {
+
+        serverAPIResourceManagementService.putScopesByAPIId(apiResourceId, scopeCreationModel);
+        return Response.noContent().build();
+    }
+
+    @Override
+    public Response apiResourcesApiResourceIdScopesScopeNameDelete(String apiResourceId, String scopeName) {
+
+        serverAPIResourceManagementService.deleteScopeByScopeName(apiResourceId, scopeName);
+        return Response.noContent().build();
+    }
+
+    @Override
+    public Response getAPIResources(String before, String after, String filter, Integer limit, String sortOrder) {
+
+        return Response.ok().entity(serverAPIResourceManagementService.getAPIResources(before, after, filter, limit))
+                .build();
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
new file mode 100644
index 0000000000..b66d889841
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.impl;
+
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApiService;
+import org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceManagementService;
+
+import javax.ws.rs.core.Response;
+
+/**
+ * Implementation of scopes API.
+ */
+public class ScopesApiServiceImpl implements ScopesApiService {
+
+    ServerAPIResourceManagementService serverAPIResourceManagementService =
+            ServerAPIResourceManagementService.getInstance();
+
+    @Override
+    public Response scopesGet(String filter) {
+
+        return Response.ok().entity(serverAPIResourceManagementService.getScopesByTenant(filter)).build();
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/util/APIResourceMgtEndpointUtil.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/util/APIResourceMgtEndpointUtil.java
new file mode 100644
index 0000000000..dff0b7e878
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/util/APIResourceMgtEndpointUtil.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.util;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceMgtClientException;
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceMgtException;
+import org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCreationModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.Error;
+import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeCreationModel;
+import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants;
+import org.wso2.carbon.identity.api.server.api.resource.v1.exception.APIResourceMgtEndpointException;
+import org.wso2.carbon.identity.api.server.common.ContextLoader;
+import org.wso2.carbon.identity.core.util.IdentityUtil;
+import org.wso2.carbon.identity.oauth.IdentityOAuthAdminException;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.ws.rs.core.Response;
+
+import static org.wso2.carbon.identity.api.resource.mgt.constant.APIResourceManagementConstants.ErrorMessages.ERROR_CODE_API_RESOURCE_ALREADY_EXISTS;
+import static org.wso2.carbon.identity.api.resource.mgt.constant.APIResourceManagementConstants.ErrorMessages.ERROR_CODE_SCOPE_ALREADY_EXISTS;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_INVALID_API_RESOURCE_IDENTIFIER;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_INVALID_API_RESOURCE_NAME;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_INVALID_SCOPE_NAME;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_INVALID_SEARCH_ATTRIBUTE;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_RESTRICTED_OIDC_SCOPES;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_RESTRICTED_SCOPE_NAME;
+import static org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_VALIDATE_SCOPES;
+import static org.wso2.carbon.identity.api.server.common.Constants.ERROR_CODE_DELIMITER;
+
+/**
+ * Utility class for API resource management endpoint.
+ */
+public class APIResourceMgtEndpointUtil {
+
+    private static final Log log = LogFactory.getLog(APIResourceMgtEndpointUtil.class);
+
+    public static void validateAPIResource(APIResourceCreationModel apiResource) {
+
+        if (StringUtils.isBlank(apiResource.getName())) {
+            throw handleException(Response.Status.BAD_REQUEST, ERROR_CODE_INVALID_API_RESOURCE_NAME);
+        }
+        if (StringUtils.isBlank(apiResource.getIdentifier())) {
+            throw handleException(Response.Status.BAD_REQUEST, ERROR_CODE_INVALID_API_RESOURCE_IDENTIFIER);
+        }
+    }
+
+    public static void validateScopes(List<ScopeCreationModel> scopes) {
+
+        if (scopes == null || scopes.isEmpty()) {
+            return;
+        }
+        for (ScopeCreationModel scope : scopes) {
+            // Validate scope name.
+            if (StringUtils.isBlank(scope.getName())) {
+                throw handleException(Response.Status.BAD_REQUEST, ERROR_CODE_INVALID_SCOPE_NAME);
+            }
+            // Validate restricted scope names.
+            List<String> restrictedScopes =
+                    IdentityUtil.getPropertyAsList(APIResourceMgtEndpointConstants.RESTRICTED_OAUTH2_SCOPES);
+            for (String restrictedScope : restrictedScopes) {
+                if (scope.getName().startsWith(restrictedScope)) {
+                    throw handleException(Response.Status.BAD_REQUEST, ERROR_CODE_RESTRICTED_SCOPE_NAME);
+                }
+            }
+
+            // Validate OIDC scopes.
+            try {
+                List<String> registeredOIDCScopes = APIResourceManagementServiceHolder.getOAuthAdminServiceImpl()
+                        .getRegisteredOIDCScope(ContextLoader.getTenantDomainFromContext());
+                if (registeredOIDCScopes.contains(scope.getName())) {
+                    throw handleException(Response.Status.BAD_REQUEST, ERROR_CODE_RESTRICTED_OIDC_SCOPES);
+                }
+            } catch (IdentityOAuthAdminException e) {
+                throw handleException(Response.Status.INTERNAL_SERVER_ERROR, ERROR_CODE_VALIDATE_SCOPES);
+            }
+        }
+    }
+
+    /**
+     * Validate the attributes provided for search.
+     *
+     * @param attributes List of attributes to be validated.
+     * @return List of validated attributes.
+     */
+    public static List<String> validateAndConvertToLowerCase(List<String> attributes) {
+
+        List<String> validatedAttributes = new ArrayList<>();
+
+        if (attributes == null || attributes.isEmpty()) {
+            return validatedAttributes;
+        }
+
+        for (String attribute : attributes) {
+            String lowerCaseAttribute = attribute.toLowerCase(Locale.ENGLISH);
+            if (!APIResourceMgtEndpointConstants.ALLOWED_SEARCH_ATTRIBUTES.contains(lowerCaseAttribute)) {
+                throw handleException(Response.Status.BAD_REQUEST, ERROR_CODE_INVALID_SEARCH_ATTRIBUTE);
+            }
+            validatedAttributes.add(lowerCaseAttribute);
+        }
+        return validatedAttributes;
+    }
+
+    public static APIResourceMgtEndpointException handleException(Response.Status status,
+                                                                  APIResourceMgtEndpointConstants.ErrorMessage error) {
+
+        return new APIResourceMgtEndpointException(status, getError(error.getCode(), error.getMessage(),
+                error.getDescription()));
+    }
+
+    public static APIResourceMgtEndpointException handleException(Response.Status status,
+                                                                  APIResourceMgtEndpointConstants.ErrorMessage error,
+                                                                  String data) {
+
+        return new APIResourceMgtEndpointException(status, getError(error.getCode(), error.getMessage(),
+                String.format(error.getDescription(), data)));
+    }
+
+    public static APIResourceMgtEndpointException handleException(Response.Status status, String errorCode,
+                                                                  String message, String description) {
+
+        return new APIResourceMgtEndpointException(status, getError(errorCode, message, description));
+    }
+
+    public static APIResourceMgtEndpointException handleAPIResourceMgtException(APIResourceMgtException e) {
+
+        Response.Status status = Response.Status.INTERNAL_SERVER_ERROR;
+        if (e instanceof APIResourceMgtClientException) {
+            log.debug(e.getMessage(), e);
+            if (ERROR_CODE_API_RESOURCE_ALREADY_EXISTS.getCode().equals(e.getErrorCode()) ||
+                    ERROR_CODE_SCOPE_ALREADY_EXISTS.getCode().equals(e.getErrorCode())) {
+                status = Response.Status.CONFLICT;
+            } else {
+                status = Response.Status.BAD_REQUEST;
+            }
+        } else {
+            log.error(e.getMessage(), e);
+        }
+        String errorCode = e.getErrorCode();
+        errorCode = errorCode.contains(ERROR_CODE_DELIMITER) ? errorCode :
+                APIResourceMgtEndpointConstants.API_RESOURCE_MANAGEMENT_PREFIX + errorCode;
+        return handleException(status, errorCode, e.getMessage(), e.getDescription());
+    }
+
+    /**
+     * Returns a generic error object.
+     *
+     * @param errorCode        Error code.
+     * @param errorMessage     Error message.
+     * @param errorDescription Error description.
+     * @return A generic error with the specified details.
+     */
+    public static Error getError(String errorCode, String errorMessage, String errorDescription) {
+
+        Error error = new Error();
+        error.setCode(errorCode);
+        error.setMessage(errorMessage);
+        error.setDescription(errorDescription);
+        return error;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/APIResources.yaml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/APIResources.yaml
new file mode 100644
index 0000000000..3e3459b97b
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/APIResources.yaml
@@ -0,0 +1,780 @@
+openapi: 3.0.0
+info:
+  description: >
+    This document specifies an **API Resource Management RESTful API** for **WSO2
+    Identity Server**.
+  version: "v1"
+  title: WSO2 Identity Server - API Resource Management Rest API
+  termsOfService: 'http://swagger.io/terms/'
+  contact:
+    name: WSO2
+    url: 'http://wso2.com/products/identity-server/'
+    email: architecture@wso2.org
+  license:
+    name: Apache 2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+
+security:
+  - OAuth2: []
+  - BasicAuth: []
+
+servers:
+  - url: 'https://{server-url}/t/{tenant-domain}/api/server/v1'
+    variables:
+      tenant-domain:
+        default: "carbon.super"
+      server-url:
+        default: "localhost:9443"
+
+paths:
+  /api-resources:
+    post:
+      tags:
+        - API Resources
+      operationId: addAPIResource
+      summary: Add a new API resource
+      description: > 
+        Add a new API resource
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/create <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_create
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIResourceResponse'
+        400:
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        404:
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        409:
+          description: Conflict
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Error'
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/APIResourceCreationModel'
+        description: This represents the API resource to be created.
+        required: true
+    get:
+      tags:
+        - API Resources
+      summary: List all API resources in the server
+      description: > 
+        List all API resources in the server
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/view <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_view
+      operationId: getAPIResources
+      parameters:
+        - $ref: '#/components/parameters/before'
+        - $ref: '#/components/parameters/after'
+        - $ref: '#/components/parameters/filter'
+        - $ref: '#/components/parameters/limit'
+        - $ref: '#/components/parameters/requiredAttributes'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIResourceListResponse'
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+
+  /api-resources/{apiResourceId}:
+    get:
+      tags:
+        - API Resources
+      summary: Get API resource specified by the id
+      description: > 
+        Get API resource specified by the id
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/view <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_view
+      parameters:
+        - $ref: '#/components/parameters/apiResourceId'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIResourceResponse'
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+
+    patch:
+      tags:
+        - API Resources
+      summary: Patch API resource specified by the id
+      description: > 
+        Patch API resource specified by the id. Patch operation only supports "name", "description" updating and "addedScopes" fields at the moment.
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/update <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_update
+      parameters:
+        - $ref: '#/components/parameters/apiResourceId'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/APIResourceResponse'
+        400:
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        404:
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        409:
+          description: Conflict
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Error'
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        501:
+          description: Not Implemented
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/APIResourcePatchModel'
+        description: This represents the API resource to be patched.
+        required: true
+    delete:
+      tags:
+        - API Resources
+      summary: Delete API resource specified by the id
+      description: > 
+        Delete API resource specified by the id
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/delete <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_delete
+      parameters:
+        - $ref: '#/components/parameters/apiResourceId'
+      responses:
+        204:
+          description: No Content
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+
+  /api-resources/{apiResourceId}/scopes:
+    get:
+      tags:
+        - API Resource Scopes
+      summary: Get API resource scopes
+      description: > 
+        Get API resource scopes specified by the id
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/view <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_view
+      parameters:
+        - $ref: '#/components/parameters/apiResourceId'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/ScopeGetModel'
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        404:
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+
+    put:
+      tags:
+        - API Resource Scopes
+      summary: Add scopes to API resource
+      description: > 
+        Put scopes API resource specified by the id
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/update <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_update
+      parameters:
+        - $ref: '#/components/parameters/apiResourceId'
+      responses:
+        204:
+          description: No Content
+        400:
+          description: Bad Request
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        404:
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        409:
+          description: Conflict
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Error'
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                $ref: '#/components/schemas/ScopeCreationModel'
+        description: This represents the API resource to be patched.
+        required: true
+
+  /api-resources/{apiResourceId}/scopes/{scopeName}:
+    delete:
+      tags:
+        - API Resource Scopes
+      summary: Delete API scope specified by the name
+      description: > 
+        Delete API scope specified by the name
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/delete <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_delete
+      parameters:
+        - $ref: '#/components/parameters/apiResourceId'
+        - $ref: '#/components/parameters/scopeName'
+      responses:
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+
+  /scopes:
+    get:
+      tags:
+        - API Resource Scopes
+      summary: Get all scopes in the tenant
+      description: > 
+        Get all scopes in the tenant
+        <b>Permission required:</b> <br>
+          * /permission/admin/manage/identity/apiresourcemgt/view <br>
+        <b>Scope required:</b> <br>
+          * internal_api_resource_view
+      parameters:
+        - $ref: '#/components/parameters/filter'
+      responses:
+        200:
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/ScopeGetModel'
+        401:
+          description: Unauthorized
+        403:
+          description: Forbidden
+        404:
+          description: Not Found
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+        500:
+          description: Server Error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Error'
+
+components:
+  parameters:
+    organizationId:
+      in: path
+      name: organizationId
+      description: uuid of the org.
+      required: true
+      schema:
+        type: string
+        example: "1234-4567-4567"
+
+    apiResourceId:
+      name: apiResourceId
+      in: path
+      description: ID of the API Resource.
+      required: true
+      schema:
+        type: string
+        example: er34-gf23-bv54-vb90
+
+    scopeName:
+      name: scopeName
+      in: path
+      description: Name of the Scope.
+      required: true
+      schema:
+        type: string
+
+    applicationId:
+      name: applicationId
+      in: path
+      description: ID of the Application.
+      required: true
+      schema:
+        type: string
+
+    authorizationId:
+      name: authorizationId
+      in: path
+      description: ID of the authorization.
+      required: true
+      schema:
+        type: string
+
+    before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Base64 encoded cursor value for backward pagination.
+      schema:
+        type: string
+      example: Ng==
+
+    after:
+      name: after
+      in: query
+      required: false
+      description: |
+        Base64 encoded cursor value for forward pagination.
+      schema:
+        type: string
+      example: Ng==
+
+    filter:
+      name: filter
+      in: query
+      required: false
+      description: |
+        Condition to filter the retrieval of records. Supports 'sw', 'co', 'ew' and 'eq' operations.
+      schema:
+        type: string
+      example: identifier+eq+greetings
+
+    limit:
+      name: limit
+      in: query
+      required: false
+      description: |
+        Maximum number of records to return.
+      schema:
+        type: integer
+      example: 10
+
+    requiredAttributes:
+      name: requiredAttributes
+      in: query
+      required: false
+      description: Specifies the required parameters in the response. This parameter is not supported yet
+      schema:
+        type: string
+
+  schemas:
+    Error:
+      type: object
+      properties:
+        code:
+          type: string
+          example: AAA-00000
+        message:
+          type: string
+          example: Some Error Message
+        description:
+          type: string
+          example: Some Error Description
+        traceId:
+          type: string
+          example: e0fbcfeb-3617-43c4-8dd0-7b7d38e13047
+
+    APIResourceListItem:
+      type: object
+      required:
+        - id
+        - name
+        - identifier
+        - self
+      properties:
+        id:
+          type: string
+          example: gh43-jk34-vb34-df67
+        name:
+          type: string
+          example: Greetings API
+        identifier:
+          type: string
+          example: greetings_api
+        type:
+          type: string
+          example: SYSTEM
+        requiresAuthorization:
+          type: boolean
+          example: true
+        self:
+          type: string
+          example: /t/carbon.super/api/server/v1/api-resources/eDUwOUNlcnRpZmljYXRlQXV0aGVudGljYXRvcg
+
+    APIResourceResponse:
+      type: object
+      required:
+        - id
+        - name
+        - identifier
+        - self
+      properties:
+        id:
+          type: string
+          example: gh43-jk34-vb34-df67
+        name:
+          type: string
+          example: Greetings API
+        description:
+          type: string
+          example: Greeting API representation
+        identifier:
+          type: string
+          example: greetings_api
+        type:
+          type: string
+          example: SYSTEM
+        requiresAuthorization:
+          type: boolean
+          example: true
+        scopes:
+          type: array
+          items:
+            $ref: '#/components/schemas/ScopeGetModel'
+        subscribedApplications:
+          type: array
+          items:
+            $ref: '#/components/schemas/SubscribedApplicationGetModel'
+        self:
+          type: string
+          example: /t/carbon.super/api/server/v1/api-resources/eDUwOUNlcnRpZmljYXRlQXV0aGVudGljYXRvcg
+
+    APIResourceCreationModel:
+      type: object
+      required:
+        - identifier
+        - name
+      properties:
+        name:
+          type: string
+          example: Greetings API
+        identifier:
+          type: string
+          example: greetings_api
+        description:
+          type: string
+          example: Greetings API representation
+        requiresAuthorization:
+          type: boolean
+          example: true
+        scopes:
+          type: array
+          items:
+            $ref: '#/components/schemas/ScopeCreationModel'
+
+    APIResourcePatchModel:
+      type: object
+      properties:
+        name:
+          type: string
+          example: Greetings API
+        description:
+          type: string
+          example: Greetings API representation
+        addedScopes:
+          type: array
+          items:
+            $ref: '#/components/schemas/ScopeCreationModel'
+        removedScopes:
+          type: array
+          items:
+            type: string
+          description: This field is not supported yet.
+
+    PaginationLink:
+      type: object
+      properties:
+        rel:
+          type: string
+          example: before
+        href:
+          type: string
+          example: /o/orgName/api-resources?after=NDoy
+
+    APIResourceListResponse:
+      type: object
+      required:
+        - links
+      properties:
+        totalResults:
+          type: integer
+          example: 1
+        links:
+          type: array
+          items:
+            $ref: '#/components/schemas/PaginationLink'
+        APIResources:
+          type: array
+          items:
+            $ref: '#/components/schemas/APIResourceListItem'
+
+    ScopeGetModel:
+      type: object
+      required:
+        - id
+        - displayName
+        - name
+      properties:
+        id:
+          type: string
+          example: sf23-fg34-fy53-hj23
+        displayName:
+          type: string
+          example: Write
+        name:
+          type: string
+          example: greetings:write
+        description:
+          type: string
+          example: Allow writing greetings
+
+    ScopeCreationModel:
+      type: object
+      required:
+        - name
+      properties:
+        name:
+          type: string
+          example: 'greetings:write'
+        displayName:
+          type: string
+          example: "Write Greetings"
+        description:
+          type: string
+          example: "Allows writing greetings"
+
+    SubscribedApplicationGetModel:
+      type: object
+      properties:
+        name:
+          type: string
+          example: Application1
+        id:
+          type: string
+          example: 23fd-23gd-54vv-sdhf
+
+  responses:
+    BadRequest:
+      description: Bad Request. Invalid request or validation error.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+          example:
+            code: 400
+            message: Bad Request
+            description: Invalid request or validation error
+
+    Conflict:
+      description: Conflict. Specified resource already exists.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+          example:
+            code: 409
+            message: Conflict
+            description: Specified resource already exists
+            moreInfo: ''
+            error: []
+    Forbidden:
+      description: >-
+        Forbidden. The request must be conditional but no condition has been
+        specified.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+          example:
+            code: 403
+            message: Forbidden
+            description: >-
+              The request must be conditional but no condition has been
+              specified
+    InternalServerError:
+      description: Internal Server Error.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+          example:
+            code: 500
+            message: Internal Server Error
+            description: >-
+              The server encountered an internal error. Please contact
+              administrator.
+            moreInfo: ''
+            error: []
+    NotFound:
+      description: Not Found. The specified resource does not exist.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+          example:
+            code: 404
+            message: Not Found
+            description: The specified resource does not exist
+            moreInfo: ''
+            error: []
+
+    Unauthorized:
+      description: Unauthorized. The user is not authorized.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+          example:
+            code: 401
+            message: Unauthorized
+            description: The user is not authorized
+            moreInfo: ''
+            error: []
+
+  securitySchemes:
+    BasicAuth:
+      type: http
+      scheme: basic
+    OAuth2:
+      type: oauth2
+      flows:
+        authorizationCode:
+          authorizationUrl: 'https://localhost:9443/oauth2/authorize'
+          tokenUrl: 'http://localhost:9443/oauth2/token'
+          scopes: {}
\ No newline at end of file
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/META-INF/cxf/api-resource-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/META-INF/cxf/api-resource-server-v1-cxf.xml
new file mode 100644
index 0000000000..d0e3e969ba
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/META-INF/cxf/api-resource-server-v1-cxf.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+    <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceManagementService"/>
+    <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.impl.ApiResourcesApiServiceImpl"/>
+    <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.impl.ScopesApiServiceImpl"/>
+
+    <bean id="apiResourceManagementServiceHolderBean"
+          class="org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder">
+        <property name="apiResourceManager" ref="apiResourceManagementServiceFactoryBean"/>
+        <property name="oAuthAdminServiceImpl" ref="oAuthAdminOSGiServiceFactoryBean"/>
+    </bean>
+
+    <bean id="apiResourceManagementServiceFactoryBean"
+          class="org.wso2.carbon.identity.api.server.api.resource.common.factory.APIResourceMgtOSGiServiceFactory"/>
+
+    <bean id="oAuthAdminOSGiServiceFactoryBean"
+          class="org.wso2.carbon.identity.api.server.api.resource.common.factory.OAuthAdminOSGiServiceFactory"/>
+</beans>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
new file mode 100644
index 0000000000..47eec109b3
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>identity-api-server</artifactId>
+        <groupId>org.wso2.carbon.identity.server.api</groupId>
+        <version>1.2.79-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
+    <version>1.2.79-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>org.wso2.carbon.identity.api.server.api.resource.common</module>
+        <module>org.wso2.carbon.identity.api.server.api.resource.v1</module>
+    </modules>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 155af72a21..cfd1f0685f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,6 +191,12 @@
                 <version>${carbon.identity.framework.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.api.resource.mgt</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
@@ -394,6 +400,12 @@
                 <version>${project.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.server.api</groupId>
+                <artifactId>org.wso2.carbon.identity.api.server.api.resource.common</artifactId>
+                <version>${project.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.user.api</artifactId>
@@ -775,6 +787,7 @@
         <module>components/org.wso2.carbon.identity.api.idle.account.identification</module>
         <module>components/org.wso2.carbon.identity.api.expired.password.identification</module>
         <module>components/org.wso2.carbon.identity.api.server.organization.user.invitation.management</module>
+        <module>components/org.wso2.carbon.identity.api.server.api.resource</module>
     </modules>
 
 </project>

From 309ef1da7a07b1cbab113bdae9aa5e30bfbe1bad Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Wed, 13 Sep 2023 09:54:13 +0530
Subject: [PATCH 06/17] address review comments

---
 .../pom.xml                                   |  3 +-
 .../pom.xml                                   |  6 +--
 .../ServerAPIResourceManagementService.java   | 14 +++---
 .../APIResourceMgtEndpointException.java      | 38 ---------------
 .../v1/util/APIResourceMgtEndpointUtil.java   | 46 ++++++++++---------
 .../src/main/resources/APIResources.yaml      | 10 ++--
 .../pom.xml                                   |  3 +-
 7 files changed, 39 insertions(+), 81 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/exception/APIResourceMgtEndpointException.java

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index a150b8a81b..d8d8d5026e 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,12 +22,11 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.79-SNAPSHOT</version>
+        <version>1.2.81-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.api.resource.common</artifactId>
-    <version>1.2.79-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 68d3c26206..3a4f6d82d0 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,14 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.79-SNAPSHOT</version>
+        <version>1.2.81-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <name>WSO2 Identity Server - Applications Rest API</name>
+    <name>WSO2 Identity Server - API Resource Rest API</name>
     <description>WSO2 Identity Server - API Resource Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.api.resource.v1</artifactId>
-    <version>1.2.79-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -114,6 +113,7 @@
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.application.common</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
index c31252fd4d..ce54f1ba35 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
@@ -36,9 +36,9 @@
 import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeGetModel;
 import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants;
 import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants.ErrorMessage;
-import org.wso2.carbon.identity.api.server.api.resource.v1.exception.APIResourceMgtEndpointException;
 import org.wso2.carbon.identity.api.server.api.resource.v1.util.APIResourceMgtEndpointUtil;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
+import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.application.common.model.APIResource;
 import org.wso2.carbon.identity.application.common.model.Scope;
 
@@ -105,9 +105,9 @@ public APIResourceResponse addAPIResourceWithResourceId(APIResourceCreationModel
     /**
      * Get API Resources.
      *
-     * @param before - before parameter for cursor based pagination.
-     * @param after  - after parameter for cursor based pagination.
-     * @param filter - filter parameter.
+     * @param before before parameter for cursor based pagination.
+     * @param after  after parameter for cursor based pagination.
+     * @param filter filter parameter.
      * @return Response with API Resources list.
      */
     public APIResourceListResponse getAPIResources(String before, String after, String filter, Integer limit) {
@@ -132,7 +132,7 @@ public APIResourceListResponse getAPIResources(String before, String after, Stri
                             CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             List<APIResource> apiResources = apiResourceSearchResult.getAPIResources();
 
-            if (limit != 0 && CollectionUtils.isNotEmpty(apiResources)) {
+            if (CollectionUtils.isNotEmpty(apiResources)) {
                 boolean hasMoreItems = apiResources.size() > limit;
                 boolean needsReverse = StringUtils.isNotBlank(before);
                 boolean isFirstPage = (StringUtils.isBlank(before) && StringUtils.isBlank(after)) ||
@@ -454,9 +454,9 @@ private PaginationLink buildPaginationLink(String url, String rel) {
      *
      * @param limit Limit parameter.
      * @return Validated limit.
-     * @throws APIResourceMgtEndpointException if the limit is invalid.
+     * @throws APIError if the limit is invalid.
      */
-    private static Integer validatedLimit(Integer limit) throws APIResourceMgtEndpointException {
+    private static Integer validatedLimit(Integer limit) throws APIError {
 
         limit = limit == null ? DEFAULT_LIMIT : limit;
         if (limit == 0 || limit < 0) {
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/exception/APIResourceMgtEndpointException.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/exception/APIResourceMgtEndpointException.java
deleted file mode 100644
index 9976a6f910..0000000000
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/exception/APIResourceMgtEndpointException.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.api.resource.v1.exception;
-
-import org.wso2.carbon.identity.api.server.api.resource.v1.Error;
-
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-/**
- * Exception class for API resource management endpoint.
- */
-public class APIResourceMgtEndpointException extends WebApplicationException {
-
-    public APIResourceMgtEndpointException(Response.Status status, Error error) {
-
-        super(Response.status(status).entity(error).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                .build());
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/util/APIResourceMgtEndpointUtil.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/util/APIResourceMgtEndpointUtil.java
index dff0b7e878..e039b5b17c 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/util/APIResourceMgtEndpointUtil.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/util/APIResourceMgtEndpointUtil.java
@@ -25,11 +25,11 @@
 import org.wso2.carbon.identity.api.resource.mgt.APIResourceMgtException;
 import org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCreationModel;
-import org.wso2.carbon.identity.api.server.api.resource.v1.Error;
 import org.wso2.carbon.identity.api.server.api.resource.v1.ScopeCreationModel;
 import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants;
-import org.wso2.carbon.identity.api.server.api.resource.v1.exception.APIResourceMgtEndpointException;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
+import org.wso2.carbon.identity.api.server.common.error.APIError;
+import org.wso2.carbon.identity.api.server.common.error.ErrorDTO;
 import org.wso2.carbon.identity.core.util.IdentityUtil;
 import org.wso2.carbon.identity.oauth.IdentityOAuthAdminException;
 
@@ -55,7 +55,7 @@
  */
 public class APIResourceMgtEndpointUtil {
 
-    private static final Log log = LogFactory.getLog(APIResourceMgtEndpointUtil.class);
+    private static final Log LOG = LogFactory.getLog(APIResourceMgtEndpointUtil.class);
 
     public static void validateAPIResource(APIResourceCreationModel apiResource) {
 
@@ -69,7 +69,7 @@ public static void validateAPIResource(APIResourceCreationModel apiResource) {
 
     public static void validateScopes(List<ScopeCreationModel> scopes) {
 
-        if (scopes == null || scopes.isEmpty()) {
+        if (scopes == null) {
             return;
         }
         for (ScopeCreationModel scope : scopes) {
@@ -90,8 +90,10 @@ public static void validateScopes(List<ScopeCreationModel> scopes) {
             try {
                 List<String> registeredOIDCScopes = APIResourceManagementServiceHolder.getOAuthAdminServiceImpl()
                         .getRegisteredOIDCScope(ContextLoader.getTenantDomainFromContext());
-                if (registeredOIDCScopes.contains(scope.getName())) {
-                    throw handleException(Response.Status.BAD_REQUEST, ERROR_CODE_RESTRICTED_OIDC_SCOPES);
+                if (registeredOIDCScopes != null) {
+                    if (registeredOIDCScopes.contains(scope.getName())) {
+                        throw handleException(Response.Status.BAD_REQUEST, ERROR_CODE_RESTRICTED_OIDC_SCOPES);
+                    }
                 }
             } catch (IdentityOAuthAdminException e) {
                 throw handleException(Response.Status.INTERNAL_SERVER_ERROR, ERROR_CODE_VALIDATE_SCOPES);
@@ -109,7 +111,7 @@ public static List<String> validateAndConvertToLowerCase(List<String> attributes
 
         List<String> validatedAttributes = new ArrayList<>();
 
-        if (attributes == null || attributes.isEmpty()) {
+        if (attributes == null) {
             return validatedAttributes;
         }
 
@@ -123,32 +125,32 @@ public static List<String> validateAndConvertToLowerCase(List<String> attributes
         return validatedAttributes;
     }
 
-    public static APIResourceMgtEndpointException handleException(Response.Status status,
-                                                                  APIResourceMgtEndpointConstants.ErrorMessage error) {
+    public static APIError handleException(Response.Status status,
+                                           APIResourceMgtEndpointConstants.ErrorMessage error) {
 
-        return new APIResourceMgtEndpointException(status, getError(error.getCode(), error.getMessage(),
+        return new APIError(status, getError(error.getCode(), error.getMessage(),
                 error.getDescription()));
     }
 
-    public static APIResourceMgtEndpointException handleException(Response.Status status,
-                                                                  APIResourceMgtEndpointConstants.ErrorMessage error,
-                                                                  String data) {
+    public static APIError handleException(Response.Status status,
+                                           APIResourceMgtEndpointConstants.ErrorMessage error,
+                                           String data) {
 
-        return new APIResourceMgtEndpointException(status, getError(error.getCode(), error.getMessage(),
+        return new APIError(status, getError(error.getCode(), error.getMessage(),
                 String.format(error.getDescription(), data)));
     }
 
-    public static APIResourceMgtEndpointException handleException(Response.Status status, String errorCode,
-                                                                  String message, String description) {
+    public static APIError handleException(Response.Status status, String errorCode,
+                                           String message, String description) {
 
-        return new APIResourceMgtEndpointException(status, getError(errorCode, message, description));
+        return new APIError(status, getError(errorCode, message, description));
     }
 
-    public static APIResourceMgtEndpointException handleAPIResourceMgtException(APIResourceMgtException e) {
+    public static APIError handleAPIResourceMgtException(APIResourceMgtException e) {
 
         Response.Status status = Response.Status.INTERNAL_SERVER_ERROR;
         if (e instanceof APIResourceMgtClientException) {
-            log.debug(e.getMessage(), e);
+            LOG.debug(e.getMessage(), e);
             if (ERROR_CODE_API_RESOURCE_ALREADY_EXISTS.getCode().equals(e.getErrorCode()) ||
                     ERROR_CODE_SCOPE_ALREADY_EXISTS.getCode().equals(e.getErrorCode())) {
                 status = Response.Status.CONFLICT;
@@ -156,7 +158,7 @@ public static APIResourceMgtEndpointException handleAPIResourceMgtException(APIR
                 status = Response.Status.BAD_REQUEST;
             }
         } else {
-            log.error(e.getMessage(), e);
+            LOG.error(e.getMessage(), e);
         }
         String errorCode = e.getErrorCode();
         errorCode = errorCode.contains(ERROR_CODE_DELIMITER) ? errorCode :
@@ -172,9 +174,9 @@ public static APIResourceMgtEndpointException handleAPIResourceMgtException(APIR
      * @param errorDescription Error description.
      * @return A generic error with the specified details.
      */
-    public static Error getError(String errorCode, String errorMessage, String errorDescription) {
+    public static ErrorDTO getError(String errorCode, String errorMessage, String errorDescription) {
 
-        Error error = new Error();
+        ErrorDTO error = new ErrorDTO();
         error.setCode(errorCode);
         error.setMessage(errorMessage);
         error.setDescription(errorDescription);
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/APIResources.yaml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/APIResources.yaml
index 3e3459b97b..aae71fe967 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/APIResources.yaml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/APIResources.yaml
@@ -163,12 +163,8 @@ paths:
       parameters:
         - $ref: '#/components/parameters/apiResourceId'
       responses:
-        200:
-          description: OK
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/APIResourceResponse'
+        204:
+          description: Not Content
         400:
           description: Bad Request
           content:
@@ -777,4 +773,4 @@ components:
         authorizationCode:
           authorizationUrl: 'https://localhost:9443/oauth2/authorize'
           tokenUrl: 'http://localhost:9443/oauth2/token'
-          scopes: {}
\ No newline at end of file
+          scopes: {}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index 47eec109b3..7627fb68d9 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,12 +22,11 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.79-SNAPSHOT</version>
+        <version>1.2.81-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-    <version>1.2.79-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>

From 65bac930b44c5542bb25a5eba3887117d981dcf0 Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Mon, 18 Sep 2023 14:13:39 +0530
Subject: [PATCH 07/17] Update pom

---
 .../pom.xml                                                     | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index d8d8d5026e..6f8cca4ef4 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 3a4f6d82d0..c38788cbcc 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index 7627fb68d9..0a35d49f1f 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.81-SNAPSHOT</version>
+        <version>1.2.82-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 4e698fa953cb6921337dd4ba0d2386abf21f101f Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 18 Sep 2023 08:51:18 +0000
Subject: [PATCH 08/17] [WSO2 Release] [Jenkins #819] [Release 1.2.82] prepare
 release v1.2.82

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.challenge/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.fetch.remote/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 88 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index ca22c3df21..b4c09dfd1b 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 6d09b964df..fd3e4517b9 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index fb1a959856..64f32af058 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 09e771df99..c805835b4f 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 651c9a4e52..289c39fd70 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index d53d0f6019..1f03cf5cd9 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index d8023150aa..4453f12fbc 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 85cad15476..428ceec3a0 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index d3220e3965..f9e9c99a91 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 456cdfcbb7..016caae52e 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.82-SNAPSHOT</version>
+    <version>1.2.82</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index fb533c8264..260d064716 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.2.82-SNAPSHOT</version>
+    <version>1.2.82</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 2238898f6d..79b35221d8 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.82-SNAPSHOT</version>
+    <version>1.2.82</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 281c19640e..e093c4d933 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 5cedaa7e3a..c7e3f169e6 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 33e39bb6d7..45857b4f24 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 9fe3b2f5f8..d9cf0194bc 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index b758fc7573..9d0b8fbe16 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 20837cb267..ed69274112 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
index 384cd7e279..3bae127b88 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
index 0714c924dd..b45aa517f2 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
index 5a65114d9a..b163f79488 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 5faba17d2b..e514a106f9 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index dd66d6dd84..23a489a069 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 3753943164..b9e42a25a1 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index e295c61b20..c22b18b840 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 8751337647..b9fe4dfebe 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 71a4ff4eff..554bf73649 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 569fb11e63..f1685b8164 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index 1c736ed3d4..6e0f47a899 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index ad1957c6e8..7d772400b7 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 663322f21f..e7c6d2f4d6 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index a83e963000..86840223e6 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 9e9e70f041..6e3d51ea02 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index b115d352b8..69861df4c0 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index ea47b202af..c73d278c09 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 7399a01372..a69b015ded 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 2c4306f0bc..95df6aca8d 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
index 111fa579e2..97e056cc0b 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
index 577c1b8945..2409dce8e6 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
index 652463d6e2..726843d0b2 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index c615a4d36b..1e517aa1fc 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index 2a5368729b..e54cb43dc5 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 33dec82dbe..0094f8103a 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index 7d36d0f752..e296dde968 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index a8901673f2..383a514595 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 8e9d01728e..cb3940eede 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 58fa34043b..b33bb5670a 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 206d6a416e..32e9dfb58b 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 172a9aa9d2..d258a638d8 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index f9e4f872b4..5e13ca3e24 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 669f80ba0d..9941618d2f 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.2.82-SNAPSHOT</version>
+    <version>1.2.82</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 08b6902ec3..006e1c024d 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 2fb4c093fd..36f5141f26 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index c0b083afd2..4dff1f3dc1 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 4a0276d1c2..38b54446c5 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index eea6f8f5ff..14ab853ba6 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index d77aa2248a..dadc5bae75 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index d110c82aa9..d2a953009a 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index d700e60dbf..7aacde7fc0 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 4f5239549a..2951f2db08 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index afc2eddabb..a11d30d479 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index b620f8fd9b..4c6594e675 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 27f668dd9a..3c8a263329 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 770b9863ff..648babc232 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index cb6687a245..80ff4d1703 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index cf1b4b0453..29820d1534 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index fa21166965..3d13c60931 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index fef2c3e65c..6df1da637b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 536f7e7cde..132f1ddff4 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 7825bd072d..83f7a5ed9f 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 09dc7c4e3f..d4ac3abb44 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index 62508e2891..d286532863 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index bec119a9f8..268f522693 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 915f2e1350..89a604a432 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index c38c9cb79c..a9d9e7e792 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index 4a8c3d2098..039d3f2ad2 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index e6e576dbae..a6ab1ee709 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 927c648aca..4595e12223 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 95c426d760..364821dbab 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index ea29c60895..1e559e34e1 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index b4a8f41982..dc3bcb4a73 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index f13252ef97..5b35706036 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 576234310b..173774b665 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 15fd41de82..3364cad65d 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 012e33c581..9f43babdc8 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
index c09877d09f..d9cc0f42b4 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.workflow.engine</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
index d3da4f54b0..7e106ec370 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.82</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 155af72a21..81ba980b81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.82-SNAPSHOT</version>
+    <version>1.2.82</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.2.82</tag>
     </scm>
 
 

From a2b3b4e5d011afc02972702bd18ac63d6f97601a Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 18 Sep 2023 08:51:20 +0000
Subject: [PATCH 09/17] [WSO2 Release] [Jenkins #819] [Release 1.2.82] prepare
 for next development iteration

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.challenge/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.fetch.remote/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 88 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index b4c09dfd1b..34026f8a9a 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index fd3e4517b9..d5f397b8e1 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 64f32af058..3752704134 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index c805835b4f..6025cff786 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 289c39fd70..447215bb94 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index 1f03cf5cd9..8ecac087b2 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 4453f12fbc..0e8c9ffe70 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 428ceec3a0..695369f39a 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index f9e9c99a91..38e176f14f 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 016caae52e..0ebf251b96 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.82</version>
+    <version>1.2.83-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 260d064716..84b824c49c 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.2.82</version>
+    <version>1.2.83-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 79b35221d8..f2a5e20e66 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.82</version>
+    <version>1.2.83-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index e093c4d933..997f08607f 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index c7e3f169e6..a67573f542 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 45857b4f24..2fea582053 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index d9cf0194bc..b3acf0b182 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index 9d0b8fbe16..7e35bd1057 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index ed69274112..472e9785e7 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
index 3bae127b88..2fd730561e 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
index b45aa517f2..1eb903be89 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
index b163f79488..1e314a8cc8 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index e514a106f9..88a03799d2 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 23a489a069..32731d8463 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index b9e42a25a1..1c5d940e93 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index c22b18b840..b6dbfebd27 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index b9fe4dfebe..c72c1302e8 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 554bf73649..b20088ad18 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index f1685b8164..2cf25a6483 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index 6e0f47a899..a9d33e3fc5 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 7d772400b7..329421eb00 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index e7c6d2f4d6..fb4b243946 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 86840223e6..7f31817301 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index 6e3d51ea02..fcaf60fda0 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 69861df4c0..8c362ae353 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index c73d278c09..603b86fbde 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index a69b015ded..b3680e6181 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 95df6aca8d..5a4fbd94f2 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
index 97e056cc0b..1b381383d6 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
index 2409dce8e6..cc6c340c8f 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
index 726843d0b2..f2541d0667 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 1e517aa1fc..ef046cbb5e 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index e54cb43dc5..ce600f04b8 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 0094f8103a..8f65bf7848 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index e296dde968..ca24f0e6d7 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 383a514595..4ef1b02354 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index cb3940eede..63e94b5751 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index b33bb5670a..deeb05596a 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 32e9dfb58b..39ef481ade 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index d258a638d8..7517960d63 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 5e13ca3e24..d2be720796 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 9941618d2f..f34102131f 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.2.82</version>
+    <version>1.2.83-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 006e1c024d..af271b915f 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 36f5141f26..4365b68401 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 4dff1f3dc1..17c9029dad 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 38b54446c5..dd1a7e23dd 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 14ab853ba6..5c2266b52d 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index dadc5bae75..198bbe16ea 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index d2a953009a..75dbef011a 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 7aacde7fc0..249f17b28d 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 2951f2db08..612fc668b6 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index a11d30d479..b45ed0e1b3 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 4c6594e675..3a12765690 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 3c8a263329..fb8c67c655 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 648babc232..ed3a61a727 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 80ff4d1703..f669f981ad 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 29820d1534..ea0183511f 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index 3d13c60931..d21cc7e4a9 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 6df1da637b..8e54f969a1 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 132f1ddff4..57139c51eb 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 83f7a5ed9f..1f5f55efd7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index d4ac3abb44..1344b0193d 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index d286532863..b65eadead4 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index 268f522693..2039c48436 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 89a604a432..302bca3f6f 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index a9d9e7e792..edef6de5b1 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index 039d3f2ad2..babdc51cf8 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index a6ab1ee709..05ad928628 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 4595e12223..37c633f97b 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 364821dbab..5a5c66f171 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 1e559e34e1..95427bf96c 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index dc3bcb4a73..873c254bb6 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 5b35706036..379f7e126e 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 173774b665..d45895d95d 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 3364cad65d..096a5f8735 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 9f43babdc8..09cebe3f13 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
index d9cc0f42b4..9346f47ead 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.workflow.engine</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
index 7e106ec370..a47d31ff73 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 81ba980b81..3848f5c33f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.82</version>
+    <version>1.2.83-SNAPSHOT</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>v1.2.82</tag>
+        <tag>HEAD</tag>
     </scm>
 
 

From 9b7a5c35cf160bb97b3bf2233355215a698c2428 Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Mon, 18 Sep 2023 16:56:17 +0530
Subject: [PATCH 10/17] use autowire

---
 .../v1/core/ServerAPIResourceManagementService.java   | 11 -----------
 .../api/resource/v1/impl/ScopesApiServiceImpl.java    |  5 +++--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
index ce54f1ba35..06fdf3544f 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
@@ -63,19 +63,8 @@
  */
 public class ServerAPIResourceManagementService {
 
-    private static final ServerAPIResourceManagementService instance = new ServerAPIResourceManagementService();
-
     private static final Log LOG = LogFactory.getLog(ServerAPIResourceManagementService.class);
 
-    private ServerAPIResourceManagementService() {
-
-    }
-
-    public static ServerAPIResourceManagementService getInstance() {
-
-        return instance;
-    }
-
     /**
      * Add API resource.
      *
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
index b66d889841..808d70d219 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.server.api.resource.v1.impl;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApiService;
 import org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceManagementService;
 
@@ -28,8 +29,8 @@
  */
 public class ScopesApiServiceImpl implements ScopesApiService {
 
-    ServerAPIResourceManagementService serverAPIResourceManagementService =
-            ServerAPIResourceManagementService.getInstance();
+    @Autowired
+    ServerAPIResourceManagementService serverAPIResourceManagementService;
 
     @Override
     public Response scopesGet(String filter) {

From 89381aeddfd4c39617b5f995f7aaa450b7425aac Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Mon, 18 Sep 2023 21:04:36 +0530
Subject: [PATCH 11/17] simplify if condition

---
 .../resource/v1/core/ServerAPIResourceManagementService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
index 06fdf3544f..68652684dc 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
@@ -448,7 +448,7 @@ private PaginationLink buildPaginationLink(String url, String rel) {
     private static Integer validatedLimit(Integer limit) throws APIError {
 
         limit = limit == null ? DEFAULT_LIMIT : limit;
-        if (limit == 0 || limit < 0) {
+        if (limit <= 0) {
             throw APIResourceMgtEndpointUtil.handleException(Response.Status.BAD_REQUEST,
                     ErrorMessage.ERROR_CODE_INVALID_LIMIT);
         }

From db434f949f8a20f9882300c3b67591bd8ad8b891 Mon Sep 17 00:00:00 2001
From: Thamindu Aluthwala <thamindu.randil@gmail.com>
Date: Mon, 18 Sep 2023 21:37:33 +0530
Subject: [PATCH 12/17] update pom

---
 .../pom.xml                                                     | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 6f8cca4ef4..4b89afbd3d 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index c38788cbcc..c2d54dc8c4 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index 0a35d49f1f..c11ff9fcc6 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.82-SNAPSHOT</version>
+        <version>1.2.83-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

From 82557caa1210083af9c0b00fcc8418b0290b560f Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 18 Sep 2023 16:40:56 +0000
Subject: [PATCH 13/17] [WSO2 Release] [Jenkins #821] [Release 1.2.83] prepare
 release v1.2.83

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.challenge/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.fetch.remote/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 91 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index 34026f8a9a..aa53f6a41a 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index d5f397b8e1..2d3317edb4 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 3752704134..6985b985a6 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 6025cff786..6dd323e990 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 447215bb94..35149432e8 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index 8ecac087b2..1053b977c0 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 0e8c9ffe70..314da4641b 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 695369f39a..3399147c8a 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 38e176f14f..573c03f2c3 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 4b89afbd3d..2f0cea2726 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index c2d54dc8c4..a24a75afff 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index c11ff9fcc6..d50db8ac3d 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 0ebf251b96..2e96e1292e 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.83-SNAPSHOT</version>
+    <version>1.2.83</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 84b824c49c..595e542cce 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.2.83-SNAPSHOT</version>
+    <version>1.2.83</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index f2a5e20e66..b1fef296f9 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.83-SNAPSHOT</version>
+    <version>1.2.83</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 997f08607f..06004e10e7 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index a67573f542..ee71f1fd90 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 2fea582053..040d6e3e48 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index b3acf0b182..c8a89687c3 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index 7e35bd1057..22149039c3 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 472e9785e7..6c190bc294 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
index 2fd730561e..8f01b0f3e4 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
index 1eb903be89..0a7cfef95b 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
index 1e314a8cc8..f76bb6eabe 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 88a03799d2..3b3278a0d0 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 32731d8463..326d4bc1e9 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 1c5d940e93..051249ae97 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index b6dbfebd27..5ff1a5ca05 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index c72c1302e8..130f62b96c 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index b20088ad18..43a8cf75c8 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 2cf25a6483..37c0487d4a 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index a9d33e3fc5..fa9b96214a 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 329421eb00..616a16c7c5 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index fb4b243946..290cd5eb64 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 7f31817301..1079e586ee 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index fcaf60fda0..fcb3cec00f 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 8c362ae353..8835ead75f 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 603b86fbde..1585640e2f 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index b3680e6181..552ba6adbe 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 5a4fbd94f2..8cdaad753e 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
index 1b381383d6..b82114d267 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
index cc6c340c8f..36edecdb2f 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
index f2541d0667..7d61ef311e 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index ef046cbb5e..dff7658499 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index ce600f04b8..d8e1f7c403 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 8f65bf7848..c37a23170a 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index ca24f0e6d7..6c89a2f11a 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 4ef1b02354..636e5f0b6e 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 63e94b5751..0ebe39c200 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index deeb05596a..7018a0c791 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 39ef481ade..32bd3da0a1 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 7517960d63..4ccc5efde7 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index d2be720796..8937cfc5c4 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index f34102131f..aefaee89be 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.2.83-SNAPSHOT</version>
+    <version>1.2.83</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index af271b915f..33435c8f0d 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 4365b68401..a58b32b568 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 17c9029dad..258e4c72b7 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index dd1a7e23dd..826e159282 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 5c2266b52d..c19261e89c 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 198bbe16ea..b46eef83cd 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 75dbef011a..43a3fb5ae0 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 249f17b28d..e5aa7b234e 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 612fc668b6..920f841fc6 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index b45ed0e1b3..e635d6c7fc 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 3a12765690..ab9c1d38c6 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index fb8c67c655..623e774e56 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index ed3a61a727..543ad1ad78 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index f669f981ad..f3f00478e4 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index ea0183511f..3f15b269cb 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index d21cc7e4a9..3896c9098d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 8e54f969a1..00dc0bb4b3 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 57139c51eb..1ca3a32588 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 1f5f55efd7..268a017384 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 1344b0193d..20f5beb578 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index b65eadead4..4914a7fe8a 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index 2039c48436..d735b98b3e 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index 302bca3f6f..ed94d7cca8 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index edef6de5b1..ab67fcd32f 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index babdc51cf8..57efe2f6a7 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 05ad928628..001ff9326d 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 37c633f97b..66720f49b6 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 5a5c66f171..de58e96d2c 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 95427bf96c..2e573d4487 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 873c254bb6..53c42532b4 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 379f7e126e..0ba3281e51 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index d45895d95d..2beb82ddaa 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 096a5f8735..5217d55be1 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index 09cebe3f13..d05106b19c 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
index 9346f47ead..996846380c 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.workflow.engine</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
index a47d31ff73..7a11c9e7e1 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83-SNAPSHOT</version>
+        <version>1.2.83</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 6ef1b3d2ab..560a9f906f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.83-SNAPSHOT</version>
+    <version>1.2.83</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.2.83</tag>
     </scm>
 
 

From 1796eb79214470efb22e3e6480b1615a0ed053f5 Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Mon, 18 Sep 2023 16:40:59 +0000
Subject: [PATCH 14/17] [WSO2 Release] [Jenkins #821] [Release 1.2.83] prepare
 for next development iteration

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.challenge/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.fetch.remote/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 91 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index aa53f6a41a..954f3bea3e 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 2d3317edb4..56baed3361 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 6985b985a6..974646e86f 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 6dd323e990..1bdf3ad8fd 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index 35149432e8..f524d79b1d 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index 1053b977c0..1b9d50989e 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index 314da4641b..d9639b3519 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 3399147c8a..a9301c5a33 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index 573c03f2c3..a77757d042 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index 2f0cea2726..c6883f5b33 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index a24a75afff..e7a512e058 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index d50db8ac3d..45f809070f 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 2e96e1292e..b8e28c7cfd 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.83</version>
+    <version>1.2.84-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 595e542cce..2aff4ef9a0 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.2.83</version>
+    <version>1.2.84-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index b1fef296f9..226c876f48 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.83</version>
+    <version>1.2.84-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 06004e10e7..adf5f83e85 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index ee71f1fd90..a977ec1b61 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 040d6e3e48..b6a2d5e86d 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index c8a89687c3..82985517ec 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index 22149039c3..fc61d612be 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 6c190bc294..62a912a7fa 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
index 8f01b0f3e4..7ac56739f9 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
index 0a7cfef95b..340c96a38e 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
index f76bb6eabe..9aac8ca2e5 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 3b3278a0d0..ae6faf64c5 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 326d4bc1e9..0ef3388161 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 051249ae97..af0122f09b 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index 5ff1a5ca05..58d55c325f 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 130f62b96c..92ba424e41 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 43a8cf75c8..697fe1c45c 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 37c0487d4a..0011e36126 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index fa9b96214a..947cb86e35 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 616a16c7c5..1e0e862188 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 290cd5eb64..0ed5c1e29f 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index 1079e586ee..a720352b1c 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index fcb3cec00f..cc022de009 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index 8835ead75f..a2b4bc9a1b 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 1585640e2f..8cd0075b41 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 552ba6adbe..90f7f486c3 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 8cdaad753e..85aab330ca 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
index b82114d267..b223da2dc4 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
index 36edecdb2f..5344adabc9 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
index 7d61ef311e..7b5ba40989 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index dff7658499..7682a6e317 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index d8e1f7c403..04391cce8c 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index c37a23170a..9ff59f1a81 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index 6c89a2f11a..9b4ea69ed6 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 636e5f0b6e..61a18ce73c 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index 0ebe39c200..a32aca1d14 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 7018a0c791..1cf9b5184b 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 32bd3da0a1..91d73c9e8f 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 4ccc5efde7..148d7092bb 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 8937cfc5c4..532050453b 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index aefaee89be..b8e0336cba 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.2.83</version>
+    <version>1.2.84-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 33435c8f0d..207d3db6ff 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index a58b32b568..5b1259d765 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index 258e4c72b7..a2db67e728 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 826e159282..72270d3399 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index c19261e89c..9446335f40 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index b46eef83cd..9b2dfc9c93 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 43a3fb5ae0..91fd1671d5 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index e5aa7b234e..7e0d6d13dd 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 920f841fc6..e3bd782df0 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index e635d6c7fc..a418316878 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index ab9c1d38c6..6c59ba1fda 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index 623e774e56..ab5d1f4c9c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 543ad1ad78..7dd849e6a0 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index f3f00478e4..94be248e98 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 3f15b269cb..7b70706cf4 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index 3896c9098d..6fb11b3d93 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 00dc0bb4b3..6380ee0803 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 1ca3a32588..33b20a0b31 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 268a017384..1b7dfa332a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 20f5beb578..f1fc9f7cf6 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index 4914a7fe8a..720265ff9a 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index d735b98b3e..e33a9422b5 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index ed94d7cca8..da812d4385 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index ab67fcd32f..a52bf36fe1 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index 57efe2f6a7..d0c215710b 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 001ff9326d..5971496679 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 66720f49b6..d3227358a3 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index de58e96d2c..7d3a090257 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 2e573d4487..d7e6fee251 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 53c42532b4..a33fc98e2c 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 0ba3281e51..4a92320912 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 2beb82ddaa..68290a7487 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 5217d55be1..a65a99292a 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index d05106b19c..fc9dbb19bd 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
index 996846380c..ad19f18979 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.workflow.engine</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
index 7a11c9e7e1..f622c4ce8f 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.83</version>
+        <version>1.2.84-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 560a9f906f..b6901e19e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.83</version>
+    <version>1.2.84-SNAPSHOT</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>v1.2.83</tag>
+        <tag>HEAD</tag>
     </scm>
 
 

From 54e6b5090648d3af40befbd46a0439f70a0614ee Mon Sep 17 00:00:00 2001
From: dewniMW <dewni.matheesha@gmail.com>
Date: Thu, 21 Sep 2023 10:01:15 +0530
Subject: [PATCH 15/17] Add organization configuration management API

---
 .../pom.xml                                   |  57 ++++++
 .../OrganizationConfigsServiceHolder.java     |  49 +++++
 ...zationConfigManagerOSGIServiceFactory.java |  53 +++++
 .../pom.xml                                   | 170 +++++++++++++++
 .../configs/v1/OrganizationConfigsApi.java    | 115 +++++++++++
 .../v1/OrganizationConfigsApiService.java     |  39 ++++
 .../OrganizationConfigsApiServiceFactory.java |  32 +++
 .../organization/configs/v1/model/Config.java | 109 ++++++++++
 .../organization/configs/v1/model/Error.java  | 169 +++++++++++++++
 .../configs/v1/model/Properties.java          | 123 +++++++++++
 .../v1/core/OrganizationConfigsService.java   | 136 ++++++++++++
 .../OrganizationConfigsApiServiceImpl.java    |  55 +++++
 .../organization-configs-server-v1-cxf.xml    |  31 +++
 .../main/resources/organization-configs.yaml  | 193 ++++++++++++++++++
 .../pom.xml                                   |  37 ++++
 pom.xml                                       |  15 +-
 16 files changed, 1382 insertions(+), 1 deletion(-)
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/common/OrganizationConfigsServiceHolder.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/common/factory/OrganizationConfigManagerOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/OrganizationConfigsApi.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/OrganizationConfigsApiService.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/factories/OrganizationConfigsApiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Config.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Error.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Properties.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/v1/core/OrganizationConfigsService.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/v1/impl/OrganizationConfigsApiServiceImpl.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/resources/META-INF/cxf/organization-configs-server-v1-cxf.xml
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/resources/organization-configs.yaml
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml

diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
new file mode 100644
index 0000000000..c5826febbc
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wso2.carbon.identity.server.api</groupId>
+        <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
+        <version>1.2.84-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.organization.management</groupId>
+            <artifactId>org.wso2.carbon.identity.organization.config.service</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/common/OrganizationConfigsServiceHolder.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/common/OrganizationConfigsServiceHolder.java
new file mode 100644
index 0000000000..dc1005a888
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/common/OrganizationConfigsServiceHolder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.common;
+
+import org.wso2.carbon.identity.organization.config.service.OrganizationConfigManager;
+
+/**
+ * Service holder class for organization configuration management.
+ */
+public class OrganizationConfigsServiceHolder {
+
+    private static OrganizationConfigManager organizationConfigManager;
+
+    /**
+     * Get OrganizationConfigManager OSGi service.
+     *
+     * @return OrganizationConfigManager.
+     */
+    public static OrganizationConfigManager getOrganizationConfigManager() {
+
+        return organizationConfigManager;
+    }
+
+    /**
+     * Set OrganizationConfigManager OSGi service.
+     *
+     * @param organizationConfigManager OrganizationConfigManager.
+     */
+    public static void setOrganizationConfigManager(OrganizationConfigManager organizationConfigManager) {
+
+        OrganizationConfigsServiceHolder.organizationConfigManager = organizationConfigManager;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/common/factory/OrganizationConfigManagerOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/common/factory/OrganizationConfigManagerOSGIServiceFactory.java
new file mode 100644
index 0000000000..99bfd0aebd
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/common/factory/OrganizationConfigManagerOSGIServiceFactory.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.common.factory;
+
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.organization.config.service.OrganizationConfigManager;
+
+/**
+ * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
+ * instantiate the OrganizationConfigManager type of object inside the container.
+ */
+public class OrganizationConfigManagerOSGIServiceFactory extends AbstractFactoryBean<OrganizationConfigManager> {
+
+    private OrganizationConfigManager organizationConfigManager;
+
+    @Override
+    public Class<?> getObjectType() {
+
+        return Object.class;
+    }
+
+    @Override
+    protected OrganizationConfigManager createInstance() throws Exception {
+
+        if (this.organizationConfigManager == null) {
+            OrganizationConfigManager organizationConfigManagerService =
+                    (OrganizationConfigManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                            .getOSGiService(OrganizationConfigManager.class, null);
+            if (organizationConfigManagerService == null) {
+                throw new Exception("Unable to retrieve OrganizationConfigManager service.");
+            }
+            this.organizationConfigManager = organizationConfigManagerService;
+        }
+        return this.organizationConfigManager;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
new file mode 100644
index 0000000000..aa32985ba9
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.wso2.carbon.identity.server.api</groupId>
+        <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
+        <version>1.2.84-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <!--<plugin>
+                <groupId>org.openapitools</groupId>
+                <artifactId>openapi-generator-maven-plugin</artifactId>
+                <version>4.1.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <inputSpec>${project.basedir}/src/main/resources/organization-configs.yaml</inputSpec>
+                            <generatorName>org.wso2.carbon.codegen.CxfWso2Generator</generatorName>
+                            <configOptions>
+                                <sourceFolder>src/gen/java</sourceFolder>
+                                <apiPackage>org.wso2.carbon.identity.api.server.organization.configs.v1</apiPackage>
+                                <modelPackage>org.wso2.carbon.identity.api.server.organization.configs.v1.model</modelPackage>
+                                <packageName>org.wso2.carbon.identity.api.server.organization.configs.v1</packageName>
+                                <dateLibrary>java8</dateLibrary>
+                                <hideGenerationTimestamp>true</hideGenerationTimestamp>
+                            </configOptions>
+                            <output>.</output>
+                            <skipOverwrite>false</skipOverwrite>
+                        </configuration>
+                    </execution>
+                </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.openapitools</groupId>
+                        <artifactId>cxf-wso2-openapi-generator</artifactId>
+                        <version>1.0.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>-->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/gen/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.compiler.plugin.version}</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-rs-service-description</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-jaxrs</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.dataformat</groupId>
+                    <artifactId>jackson-dataformat-yaml</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>jsr311-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.organization.management</groupId>
+            <artifactId>org.wso2.carbon.identity.organization.config.service</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/OrganizationConfigsApi.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/OrganizationConfigsApi.java
new file mode 100644
index 0000000000..d3048edb14
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/OrganizationConfigsApi.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.v1;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import java.io.InputStream;
+import java.util.List;
+
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.Config;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.Error;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.OrganizationConfigsApiService;
+
+import javax.validation.Valid;
+import javax.ws.rs.*;
+import javax.ws.rs.core.Response;
+import io.swagger.annotations.*;
+
+import javax.validation.constraints.*;
+
+@Path("/organization-configs")
+@Api(description = "The organization-configs API")
+
+public class OrganizationConfigsApi  {
+
+    @Autowired
+    private OrganizationConfigsApiService delegate;
+
+    @Valid
+    @POST
+    @Path("/discovery")
+    @Consumes({ "application/json" })
+    @Produces({ "application/json" })
+    @ApiOperation(value = "Add organization discovery configuration.", notes = "This API provides the capability to add discovery configuration for the primary organization. <br>   <b>Permission required:</b> <br>     * /permission/admin/manage/identity/configmgt/add <br>   <b>Scope required:</b> <br>     * internal_config_mgt_add ", response = Config.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "Discovery", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 201, message = "Successful Response", response = Config.class),
+        @ApiResponse(code = 400, message = "Invalid input in the request.", response = Error.class),
+        @ApiResponse(code = 401, message = "Authentication information is missing or invalid.", response = Void.class),
+        @ApiResponse(code = 403, message = "Access forbidden.", response = Void.class),
+        @ApiResponse(code = 409, message = "Resource already exists.", response = Error.class),
+        @ApiResponse(code = 500, message = "Internal server error.", response = Error.class)
+    })
+    public Response createDiscoveryConfig(@ApiParam(value = "" ) @Valid Config config) {
+
+        return delegate.createDiscoveryConfig(config );
+    }
+
+    @Valid
+    @DELETE
+    @Path("/discovery")
+    
+    @Produces({ "application/json" })
+    @ApiOperation(value = "Delete organization discovery configuration.", notes = "This API provides the capability to delete discovery configuration of the primary organization.<br>   <b>Permission required:</b> <br>     * /permission/admin/manage/identity/configmgt/delete <br>   <b>Scope required:</b> <br>     * internal_config_mgt_delete ", response = Void.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "Discovery", })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 204, message = "No content.", response = Void.class),
+        @ApiResponse(code = 401, message = "Authentication information is missing or invalid.", response = Void.class),
+        @ApiResponse(code = 403, message = "Access forbidden.", response = Void.class),
+        @ApiResponse(code = 500, message = "Internal server error.", response = Error.class)
+    })
+    public Response deleteDiscoveryConfig() {
+
+        return delegate.deleteDiscoveryConfig();
+    }
+
+    @Valid
+    @GET
+    @Path("/discovery")
+    
+    @Produces({ "application/json" })
+    @ApiOperation(value = "Get organization discovery configuration.", notes = "This API facilitates the retrieval of discovery configuration of the primary organization. <br>   <b>Permission required:</b> <br>     * /permission/admin/manage/identity/configmgt/view <br>   <b>Scope required:</b> <br>     * internal_config_mgt_view ", response = Config.class, authorizations = {
+        @Authorization(value = "BasicAuth"),
+        @Authorization(value = "OAuth2", scopes = {
+            
+        })
+    }, tags={ "Discovery" })
+    @ApiResponses(value = { 
+        @ApiResponse(code = 200, message = "Successful response.", response = Config.class),
+        @ApiResponse(code = 401, message = "Authentication information is missing or invalid.", response = Void.class),
+        @ApiResponse(code = 403, message = "Access forbidden.", response = Void.class),
+        @ApiResponse(code = 404, message = "Requested resource is not found.", response = Error.class),
+        @ApiResponse(code = 500, message = "Internal server error.", response = Error.class)
+    })
+    public Response getDiscoveryConfig() {
+
+        return delegate.getDiscoveryConfig();
+    }
+
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/OrganizationConfigsApiService.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/OrganizationConfigsApiService.java
new file mode 100644
index 0000000000..50ebed2842
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/OrganizationConfigsApiService.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.v1;
+
+import org.wso2.carbon.identity.api.server.organization.configs.v1.*;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.*;
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import java.io.InputStream;
+import java.util.List;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.Config;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.Error;
+import javax.ws.rs.core.Response;
+
+
+public interface OrganizationConfigsApiService {
+
+      public Response createDiscoveryConfig(Config config);
+
+      public Response deleteDiscoveryConfig();
+
+      public Response getDiscoveryConfig();
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/factories/OrganizationConfigsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/factories/OrganizationConfigsApiServiceFactory.java
new file mode 100644
index 0000000000..ca10ec7642
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/factories/OrganizationConfigsApiServiceFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.v1.factories;
+
+import org.wso2.carbon.identity.api.server.organization.configs.v1.OrganizationConfigsApiService;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.impl.OrganizationConfigsApiServiceImpl;
+
+public class OrganizationConfigsApiServiceFactory {
+
+   private final static OrganizationConfigsApiService service = new OrganizationConfigsApiServiceImpl();
+
+   public static OrganizationConfigsApiService getOrganizationConfigsApi()
+   {
+      return service;
+   }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Config.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Config.java
new file mode 100644
index 0000000000..85dd410826
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Config.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.v1.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.Properties;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class Config  {
+  
+    private List<Properties> properties = new ArrayList<>();
+
+
+    /**
+    **/
+    public Config properties(List<Properties> properties) {
+
+        this.properties = properties;
+        return this;
+    }
+    
+    @ApiModelProperty(required = true, value = "")
+    @JsonProperty("properties")
+    @Valid
+    @NotNull(message = "Property properties cannot be null.")
+
+    public List<Properties> getProperties() {
+        return properties;
+    }
+    public void setProperties(List<Properties> properties) {
+        this.properties = properties;
+    }
+
+    public Config addPropertiesItem(Properties propertiesItem) {
+        this.properties.add(propertiesItem);
+        return this;
+    }
+
+    
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Config config = (Config) o;
+        return Objects.equals(this.properties, config.properties);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(properties);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Config {\n");
+        
+        sb.append("    properties: ").append(toIndentedString(properties)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Error.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Error.java
new file mode 100644
index 0000000000..97b40a27ce
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Error.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.v1.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class Error  {
+  
+    private String code;
+    private String message;
+    private String description;
+    private String traceId;
+
+    /**
+    * An error code.
+    **/
+    public Error code(String code) {
+
+        this.code = code;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "OCM-00000", required = true, value = "An error code.")
+    @JsonProperty("code")
+    @Valid
+    @NotNull(message = "Property code cannot be null.")
+
+    public String getCode() {
+        return code;
+    }
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    /**
+    * An error message.
+    **/
+    public Error message(String message) {
+
+        this.message = message;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Some Error Message", required = true, value = "An error message.")
+    @JsonProperty("message")
+    @Valid
+    @NotNull(message = "Property message cannot be null.")
+
+    public String getMessage() {
+        return message;
+    }
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    /**
+    * An error description.
+    **/
+    public Error description(String description) {
+
+        this.description = description;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "Some Error Description", value = "An error description.")
+    @JsonProperty("description")
+    @Valid
+    public String getDescription() {
+        return description;
+    }
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+    * An error trace identifier.
+    **/
+    public Error traceId(String traceId) {
+
+        this.traceId = traceId;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "e0fbcfeb-3617-43c4-8dd0-7b7d38e13047", value = "An error trace identifier.")
+    @JsonProperty("traceId")
+    @Valid
+    public String getTraceId() {
+        return traceId;
+    }
+    public void setTraceId(String traceId) {
+        this.traceId = traceId;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Error error = (Error) o;
+        return Objects.equals(this.code, error.code) &&
+            Objects.equals(this.message, error.message) &&
+            Objects.equals(this.description, error.description) &&
+            Objects.equals(this.traceId, error.traceId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(code, message, description, traceId);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Error {\n");
+        
+        sb.append("    code: ").append(toIndentedString(code)).append("\n");
+        sb.append("    message: ").append(toIndentedString(message)).append("\n");
+        sb.append("    description: ").append(toIndentedString(description)).append("\n");
+        sb.append("    traceId: ").append(toIndentedString(traceId)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Properties.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Properties.java
new file mode 100644
index 0000000000..3e01c3f9b9
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/configs/v1/model/Properties.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.v1.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.*;
+
+
+import io.swagger.annotations.*;
+import java.util.Objects;
+import javax.validation.Valid;
+import javax.xml.bind.annotation.*;
+
+public class Properties  {
+  
+    private String key;
+    private String value;
+
+    /**
+    **/
+    public Properties key(String key) {
+
+        this.key = key;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "emailDomain.enable", required = true, value = "")
+    @JsonProperty("key")
+    @Valid
+    @NotNull(message = "Property key cannot be null.")
+
+    public String getKey() {
+        return key;
+    }
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    /**
+    **/
+    public Properties value(String value) {
+
+        this.value = value;
+        return this;
+    }
+    
+    @ApiModelProperty(example = "true", required = true, value = "")
+    @JsonProperty("value")
+    @Valid
+    @NotNull(message = "Property value cannot be null.")
+
+    public String getValue() {
+        return value;
+    }
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+
+
+    @Override
+    public boolean equals(java.lang.Object o) {
+
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Properties properties = (Properties) o;
+        return Objects.equals(this.key, properties.key) &&
+            Objects.equals(this.value, properties.value);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(key, value);
+    }
+
+    @Override
+    public String toString() {
+
+        StringBuilder sb = new StringBuilder();
+        sb.append("class Properties {\n");
+        
+        sb.append("    key: ").append(toIndentedString(key)).append("\n");
+        sb.append("    value: ").append(toIndentedString(value)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+    * Convert the given object to string with each line indented by 4 spaces
+    * (except the first line).
+    */
+    private String toIndentedString(java.lang.Object o) {
+
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n");
+    }
+}
+
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/v1/core/OrganizationConfigsService.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/v1/core/OrganizationConfigsService.java
new file mode 100644
index 0000000000..a9d1d68f19
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/v1/core/OrganizationConfigsService.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.v1.core;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.identity.api.server.common.error.APIError;
+import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
+import org.wso2.carbon.identity.api.server.organization.configs.common.OrganizationConfigsServiceHolder;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.Config;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.Properties;
+import org.wso2.carbon.identity.organization.config.service.exception.OrganizationConfigClientException;
+import org.wso2.carbon.identity.organization.config.service.exception.OrganizationConfigException;
+import org.wso2.carbon.identity.organization.config.service.model.ConfigProperty;
+import org.wso2.carbon.identity.organization.config.service.model.DiscoveryConfig;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.ws.rs.core.Response;
+
+import static org.wso2.carbon.identity.organization.config.service.constant.OrganizationConfigConstants.ErrorMessages.ERROR_CODE_DISCOVERY_CONFIG_CONFLICT;
+import static org.wso2.carbon.identity.organization.config.service.constant.OrganizationConfigConstants.ErrorMessages.ERROR_CODE_DISCOVERY_CONFIG_NOT_EXIST;
+
+/**
+ * Perform organization configuration management related operations.
+ */
+public class OrganizationConfigsService {
+
+    private static final Log LOG = LogFactory.getLog(OrganizationConfigsService.class);
+
+    /**
+     * Add the organization discovery configuration in the primary organization.
+     *
+     * @param config The organization discovery configuration.
+     */
+    public void addDiscoveryConfiguration(Config config) {
+
+        List<ConfigProperty> configProperties = config.getProperties().stream()
+                .map(property -> new ConfigProperty(property.getKey(), property.getValue()))
+                .collect(Collectors.toList());
+        try {
+            OrganizationConfigsServiceHolder.getOrganizationConfigManager().addDiscoveryConfiguration
+                    (new DiscoveryConfig(configProperties));
+        } catch (OrganizationConfigException e) {
+            throw handleException(e);
+        }
+    }
+
+    /**
+     * Fetch organization discovery configuration.
+     *
+     * @return The organization discovery configuration.
+     */
+    public Config getDiscoveryConfiguration() {
+
+        try {
+            DiscoveryConfig discoveryConfig = OrganizationConfigsServiceHolder.getOrganizationConfigManager()
+                    .getDiscoveryConfiguration();
+
+            List<Properties> properties = discoveryConfig.getConfigProperties().stream()
+                    .map(configProperty -> {
+                        Properties prop = new Properties();
+                        prop.setKey(configProperty.getKey());
+                        prop.setValue(configProperty.getValue());
+                        return prop;
+                    }).collect(Collectors.toList());
+            Config config = new Config();
+            config.setProperties(properties);
+            return config;
+        } catch (OrganizationConfigException e) {
+            throw handleException(e);
+        }
+    }
+
+    /**
+     * Delete the organization discovery configuration.
+     */
+    public void deleteDiscoveryConfiguration() {
+
+        try {
+            OrganizationConfigsServiceHolder.getOrganizationConfigManager().deleteDiscoveryConfiguration();
+        } catch (OrganizationConfigException e) {
+            throw handleException(e);
+        }
+    }
+
+    private APIError handleException(OrganizationConfigException e) {
+
+        if (e instanceof OrganizationConfigClientException) {
+            throw buildClientError(e);
+        }
+        throw buildServerError(e);
+    }
+
+    private APIError buildClientError(OrganizationConfigException e) {
+
+        String errorCode = e.getErrorCode();
+        ErrorResponse errorResponse = new ErrorResponse.Builder().withCode(e.getErrorCode()).withMessage(e.getMessage())
+                .withDescription(e.getDescription()).build(LOG, e.getMessage());
+
+        Response.Status status = Response.Status.BAD_REQUEST;
+        if (ERROR_CODE_DISCOVERY_CONFIG_CONFLICT.getCode().equals(errorCode)) {
+            status = Response.Status.CONFLICT;
+        } else if (ERROR_CODE_DISCOVERY_CONFIG_NOT_EXIST.getCode().equals(errorCode)) {
+            status = Response.Status.NOT_FOUND;
+        }
+        return new APIError(status, errorResponse);
+    }
+
+    private APIError buildServerError(OrganizationConfigException e) {
+
+        String errorCode = e.getErrorCode();
+        ErrorResponse errorResponse = new ErrorResponse.Builder().withCode(errorCode).withMessage(e.getMessage())
+                .withDescription(e.getDescription()).build(LOG, e, e.getMessage());
+
+        Response.Status status = Response.Status.INTERNAL_SERVER_ERROR;
+        return new APIError(status, errorResponse);
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/v1/impl/OrganizationConfigsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/v1/impl/OrganizationConfigsApiServiceImpl.java
new file mode 100644
index 0000000000..91451087d0
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/configs/v1/impl/OrganizationConfigsApiServiceImpl.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.configs.v1.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.OrganizationConfigsApiService;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.core.OrganizationConfigsService;
+import org.wso2.carbon.identity.api.server.organization.configs.v1.model.Config;
+
+import javax.ws.rs.core.Response;
+
+/**
+ * Implementation of the organization configuration REST API.
+ */
+public class OrganizationConfigsApiServiceImpl implements OrganizationConfigsApiService {
+
+    @Autowired
+    private OrganizationConfigsService organizationConfigsService;
+
+    @Override
+    public Response createDiscoveryConfig(Config config) {
+
+        organizationConfigsService.addDiscoveryConfiguration(config);
+        return Response.status(Response.Status.CREATED).entity(config).build();
+    }
+
+    @Override
+    public Response deleteDiscoveryConfig() {
+
+        organizationConfigsService.deleteDiscoveryConfiguration();
+        return Response.noContent().build();
+    }
+
+    @Override
+    public Response getDiscoveryConfig() {
+
+        return Response.ok().entity(organizationConfigsService.getDiscoveryConfiguration()).build();
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/resources/META-INF/cxf/organization-configs-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/resources/META-INF/cxf/organization-configs-server-v1-cxf.xml
new file mode 100644
index 0000000000..a9f987b127
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/resources/META-INF/cxf/organization-configs-server-v1-cxf.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation=" http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+    <bean class="org.wso2.carbon.identity.api.server.organization.configs.v1.core.OrganizationConfigsService"/>
+    <bean class="org.wso2.carbon.identity.api.server.organization.configs.v1.impl.OrganizationConfigsApiServiceImpl"/>
+    <bean id="OrganizationConfigManagerFactoryBean"
+          class="org.wso2.carbon.identity.api.server.organization.configs.common.factory.OrganizationConfigManagerOSGIServiceFactory"/>
+    <bean id="OrganizationConfigsServiceHolderBean"
+          class="org.wso2.carbon.identity.api.server.organization.configs.common.OrganizationConfigsServiceHolder">
+        <property name="organizationConfigManager" ref="OrganizationConfigManagerFactoryBean"/>
+    </bean>
+</beans>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/resources/organization-configs.yaml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/resources/organization-configs.yaml
new file mode 100644
index 0000000000..32550834c2
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/src/main/resources/organization-configs.yaml
@@ -0,0 +1,193 @@
+openapi: 3.0.0
+info:
+  title: WSO2 Identity Server - Organization Configuration API Definition
+  description: This document specifies a **RESTful API** for **WSO2 Identity Server Organization Configurations**
+  contact:
+    name: WSO2
+    url: http://wso2.com/products/identity-server/
+    email: iam-dev@wso2.org
+  license:
+    name: Apache 2.0
+    url: http://www.apache.org/licenses/LICENSE-2.0.html
+  version: "v1"
+servers:
+  - url: 'https://localhost:9443/o/{organization-domain}/api/server/v1'
+    variables:
+      organization-domain:
+        default: 10084a8d-113f-4211-a0d5-efe36b082211
+security:
+  - OAuth2: []
+  - BasicAuth: []
+
+paths:
+  /organization-configs/discovery:
+    get:
+      tags:
+        - Discovery
+      summary: Get organization discovery configuration.
+      description: |
+        This API facilitates the retrieval of discovery configuration of the primary organization. <br>
+          <b>Permission required:</b> <br>
+            * /permission/admin/manage/identity/configmgt/view <br>
+          <b>Scope required:</b> <br>
+            * internal_config_mgt_view
+      operationId: getDiscoveryConfig
+      responses:
+        '200':
+          description: Successful response.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Config'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/ServerError'
+    post:
+      tags:
+        - Discovery
+      summary: Add organization discovery configuration.
+      description: |
+        This API provides the capability to add discovery configuration for the primary organization. <br>
+          <b>Permission required:</b> <br>
+            * /permission/admin/manage/identity/configmgt/add <br>
+          <b>Scope required:</b> <br>
+            * internal_config_mgt_add
+      operationId: createDiscoveryConfig
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Config'
+      responses:
+        '201':
+          description: Successful Response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Config'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/ServerError'
+    delete:
+      tags:
+        - Discovery
+      summary: Delete organization discovery configuration.
+      description: |
+        This API provides the capability to delete discovery configuration of the primary organization.<br>
+          <b>Permission required:</b> <br>
+            * /permission/admin/manage/identity/configmgt/delete <br>
+          <b>Scope required:</b> <br>
+            * internal_config_mgt_delete
+      operationId: deleteDiscoveryConfig
+      responses:
+        '204':
+          $ref: '#/components/responses/NoContent'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/ServerError'
+
+components:
+  schemas:
+    Error:
+      type: object
+      required:
+        - code
+        - message
+      properties:
+        code:
+          type: string
+          example: OCM-00000
+          description: An error code.
+        message:
+          type: string
+          example: Some Error Message
+          description: An error message.
+        description:
+          type: string
+          example: Some Error Description
+          description: An error description.
+        traceId:
+          type: string
+          example: e0fbcfeb-3617-43c4-8dd0-7b7d38e13047
+          description: An error trace identifier.
+
+    Config:
+      type: object
+      required:
+        - properties
+      properties:
+        properties:
+          type: array
+          items:
+            $ref: '#/components/schemas/Properties'
+    Properties:
+      required:
+        - key
+        - value
+      type: object
+      properties:
+        key:
+          type: string
+          example: emailDomain.enable
+        value:
+          type: string
+          example: true
+
+  responses:
+    BadRequest:
+      description: Invalid input in the request.
+      content:
+        'application/json':
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Requested resource is not found.
+      content:
+        'application/json':
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Resource already exists.
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NoContent:
+      description: No content.
+    Unauthorized:
+      description: Authentication information is missing or invalid.
+    Forbidden:
+      description: Access forbidden.
+    ServerError:
+      description: Internal server error.
+      content:
+        'application/json':
+          schema:
+            $ref: '#/components/schemas/Error'
+
+  securitySchemes:
+    BasicAuth:
+      type: http
+      scheme: basic
+    OAuth2:
+      type: oauth2
+      flows:
+        authorizationCode:
+          authorizationUrl: https://localhost:9443/oauth2/authorize
+          tokenUrl: https://localhost:9443/oauth2/token
+          scopes: {}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
new file mode 100644
index 0000000000..1b0c3fdaba
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <artifactId>identity-api-server</artifactId>
+        <groupId>org.wso2.carbon.identity.server.api</groupId>
+        <version>1.2.84-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
+
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>org.wso2.carbon.identity.api.server.organization.configs.common</module>
+        <module>org.wso2.carbon.identity.api.server.organization.configs.v1</module>
+    </modules>
+</project>
diff --git a/pom.xml b/pom.xml
index b6901e19e2..9a8fcebbbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,6 +555,12 @@
                 <version>${org.wso2.carbon.identity.organization.management.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.organization.management</groupId>
+                <artifactId>org.wso2.carbon.identity.organization.config.service</artifactId>
+                <version>${org.wso2.carbon.identity.organization.management.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.server.api</groupId>
                 <artifactId>org.wso2.carbon.identity.api.server.organization.management.common</artifactId>
@@ -610,6 +616,12 @@
                 <artifactId>org.wso2.carbon.identity.api.idle.account.identification.common</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.server.api</groupId>
+                <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
+                <version>${project.version}</version>
+                <scope>provided</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
@@ -747,7 +759,7 @@
         </org.wso2.carbon.identity.organization.management.core.version.range>
 
         <!-- Organization management service Version -->
-        <org.wso2.carbon.identity.organization.management.version>1.3.61
+        <org.wso2.carbon.identity.organization.management.version>1.3.70
         </org.wso2.carbon.identity.organization.management.version>
 
         <!-- Unit test versions -->
@@ -788,6 +800,7 @@
         <module>components/org.wso2.carbon.identity.api.expired.password.identification</module>
         <module>components/org.wso2.carbon.identity.api.server.organization.user.invitation.management</module>
         <module>components/org.wso2.carbon.identity.api.server.api.resource</module>
+        <module>components/org.wso2.carbon.identity.api.server.organization.configs</module>
     </modules>
 
 </project>

From f3e122356919b1d40e595f293e29e909c5d04b6c Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Fri, 22 Sep 2023 05:46:29 +0000
Subject: [PATCH 16/17] [WSO2 Release] [Jenkins #823] [Release 1.2.84] prepare
 release v1.2.84

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.challenge/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.fetch.remote/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 94 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index 954f3bea3e..b4c9e63bf8 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index 56baed3361..b119152dfa 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 974646e86f..93ada20302 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 1bdf3ad8fd..9a5a7f03a6 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index f524d79b1d..abe15cd448 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index 1b9d50989e..d48df77094 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index d9639b3519..af49e11bdf 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index a9301c5a33..43984e1988 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index a77757d042..d04248440a 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index c6883f5b33..bc4d92fa30 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index e7a512e058..34fadc3516 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index 45f809070f..d936851b34 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index b8e28c7cfd..4f47ddbf04 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.84-SNAPSHOT</version>
+    <version>1.2.84</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 2aff4ef9a0..12a2b07768 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.2.84-SNAPSHOT</version>
+    <version>1.2.84</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 226c876f48..984e56a8d4 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.84-SNAPSHOT</version>
+    <version>1.2.84</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index adf5f83e85..6a636eb861 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index a977ec1b61..1bd02222c1 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index b6a2d5e86d..63eda273dd 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 82985517ec..741278545c 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index fc61d612be..77b541bb1e 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 62a912a7fa..22636df51e 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
index 7ac56739f9..b9fb26d9c9 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
index 340c96a38e..2c8d3a4fff 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
index 9aac8ca2e5..4b41547596 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index ae6faf64c5..45ab045f36 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index 0ef3388161..bd70273506 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index af0122f09b..956a94f635 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index 58d55c325f..58a069471e 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index 92ba424e41..fad5d7ef24 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 697fe1c45c..6f8d7a6c85 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 0011e36126..5002df6c67 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index 947cb86e35..cffe19df89 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index 1e0e862188..c0f12f364f 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index 0ed5c1e29f..a2ec5bf2f8 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index a720352b1c..d1293a6e27 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index cc022de009..f92bdbc730 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index a2b4bc9a1b..a55e000fb5 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 8cd0075b41..3b19466f2e 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index 90f7f486c3..c1fa771ea4 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 85aab330ca..47d2982493 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
index b223da2dc4..91022f5461 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
index 5344adabc9..8bbbd51f57 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
index 7b5ba40989..c4a570557b 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 7682a6e317..4ace923c55 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index 04391cce8c..ddbb603d46 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 9ff59f1a81..51e9813307 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index 9b4ea69ed6..2a84719f25 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 61a18ce73c..3b21f235b4 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index a32aca1d14..eaabfaa6f2 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 1cf9b5184b..8652988137 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 91d73c9e8f..79a5cd2d48 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 148d7092bb..246e98532d 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 532050453b..9ab9ae2b51 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index b8e0336cba..8bac1df57d 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.2.84-SNAPSHOT</version>
+    <version>1.2.84</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index 207d3db6ff..b6352f638c 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index 5b1259d765..f9ce037a1c 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index a2db67e728..a1035c6e6b 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 72270d3399..6d5f360cae 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 9446335f40..82678d1849 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 9b2dfc9c93..f03bcf2ca8 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index 91fd1671d5..a03ef983ca 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 7e0d6d13dd..201793678c 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index e3bd782df0..2559cc9d94 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index a418316878..6885ea4bed 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index c5826febbc..59b8bfd10c 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index aa32985ba9..c6b6ceb53b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index 1b0c3fdaba..1105b50019 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index 6c59ba1fda..ccf911e5d2 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index ab5d1f4c9c..b9b43bd525 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 7dd849e6a0..85d34712a3 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 94be248e98..d5ee3291d6 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 7b70706cf4..2989fb1c8b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index 6fb11b3d93..2dadc50c27 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index 6380ee0803..e87f15dcf7 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 33b20a0b31..1dee466828 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 1b7dfa332a..059e24158d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index f1fc9f7cf6..3bb64defb4 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index 720265ff9a..1f7c6ea115 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index e33a9422b5..6e8acbb9bd 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index da812d4385..fe3d1e07b6 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index a52bf36fe1..55604ab7bc 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index d0c215710b..28e710a0a6 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index 5971496679..bd63061a17 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index d3227358a3..417171e3e4 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 7d3a090257..19e7551473 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index d7e6fee251..381f5ea2fe 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index a33fc98e2c..063db7bc8d 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 4a92320912..688d1785af 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 68290a7487..665a49a522 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index a65a99292a..67493ec3d9 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index fc9dbb19bd..eeb51bbec8 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
index ad19f18979..011f00c904 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.workflow.engine</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
index f622c4ce8f..0197818679 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84-SNAPSHOT</version>
+        <version>1.2.84</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 9a8fcebbbf..6ced39747b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.84-SNAPSHOT</version>
+    <version>1.2.84</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>HEAD</tag>
+        <tag>v1.2.84</tag>
     </scm>
 
 

From 395077fb72a88bc8feba12e42341ce91f71282ff Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Fri, 22 Sep 2023 05:46:31 +0000
Subject: [PATCH 17/17] [WSO2 Release] [Jenkins #823] [Release 1.2.84] prepare
 for next development iteration

---
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.api.resource/pom.xml  | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.challenge/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 components/org.wso2.carbon.identity.api.server.common/pom.xml | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.configs.v1/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.configs/pom.xml       | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.common/pom.xml   | 2 +-
 .../org.wso2.carbon.identity.api.server.cors.v1/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.api.server.cors/pom.xml   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.fetch.remote/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.common/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.api.server.idp.v1/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.api.server.idp/pom.xml    | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.idv.provider/pom.xml  | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore.v1/pom.xml  | 2 +-
 .../org.wso2.carbon.identity.api.server.userstore/pom.xml     | 2 +-
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 2 +-
 pom.xml                                                       | 4 ++--
 94 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index b4c9e63bf8..4b64872bef 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index b119152dfa..74ac7e9815 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.expired.password.identification</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
index 93ada20302..abfc423d02 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
index 9a5a7f03a6..5c29d11927 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
index abe15cd448..5a1c2c22ca 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.idle.account.identification</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
index d48df77094..7f6273335b 100644
--- a/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.api.idle.account.identification/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
index af49e11bdf..a05f099074 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
index 43984e1988..55463b896b 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/org.wso2.carbon.identity.api.server.admin.advisory.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.admin.advisory.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
index d04248440a..ecf03e2bb7 100644
--- a/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.admin.advisory.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index bc4d92fa30..ca41a3d0d4 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 34fadc3516..13f580bb47 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.api.resource</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
index d936851b34..8ed94a3753 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 4f47ddbf04..91e51b11de 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management.common</artifactId>
-    <version>1.2.84</version>
+    <version>1.2.85-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index 12a2b07768..f2bafd467c 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Applications Rest API</name>
     <description>WSO2 Identity Server - Applications Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.application.management.v1</artifactId>
-    <version>1.2.84</version>
+    <version>1.2.85-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
index 984e56a8d4..27a91a0408 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.application.management</artifactId>
-    <version>1.2.84</version>
+    <version>1.2.85-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 6a636eb861..9382f5a38a 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index 1bd02222c1..c408521b88 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.authenticators</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.authenticators.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
index 63eda273dd..b26778133e 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
index 741278545c..ee38552860 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.common/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <groupId>org.wso2.carbon.identity.server.api</groupId>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
index 77b541bb1e..7225f0700e 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/org.wso2.carbon.identity.api.server.branding.preference.management.v1/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.branding.preference.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
index 22636df51e..6d3a465553 100644
--- a/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.branding.preference.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
index b9fb26d9c9..755f7e317a 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.api.server.challenge.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.challenge.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
index 2c8d3a4fff..6a4844e48d 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/org.wso2.carbon.identity.rest.api.server.challenge.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.challenge</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.challenge.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
index 4b41547596..3282122c3a 100644
--- a/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.challenge/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
index 45ab045f36..25e8e7cb74 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.api.server.claim.management.common/pom.xml
@@ -20,7 +20,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.claim.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
index bd70273506..3ae82b772c 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/org.wso2.carbon.identity.rest.api.server.claim.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.claim.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.rest.api.server.claim.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
index 956a94f635..9ae2a7cb5a 100644
--- a/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.claim.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.common/pom.xml b/components/org.wso2.carbon.identity.api.server.common/pom.xml
index 58a069471e..0ac90bc34d 100644
--- a/components/org.wso2.carbon.identity.api.server.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
index fad5d7ef24..a93ec2f1c6 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
index 6f8d7a6c85..68bad736cb 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/org.wso2.carbon.identity.api.server.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.configs</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
index 5002df6c67..be1526b877 100644
--- a/components/org.wso2.carbon.identity.api.server.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
index cffe19df89..a3d9a88a46 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
index c0f12f364f..c1db535ab2 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/org.wso2.carbon.identity.api.server.cors.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.cors</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.cors.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.cors/pom.xml b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
index a2ec5bf2f8..ceb1012201 100644
--- a/components/org.wso2.carbon.identity.api.server.cors/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.cors/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
index d1293a6e27..1db1a5250d 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.api.server.email.template.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
index f92bdbc730..434b55e3c3 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/org.wso2.carbon.identity.rest.api.server.email.template.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.email.template</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
index a55e000fb5..8756dbe13e 100644
--- a/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.email.template/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
index 3b19466f2e..85e779aa42 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
index c1fa771ea4..1d91fbb723 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.extension.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.extension.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
index 47d2982493..52deac3de1 100644
--- a/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.extension.management/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
index 91022f5461..e77d069e93 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
index 8bbbd51f57..5db03d0675 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/org.wso2.carbon.identity.api.server.fetch.remote.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.fetch.remote</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
index c4a570557b..7309bd15d0 100644
--- a/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.fetch.remote/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
index 4ace923c55..4fe141a1f6 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
index ddbb603d46..543bc98eac 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/org.wso2.carbon.identity.api.server.identity.governance.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.identity.governance</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.identity.governance.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
index 51e9813307..5267bf2edf 100644
--- a/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.identity.governance/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
index 2a84719f25..0a1f7b3590 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
index 3b21f235b4..8a86394661 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/org.wso2.carbon.identity.api.server.idp.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idp</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.idp/pom.xml b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
index eaabfaa6f2..780a95bc68 100644
--- a/components/org.wso2.carbon.identity.api.server.idp/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
index 8652988137..46c619e5da 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
index 79a5cd2d48..2f268efc96 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/org.wso2.carbon.identity.api.server.idv.provider.v1/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.idv.provider</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.idv.provider.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
index 246e98532d..861ab83cc4 100644
--- a/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.idv.provider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
index 9ab9ae2b51..df0d191e45 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
index 8bac1df57d..34d6cdbbfa 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/org.wso2.carbon.identity.api.server.input.validation.v1/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.input.validation</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <name>WSO2 Identity Server - Input Validation Rest API</name>
     <description>WSO2 Identity Server - Validation Rest API</description>
     <artifactId>org.wso2.carbon.identity.api.server.input.validation.v1</artifactId>
-    <version>1.2.84</version>
+    <version>1.2.85-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
index b6352f638c..a778ee7e38 100644
--- a/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.input.validation/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
index f9ce037a1c..7b934181fc 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
index a1035c6e6b..879d83dac5 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.keystore.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.keystore.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
index 6d5f360cae..72081d5fee 100644
--- a/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.keystore.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 82678d1849..562df05043 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index f03bcf2ca8..7b2d098bf2 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -22,7 +22,7 @@
         <artifactId>org.wso2.carbon.identity.api.server.notification.sender</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
index a03ef983ca..1d71bdae52 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
index 201793678c..caa59d89ec 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
index 2559cc9d94..a5b56cb51e 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/org.wso2.carbon.identity.api.server.oidc.scope.management.v1/pom.xml
@@ -21,7 +21,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.oidc.scope.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
index 6885ea4bed..ce5b1ee626 100644
--- a/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.oidc.scope.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
index 59b8bfd10c..b95ed37f22 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.common</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
index c6b6ceb53b..736dc2dfe3 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/org.wso2.carbon.identity.api.server.organization.configs.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.configs</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.organization.configs.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
index 1105b50019..a87da65a8e 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.configs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
index ccf911e5d2..3caca39bac 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
index b9b43bd525..5fdbc3e9d3 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/org.wso2.carbon.identity.api.server.organization.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
index 85d34712a3..a62c7c8874 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index d5ee3291d6..be831c71b6 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 2989fb1c8b..252ff3f6eb 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.role.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
index 2dadc50c27..9768caf213 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
index e87f15dcf7..b6f75f5b74 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
index 1dee466828..a34a5c7c3d 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.organization.user.invitation.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
index 059e24158d..123999696e 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.user.invitation.management/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
index 3bb64defb4..080b723189 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <name>WSO2 Identity Server - Common Permission Management</name>
     <description>WSO2 Identity Server - PCommon Permission Management</description>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
index 1f7c6ea115..313954fd12 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/org.wso2.carbon.identity.api.server.permission.management.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.permission.management</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.permission.management.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
index 6e8acbb9bd..24f0dcf7eb 100644
--- a/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.permission.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
index fe3d1e07b6..df67a20d33 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.script.library</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
index 55604ab7bc..5f736c7f08 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/org.wso2.carbon.identity.api.server.script.library.v1/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
index 28e710a0a6..1e0453588a 100644
--- a/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.script.library/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
index bd63061a17..b9ef9ad503 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
index 417171e3e4..ac55fbc855 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/org.wso2.carbon.identity.api.server.secret.management.v1/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.secret.management</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
index 19e7551473..2229aa7b29 100644
--- a/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.secret.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>identity-api-server</artifactId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
index 381f5ea2fe..96bf4b0094 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.tenant.management</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
index 063db7bc8d..b33bbd5744 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/org.wso2.carbon.identity.api.server.tenant.management.v1/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
index 688d1785af..dfc74461c7 100644
--- a/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.tenant.management/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index 665a49a522..cbde43c307 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 67493ec3d9..5f0dc61e5d 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.userstore</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.api.server.userstore.v1</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
index eeb51bbec8..209a632b3b 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
index 011f00c904..f9dbe4e215 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/org.wso2.carbon.identity.rest.api.server.workflow.engine.v1/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.server.api</groupId>
         <artifactId>org.wso2.carbon.identity.api.server.workflow.engine</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
index 0197818679..afea4930f4 100644
--- a/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.workflow.engine/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>identity-api-server</artifactId>
         <groupId>org.wso2.carbon.identity.server.api</groupId>
-        <version>1.2.84</version>
+        <version>1.2.85-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 6ced39747b..18bbfeb1c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-api-server</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.84</version>
+    <version>1.2.85-SNAPSHOT</version>
     <name>WSO2 Identity Server - Server API Module</name>
     <description>
 
@@ -41,7 +41,7 @@
         <developerConnection>scm:git:https://github.com/wso2/identity-api-server.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2/identity-api-server.git</connection>
-        <tag>v1.2.84</tag>
+        <tag>HEAD</tag>
     </scm>