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

---
 components/org.wso2.carbon.identity.sso.saml/pom.xml | 8 ++++----
 pom.xml                                              | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml
index 4fcb306a9..4ba42e0f6 100644
--- a/components/org.wso2.carbon.identity.sso.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -417,9 +417,6 @@
                             org.wso2.carbon.identity.core.dao; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.core.persistence; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.identity.core.util; version="${carbon.identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security; version="${carbon.identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security.keystore; version="${carbon.identity.framework.imp.pkg.version.range}",
-                            org.wso2.carbon.security.keystore.service; version="${carbon.identity.framework.imp.pkg.version.range}",
                             org.wso2.carbon.user.core,
                             org.wso2.carbon.user.core.claim,
                             org.wso2.carbon.user.core.service,
@@ -429,7 +426,10 @@
                             org.wso2.carbon.identity.event; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.event.event; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.event.handler; version="${carbon.identity.package.import.version.range}",
-
+                            org.wso2.carbon.security,
+                            org.wso2.carbon.security.keystore,
+                            org.wso2.carbon.security.keystore.service;
+                            version="${carbon.security.keystore.service.version.range}",
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.identity.sso.saml.internal,
diff --git a/pom.xml b/pom.xml
index c865d64bf..76421aeb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -480,6 +480,7 @@
         <carbon.user.api.imp.pkg.version.range>[1.0.1, 2.0.0)</carbon.user.api.imp.pkg.version.range>
         <carbon.kernel.registry.imp.pkg.version>[1.0.1, 2.0.0)</carbon.kernel.registry.imp.pkg.version>
         <carbon.identity.package.import.version.range>[5.0.0, 7.0.0)</carbon.identity.package.import.version.range>
+        <carbon.security.keystore.service.version.range>[1.0.0, 2.0.0)</carbon.security.keystore.service.version.range>
 
         <osgi.service.http.imp.pkg.version.range>[1.2.1, 2.0.0)</osgi.service.http.imp.pkg.version.range>
         <osgi.util.tracker.imp.pkg.version.range>[1.5.1, 2.0.0)</osgi.util.tracker.imp.pkg.version.range>

From 403a113c49b46c444c075d83cdba89b0a4c5d615 Mon Sep 17 00:00:00 2001
From: mpmadhavig <madhavi.17@cse.mrt.ac.lk>
Date: Mon, 21 Aug 2023 15:37:38 +0530
Subject: [PATCH 2/2] Specify osgi import versions.

---
 components/org.wso2.carbon.identity.sso.saml/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 components/org.wso2.carbon.identity.sso.saml/pom.xml

diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml
old mode 100644
new mode 100755
index 4ba42e0f6..079850eca
--- a/components/org.wso2.carbon.identity.sso.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -426,8 +426,9 @@
                             org.wso2.carbon.identity.event; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.event.event; version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.event.handler; version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.security,
-                            org.wso2.carbon.security.keystore,
+                            org.wso2.carbon.security; version="${carbon.security.keystore.service.version.range}",
+                            org.wso2.carbon.security.keystore;
+                            version="${carbon.security.keystore.service.version.range}",
                             org.wso2.carbon.security.keystore.service;
                             version="${carbon.security.keystore.service.version.range}",
                         </Import-Package>