From 8f26cfd07d1ab6d2086f52133d14a934bc079697 Mon Sep 17 00:00:00 2001
From: YasasRangika <rangikaymendis@gmail.com>
Date: Wed, 3 Jul 2024 11:17:52 +0530
Subject: [PATCH] Add changes for
 https://github.com/wso2/api-manager/issues/2943

---
 .../pom.xml                                           |  2 +-
 components/org.wso2.carbon.identity.recovery/pom.xml  | 11 +++++++++++
 .../org.wso2.carbon.identity.user.export.core/pom.xml |  2 +-
 .../org.wso2.carbon.identity.user.rename.core/pom.xml |  2 +-
 pom.xml                                               |  6 +++---
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml b/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml
index 22e327647d..06d6662761 100644
--- a/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml
+++ b/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml
@@ -32,7 +32,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
         </dependency>
         <dependency>
diff --git a/components/org.wso2.carbon.identity.recovery/pom.xml b/components/org.wso2.carbon.identity.recovery/pom.xml
index fb56865713..3a99a16d22 100644
--- a/components/org.wso2.carbon.identity.recovery/pom.xml
+++ b/components/org.wso2.carbon.identity.recovery/pom.xml
@@ -190,6 +190,17 @@
                             version="${identity.governance.imp.pkg.version.range}",
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.identity.auth.attribute.handler.AuthAttributeHandlerManager,
+                            osgi.service;objectClass=org.wso2.carbon.identity.configuration.mgt.core.ConfigurationManager,
+                            osgi.service;objectClass=org.wso2.carbon.identity.consent.mgt.services.ConsentUtilityService,
+                            osgi.service;objectClass=org.wso2.carbon.identity.governance.service.IdentityDataStoreService,
+                            osgi.service;objectClass=org.wso2.carbon.identity.governance.service.otp.OTPGenerator,
+                            osgi.service;objectClass=org.wso2.carbon.identity.handler.event.account.lock.service.AccountLockService,
+                            osgi.service;objectClass=org.wso2.carbon.identity.input.validation.mgt.services.InputValidationManagementService,
+                            osgi.service;objectClass=org.wso2.carbon.identity.multi.attribute.login.mgt.MultiAttributeLoginService,
+                            osgi.service;objectClass=org.wso2.carbon.identity.user.functionality.mgt.UserFunctionalityManager
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/org.wso2.carbon.identity.user.export.core/pom.xml b/components/org.wso2.carbon.identity.user.export.core/pom.xml
index 932aec7eb1..5601b3b110 100644
--- a/components/org.wso2.carbon.identity.user.export.core/pom.xml
+++ b/components/org.wso2.carbon.identity.user.export.core/pom.xml
@@ -53,7 +53,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
         </dependency>
 
diff --git a/components/org.wso2.carbon.identity.user.rename.core/pom.xml b/components/org.wso2.carbon.identity.user.rename.core/pom.xml
index 0008751dc1..78e1de4689 100644
--- a/components/org.wso2.carbon.identity.user.rename.core/pom.xml
+++ b/components/org.wso2.carbon.identity.user.rename.core/pom.xml
@@ -31,7 +31,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 0a7cb7299a..e739d1fb96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
                 <version>${apache.felix.scr.ds.annotations.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.wso2.eclipse.osgi</groupId>
+                <groupId>org.eclipse.platform</groupId>
                 <artifactId>org.eclipse.osgi.services</artifactId>
                 <version>${equinox.osgi.services.version}</version>
             </dependency>
@@ -680,9 +680,9 @@
         <commons.io.wso2.osgi.version.range>[2.4.0,3.0.0)</commons.io.wso2.osgi.version.range>
         <commons-logging.osgi.version.range>[1.2.0,2.0.0)</commons-logging.osgi.version.range>
         <commons-lang.osgi.version.range>[2.6.0, 3.0.0)</commons-lang.osgi.version.range>
-        <imp.pkg.version.javax.servlet>[2.6.0, 3.0.0)</imp.pkg.version.javax.servlet>
+        <imp.pkg.version.javax.servlet>[2.6.0, 5.0.0)</imp.pkg.version.javax.servlet>
         <apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>
-        <equinox.osgi.services.version>3.5.100.v20160504-1419</equinox.osgi.services.version>
+        <equinox.osgi.services.version>3.12.0</equinox.osgi.services.version>
         <commons-collections.version>3.2.2.wso2v1</commons-collections.version>
         <commons-collections.wso2.osgi.version.range>[3.2.0,4.0.0)</commons-collections.wso2.osgi.version.range>
         <identity.data.publisher.authentication.version>5.3.27</identity.data.publisher.authentication.version>