Add changes for wso2/api-manager#2943

YasasRangika · Jul 3, 2024 · 81c9ae3 · 81c9ae3
1 parent 3f01e13
commit 81c9ae3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/components/logging/org.wso2.carbon.logging.appender.http/pom.xml b/components/logging/org.wso2.carbon.logging.appender.http/pom.xml
@@ -41,7 +41,7 @@
             <artifactId>org.wso2.securevault</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
         </dependency>
     </dependencies>

diff --git a/components/logging/org.wso2.carbon.logging.appender.service/pom.xml b/components/logging/org.wso2.carbon.logging.appender.service/pom.xml
@@ -41,7 +41,7 @@
             <artifactId>org.wso2.securevault</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
         </dependency>
         <dependency>

diff --git a/components/logging/org.wso2.carbon.logging.updater/pom.xml b/components/logging/org.wso2.carbon.logging.updater/pom.xml
@@ -48,6 +48,9 @@
                             org.osgi.service.component.*;version="${osgi.service.imp.pkg.version}",
                             *;resolution:=optional
                         </Import-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.carbon.logging.service.RemoteLoggingConfigService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/ntask/org.wso2.carbon.ntask.core/pom.xml b/components/ntask/org.wso2.carbon.ntask.core/pom.xml
@@ -32,7 +32,7 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
         </dependency>
         <dependency>
@@ -84,6 +84,13 @@
                             org.wso2.carbon.ntask.core.*; version="${carbon.commons.exp.package.version}",
                         </Export-Package>
 			<Carbon-Component>UIBundle</Carbon-Component>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.apache.axis2.engine.ListenerManager,
+                            osgi.service;objectClass=org.wso2.carbon.registry.core.service.RegistryService,
+                            osgi.service;objectClass=org.wso2.carbon.user.core.service.RealmService,
+                            osgi.service;objectClass=org.wso2.carbon.utils.ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.carbon.securevault.SecretCallbackHandlerService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/components/reporting/org.wso2.carbon.reporting.template.core/pom.xml b/components/reporting/org.wso2.carbon.reporting.template.core/pom.xml
@@ -18,7 +18,7 @@
 
     <dependencies>
 		<dependency>
-		   <groupId>org.eclipse.osgi</groupId>
+		   <groupId>org.eclipse.platform</groupId>
 		   <artifactId>org.eclipse.osgi</artifactId>
 	   </dependency>
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -206,7 +206,7 @@
                 <version>${orbit.version.h2.engine}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.eclipse.osgi</groupId>
+                        <groupId>org.eclipse.platform</groupId>
                         <artifactId>org.eclipse.osgi</artifactId>
                     </exclusion>
                     <exclusion>
@@ -1091,12 +1091,12 @@
                 <version>${orbit.version.json}</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse.osgi</groupId>
+                <groupId>org.eclipse.platform</groupId>
                 <artifactId>org.eclipse.osgi</artifactId>
                 <version>${org.eclipse.osgi.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse.osgi</groupId>
+                <groupId>org.eclipse.platform</groupId>
                 <artifactId>org.eclipse.osgi.services</artifactId>
                 <version>${version.equinox.osgi.services}</version>
             </dependency>
@@ -1922,8 +1922,8 @@
 
 
         <com.google.code.gson.version>2.10.1</com.google.code.gson.version>
-        <org.eclipse.osgi.version>3.9.1.v20130814-1242</org.eclipse.osgi.version>
-        <version.equinox.osgi.services>3.3.100.v20130513-1956</version.equinox.osgi.services>
+        <org.eclipse.osgi.version>3.19.0</org.eclipse.osgi.version>
+        <version.equinox.osgi.services>3.12.0</version.equinox.osgi.services>
         <amqp.version>3.0.3.wso2v1</amqp.version>
         <wsdl4j.version>1.6.2-wso2v3</wsdl4j.version>
         <org.apache.ws.commons.schema.wso2.version>1.4.7.wso2v3</org.apache.ws.commons.schema.wso2.version>