From 24209ab2f04e988f8abe9d19d8a29e8b41658756 Mon Sep 17 00:00:00 2001
From: mpmadhavig <madhavi.17@cse.mrt.ac.lk>
Date: Mon, 14 Aug 2023 15:10:46 +0530
Subject: [PATCH 1/2] Migrate security-mgt module from framework to its own
 group.

---
 components/org.wso2.carbon.identity.sts.mgt/pom.xml    |  4 ++--
 .../org.wso2.carbon.identity.sts.passive/pom.xml       |  8 ++++----
 components/org.wso2.carbon.mex/pom.xml                 | 10 +++++-----
 components/org.wso2.carbon.mex2/pom.xml                | 10 +++++-----
 components/org.wso2.carbon.security.sts.common/pom.xml |  4 ++--
 components/org.wso2.carbon.sts/pom.xml                 |  8 ++++----
 .../pom.xml                                            |  2 +-
 .../pom.xml                                            |  2 +-
 pom.xml                                                |  6 ++++--
 9 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/components/org.wso2.carbon.identity.sts.mgt/pom.xml b/components/org.wso2.carbon.identity.sts.mgt/pom.xml
index 887ee5fb..5b77ef6f 100644
--- a/components/org.wso2.carbon.identity.sts.mgt/pom.xml
+++ b/components/org.wso2.carbon.identity.sts.mgt/pom.xml
@@ -66,7 +66,7 @@
             <artifactId>rampart-trust</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <groupId>org.wso2.carbon.security.mgt</groupId>
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
         <dependency>
@@ -137,7 +137,7 @@
 
                             org.wso2.carbon.identity.base; version="${identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.core.*; version="${identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security.*; version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.*; version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.carbon.identity.sts.common.*; version="${identity.inbound.auth.sts.imp.pkg.version.range}"
                             org.wso2.carbon.identity.provider;
                             version="${identity.inbound.auth.openid.imp.pkg.version.range}",
diff --git a/components/org.wso2.carbon.identity.sts.passive/pom.xml b/components/org.wso2.carbon.identity.sts.passive/pom.xml
index 7298d97f..b49db403 100644
--- a/components/org.wso2.carbon.identity.sts.passive/pom.xml
+++ b/components/org.wso2.carbon.identity.sts.passive/pom.xml
@@ -46,7 +46,7 @@
             <artifactId>org.wso2.carbon.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <groupId>org.wso2.carbon.security.mgt</groupId>
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
         <dependency>
@@ -200,11 +200,11 @@
                             org.wso2.carbon.identity.application.mgt;
                             version="${identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.security.keystore.*;
-                            version="${identity.framework.imp.pkg.version.range}",
+                            version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.carbon.security.util;
-                            version="${identity.framework.imp.pkg.version.range}",
+                            version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.carbon.security.sts.service;
-                            version="${identity.framework.imp.pkg.version.range}",
+                            version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.carbon.identity.core.*;
                             version="${identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.*;
diff --git a/components/org.wso2.carbon.mex/pom.xml b/components/org.wso2.carbon.mex/pom.xml
index c64a180c..b556046c 100644
--- a/components/org.wso2.carbon.mex/pom.xml
+++ b/components/org.wso2.carbon.mex/pom.xml
@@ -39,7 +39,7 @@
             <artifactId>axis2</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <groupId>org.wso2.carbon.security.mgt</groupId>
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
         <dependency>
@@ -108,14 +108,14 @@
                             org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version}",
                             org.wso2.carbon.registry.api;version="${carbon.kernel.registry.imp.pkg.version}",
 
-                            org.wso2.carbon.security.util; version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.util; version="${carbon.security.keystore.service.version.range}",
                             org.wso2.carbon.security.keystore.*;
-                            version="${identity.framework.imp.pkg.version.range}",
+                            version="${carbon.security.keystore.service.version.range}",
                             org.apache.neethi; version="${neethi.osgi.version.range}",
                             org.apache.axiom.*; version="${axiom.osgi.version.range}",
-                            org.wso2.carbon.security.*;version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.*;version="${carbon.security.keystore.service.version.range}",
                             javax.cache,
-                            org.wso2.carbon.security.*;version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.*;version="${carbon.security.keystore.service.version.range}",
                             org.wso2.xfer.*; version="${xfer.import.pkg.version}",
                             org.wso2.carbon.identity.core.util; version="${identity.framework.imp.pkg.version.range}",
                         </Import-Package>
diff --git a/components/org.wso2.carbon.mex2/pom.xml b/components/org.wso2.carbon.mex2/pom.xml
index a15d72fc..4292634a 100644
--- a/components/org.wso2.carbon.mex2/pom.xml
+++ b/components/org.wso2.carbon.mex2/pom.xml
@@ -39,7 +39,7 @@
             <artifactId>axis2</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <groupId>org.wso2.carbon.security.mgt</groupId>
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
         <dependency>
@@ -108,14 +108,14 @@
                             org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version}",
                             org.wso2.carbon.registry.api;version="${carbon.kernel.registry.imp.pkg.version}",
 
-                            org.wso2.carbon.security.util; version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.util; version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.carbon.security.keystore.*;
-                            version="${identity.framework.imp.pkg.version.range}",
+                            version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.apache.neethi; version="${neethi.osgi.version.range}",
                             org.apache.axiom.*; version="${axiom.osgi.version.range}",
-                            org.wso2.carbon.security.*;version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.*;version="${carbon.security.mgt.imp.pkg.version.range}",
                             javax.cache,
-                            org.wso2.carbon.security.*;version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.*;version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.xfer.*; version="${xfer.import.pkg.version}",
                             org.wso2.carbon.identity.core.util; version="${identity.framework.imp.pkg.version.range}",
                         </Import-Package>
diff --git a/components/org.wso2.carbon.security.sts.common/pom.xml b/components/org.wso2.carbon.security.sts.common/pom.xml
index abce9e0a..05f88078 100644
--- a/components/org.wso2.carbon.security.sts.common/pom.xml
+++ b/components/org.wso2.carbon.security.sts.common/pom.xml
@@ -135,7 +135,7 @@
             <artifactId>org.wso2.carbon.identity.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <groupId>org.wso2.carbon.security.mgt</groupId>
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
     </dependencies>
@@ -199,7 +199,7 @@
                             org.wso2.carbon.identity.base; version="${identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.application.*;
                             version="${identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security.*; version="${identity.framework.imp.pkg.version.range}"
+                            org.wso2.carbon.security.*; version="${carbon.security.mgt.imp.pkg.version.range}"
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.identity.sts.common.internal,
diff --git a/components/org.wso2.carbon.sts/pom.xml b/components/org.wso2.carbon.sts/pom.xml
index e25a40ca..1cd9cdc2 100644
--- a/components/org.wso2.carbon.sts/pom.xml
+++ b/components/org.wso2.carbon.sts/pom.xml
@@ -60,7 +60,7 @@
             <artifactId>org.wso2.carbon.identity.application.common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.identity.framework</groupId>
+            <groupId>org.wso2.carbon.security.mgt</groupId>
             <artifactId>org.wso2.carbon.security.mgt</artifactId>
         </dependency>
         <dependency>
@@ -133,12 +133,12 @@
                             org.wso2.carbon.identity.application.common.*; version="${identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.application.mgt.*; version="${identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.core.*; version="${identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security.util; version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.util; version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.carbon.security.keystore.*;
-                            version="${identity.framework.imp.pkg.version.range}",
+                            version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.apache.neethi; version="${neethi.osgi.version.range}",
                             org.apache.axiom.*; version="${axiom.osgi.version.range}",
-                            org.wso2.carbon.security.*; version="${identity.framework.imp.pkg.version.range}",
+                            org.wso2.carbon.security.*; version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.carbon.identity.sts.common.*; version="${identity.inbound.auth.sts.imp.pkg.version.range}",
                             org.wso2.carbon.identity.sts.store;
                             version="${identity.inbound.auth.sts.imp.pkg.version.range}",
diff --git a/features/org.wso2.carbon.identity.sts.mgt.server.feature/pom.xml b/features/org.wso2.carbon.identity.sts.mgt.server.feature/pom.xml
index a71b22e4..0a85f7a0 100644
--- a/features/org.wso2.carbon.identity.sts.mgt.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sts.mgt.server.feature/pom.xml
@@ -68,7 +68,7 @@
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core:compatible:${carbon.kernel.feature.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.security.mgt.server:compatible:${identity.framework.version}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.security.mgt.server:compatible:${carbon.security.mgt.version}</importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.identity.core.server:compatible:${identity.framework.version}</importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.identity.provider.server:compatible:${inbound.auth.openid.version}</importFeatureDef>
                             </importFeatures>
diff --git a/features/org.wso2.carbon.identity.sts.passive.server.feature/pom.xml b/features/org.wso2.carbon.identity.sts.passive.server.feature/pom.xml
index ca0cfef1..598f7bc4 100644
--- a/features/org.wso2.carbon.identity.sts.passive.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sts.passive.server.feature/pom.xml
@@ -95,7 +95,7 @@
                                 <importFeatureDef>org.wso2.carbon.core:compatible:${carbon.kernel.feature.version}</importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.identity.application.authentication.framework.server:compatible:${identity.framework.version}</importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.identity.application.mgt.server:compatible:${identity.framework.version}</importFeatureDef>
-                                <importFeatureDef>org.wso2.carbon.security.mgt.server:compatible:${identity.framework.version}</importFeatureDef>
+                                <importFeatureDef>org.wso2.carbon.security.mgt.server:compatible:${carbon.security.mgt.version}</importFeatureDef>
                                 <importFeatureDef>org.wso2.carbon.identity.provider.server:compatible:${inbound.auth.openid.version}</importFeatureDef>
                             </importFeatures>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index 6afb30cd..a756f46d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,9 +185,9 @@
                 <version>${carbon.kernel.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <groupId>org.wso2.carbon.security.mgt</groupId>
                 <artifactId>org.wso2.carbon.security.mgt</artifactId>
-                <version>${identity.framework.version}</version>
+                <version>${carbon.security.mgt.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2.wso2</groupId>
@@ -454,6 +454,8 @@
         <identity.inbound.auth.sts.package.export.version>${project.version}
         </identity.inbound.auth.sts.package.export.version>
         <inbound.auth.openid.version>5.6.0</inbound.auth.openid.version>
+        <carbon.security.mgt.version>1.0.0</carbon.security.mgt.version>
+        <carbon.security.mgt.imp.pkg.version.range>[1.0.0, 2.0.0)</carbon.security.mgt.imp.pkg.version.range>
 
         <carbon.kernel.version>4.7.0</carbon.kernel.version>
         <carbon.kernel.feature.version>4.7.0</carbon.kernel.feature.version>

From 9507ae87c84157963c6b60e5db189266d6c1f5ff Mon Sep 17 00:00:00 2001
From: mpmadhavig <madhavi.17@cse.mrt.ac.lk>
Date: Mon, 21 Aug 2023 17:27:44 +0530
Subject: [PATCH 2/2] Remove carbon.security.keystore.service.version.range
 variable inconsistencies.

---
 components/org.wso2.carbon.mex/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/org.wso2.carbon.mex/pom.xml b/components/org.wso2.carbon.mex/pom.xml
index b556046c..482af50a 100644
--- a/components/org.wso2.carbon.mex/pom.xml
+++ b/components/org.wso2.carbon.mex/pom.xml
@@ -108,14 +108,14 @@
                             org.wso2.carbon.registry.core.*;version="${carbon.kernel.registry.imp.pkg.version}",
                             org.wso2.carbon.registry.api;version="${carbon.kernel.registry.imp.pkg.version}",
 
-                            org.wso2.carbon.security.util; version="${carbon.security.keystore.service.version.range}",
+                            org.wso2.carbon.security.util; version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.carbon.security.keystore.*;
-                            version="${carbon.security.keystore.service.version.range}",
+                            version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.apache.neethi; version="${neethi.osgi.version.range}",
                             org.apache.axiom.*; version="${axiom.osgi.version.range}",
-                            org.wso2.carbon.security.*;version="${carbon.security.keystore.service.version.range}",
+                            org.wso2.carbon.security.*;version="${carbon.security.mgt.imp.pkg.version.range}",
                             javax.cache,
-                            org.wso2.carbon.security.*;version="${carbon.security.keystore.service.version.range}",
+                            org.wso2.carbon.security.*;version="${carbon.security.mgt.imp.pkg.version.range}",
                             org.wso2.xfer.*; version="${xfer.import.pkg.version}",
                             org.wso2.carbon.identity.core.util; version="${identity.framework.imp.pkg.version.range}",
                         </Import-Package>