diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.capp.deployer/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.capp.deployer/pom.xml
index 0889eabd57..56b8182874 100644
--- a/components/data/data-services/org.wso2.micro.integrator.dataservices.capp.deployer/pom.xml
+++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.capp.deployer/pom.xml
@@ -48,10 +48,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.common/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.common/pom.xml
index 5ac9b0466c..f4d262a1f5 100644
--- a/components/data/data-services/org.wso2.micro.integrator.dataservices.common/pom.xml
+++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.common/pom.xml
@@ -44,6 +44,8 @@
                         <Export-Package>
                             org.wso2.micro.integrator.dataservices.common.*;version="${project.version}"
                         </Export-Package>
+                        <Import-Package>
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml
index 0eef0046fc..3802978296 100644
--- a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml
+++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/pom.xml
@@ -418,11 +418,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/main/java/org/wso2/micro/integrator/dataservices/core/odata/serializer/ODataImpl.java b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/main/java/org/wso2/micro/integrator/dataservices/core/odata/serializer/ODataImpl.java
index 94614027de..486bb9c7fb 100644
--- a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/main/java/org/wso2/micro/integrator/dataservices/core/odata/serializer/ODataImpl.java
+++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/main/java/org/wso2/micro/integrator/dataservices/core/odata/serializer/ODataImpl.java
@@ -27,7 +27,7 @@
 import org.apache.olingo.server.api.etag.ServiceMetadataETagSupport;
 import org.apache.olingo.server.api.serializer.SerializerException;
 import org.apache.olingo.server.api.serializer.SerializerException.MessageKeys;
-import org.apache.olingo.server.api.uri.UriHelper;;
+import org.apache.olingo.server.api.uri.UriHelper;
 import org.apache.olingo.server.core.ServiceMetadataImpl;
 import org.apache.olingo.server.core.uri.UriHelperImpl;
 
diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/test/java/org/wso2/micro/integrator/dataservices/core/test/util/DSComponentExtension.java b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/test/java/org/wso2/micro/integrator/dataservices/core/test/util/DSComponentExtension.java
index 2ea2afbe99..ebaf1c0481 100644
--- a/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/test/java/org/wso2/micro/integrator/dataservices/core/test/util/DSComponentExtension.java
+++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.core/src/test/java/org/wso2/micro/integrator/dataservices/core/test/util/DSComponentExtension.java
@@ -150,12 +150,6 @@ public <S> ServiceRegistration<S> registerService(Class<S> sClass, S s,
                         return null;
                     }
 
-                    @Override
-                    public <S> ServiceRegistration<S> registerService(Class<S> aClass, ServiceFactory<S> serviceFactory,
-                                                                      Dictionary<String, ?> dictionary) {
-                        return null;
-                    }
-
                     @Override
                     public ServiceReference<?>[] getServiceReferences(String s, String s2) throws InvalidSyntaxException {
                         return new ServiceReference<?>[0];
@@ -192,11 +186,6 @@ public boolean ungetService(ServiceReference<?> serviceReference) {
                         return false;
                     }
 
-                    @Override
-                    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> serviceReference) {
-                        return null;
-                    }
-
                     @Override
                     public File getDataFile(String s) {
                         return null;
diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.odata.endpoint/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.odata.endpoint/pom.xml
index 4f0ed8550a..6c84075737 100644
--- a/components/data/data-services/org.wso2.micro.integrator.dataservices.odata.endpoint/pom.xml
+++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.odata.endpoint/pom.xml
@@ -33,10 +33,6 @@
     <description>WSO2 Data Services Core Bundle</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>javax.servlet</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.ei</groupId>
             <artifactId>org.wso2.micro.integrator.dataservices.core</artifactId>
@@ -63,10 +59,6 @@
             <groupId>org.wso2.orbit.org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom.wso2</groupId>
             <artifactId>axiom</artifactId>
@@ -96,11 +88,9 @@
                         <Import-Package>
                             !org.wso2.micro.integrator.dataservices.odata.endpoint.*,
                             org.wso2.micro.integrator.dataservices.core.*;version="${project.version}",
-                            javax.servlet.http;version="${javax.servlet.imp.pkg.version}",
                             org.apache.commons.logging;version="${carbon.commons.logging.imp.pkg.version}",
                             org.apache.axis2.*; version="${imp.pkg.version.axis2}",
                             org.apache.commons.collections4.*,
-                            javax.servlet;version="${imp.pkg.version.javax.servlet}",
                             org.apache.axiom.*; version="${axiom.osgi.version.range}",
                             org.apache.synapse.*; version="${imp.pkg.version.synapse}",
                             org.apache.http.nio.*; version="${apache.http.nio.version}",
@@ -111,10 +101,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/components/data/data-services/org.wso2.micro.integrator.dataservices.sql.driver/pom.xml b/components/data/data-services/org.wso2.micro.integrator.dataservices.sql.driver/pom.xml
index 66ee9fc409..babc667bb8 100644
--- a/components/data/data-services/org.wso2.micro.integrator.dataservices.sql.driver/pom.xml
+++ b/components/data/data-services/org.wso2.micro.integrator.dataservices.sql.driver/pom.xml
@@ -81,12 +81,14 @@
             <artifactId>commons-logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wso2.ei</groupId>
@@ -153,10 +155,6 @@
                     </instructions>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/components/javax.cache/src/main/java/org/wso2/carbon/caching/impl/DataHolder.java b/components/javax.cache/src/main/java/org/wso2/carbon/caching/impl/DataHolder.java
index f7dbccc8e5..6e04c31ed4 100644
--- a/components/javax.cache/src/main/java/org/wso2/carbon/caching/impl/DataHolder.java
+++ b/components/javax.cache/src/main/java/org/wso2/carbon/caching/impl/DataHolder.java
@@ -20,7 +20,7 @@
 import org.apache.axis2.clustering.ClusteringAgent;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.base.api.ServerConfigurationService;
+import org.wso2.micro.integrator.core.services.ServerConfigurationService;
 
 import javax.cache.spi.AnnotationProvider;
 
diff --git a/components/javax.cache/src/main/java/org/wso2/carbon/caching/impl/internal/CachingServiceComponent.java b/components/javax.cache/src/main/java/org/wso2/carbon/caching/impl/internal/CachingServiceComponent.java
index fb9aeb96b5..2642db525a 100644
--- a/components/javax.cache/src/main/java/org/wso2/carbon/caching/impl/internal/CachingServiceComponent.java
+++ b/components/javax.cache/src/main/java/org/wso2/carbon/caching/impl/internal/CachingServiceComponent.java
@@ -27,12 +27,12 @@
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
 import org.osgi.framework.BundleContext;
-import org.wso2.carbon.base.api.ServerConfigurationService;
 import org.wso2.carbon.caching.impl.DataHolder;
 import org.wso2.carbon.caching.impl.DistributedMapProvider;
 import org.wso2.carbon.caching.impl.CachingAxisConfigurationObserver;
 import org.wso2.carbon.utils.Axis2ConfigurationContextObserver;
 import org.wso2.carbon.utils.ConfigurationContextService;
+import org.wso2.micro.integrator.core.services.ServerConfigurationService;
 
 @Component(name = "org.wso2.carbon.caching.impl.internal.CachingServiceComponent", immediate = true)
 public class CachingServiceComponent {
diff --git a/components/mediation/data-publishers/org.wso2.micro.integrator.observability/pom.xml b/components/mediation/data-publishers/org.wso2.micro.integrator.observability/pom.xml
index 97ec7f0e04..d5785e82ab 100644
--- a/components/mediation/data-publishers/org.wso2.micro.integrator.observability/pom.xml
+++ b/components/mediation/data-publishers/org.wso2.micro.integrator.observability/pom.xml
@@ -100,6 +100,7 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Axis2Module>${project.artifactId}-${project.version}</Axis2Module>
+                        <_contract>!*</_contract>
                         <Export-Package>
                             org.wso2.micro.integrator.observability.* ;version="${project.version}"
                         </Export-Package>
diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.osgi/pom.xml b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.osgi/pom.xml
index d169fbdf37..c71b53d0dd 100644
--- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.osgi/pom.xml
+++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.osgi/pom.xml
@@ -60,8 +60,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wso2.ei</groupId>
diff --git a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.persistence/pom.xml b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.persistence/pom.xml
index 4e419cfc04..1555c00896 100644
--- a/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.persistence/pom.xml
+++ b/components/mediation/inbound-endpoints/org.wso2.micro.integrator.inbound.endpoint.persistence/pom.xml
@@ -40,8 +40,14 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.wso2.ei</groupId>
diff --git a/components/mediation/mediators/cache-mediator/org.wso2.carbon.mediator.cache/pom.xml b/components/mediation/mediators/cache-mediator/org.wso2.carbon.mediator.cache/pom.xml
index 925e454904..e70e7e1d22 100644
--- a/components/mediation/mediators/cache-mediator/org.wso2.carbon.mediator.cache/pom.xml
+++ b/components/mediation/mediators/cache-mediator/org.wso2.carbon.mediator.cache/pom.xml
@@ -101,6 +101,8 @@
                         <Export-Package>
                             org.wso2.carbon.mediator.cache.*,
                         </Export-Package>
+                        <Import-Package>
+                        </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <Fragment-Host>synapse-core</Fragment-Host>
                     </instructions>
diff --git a/components/mediation/tasks/org.wso2.micro.integrator.ntask.core/pom.xml b/components/mediation/tasks/org.wso2.micro.integrator.ntask.core/pom.xml
index 084e80f864..587afd71eb 100644
--- a/components/mediation/tasks/org.wso2.micro.integrator.ntask.core/pom.xml
+++ b/components/mediation/tasks/org.wso2.micro.integrator.ntask.core/pom.xml
@@ -33,10 +33,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.orbit.org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
@@ -77,6 +73,9 @@
                             !org.wso2.micro.integrator.ntask.internal,
                             org.wso2.micro.integrator.ntask.core.*; version="${project.version}",
                         </Export-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass="org.wso2.micro.integrator.ntask.core.service.TaskService"
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/org.wso2.micro.integrator.core/pom.xml b/components/org.wso2.micro.integrator.core/pom.xml
index ee6171e42e..34fa99d5b1 100644
--- a/components/org.wso2.micro.integrator.core/pom.xml
+++ b/components/org.wso2.micro.integrator.core/pom.xml
@@ -55,17 +55,9 @@
             <groupId>org.wso2.carbon.mediation</groupId>
             <artifactId>org.wso2.carbon.sequences</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi.services</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
-            <artifactId>org.eclipse.equinox.http.helper</artifactId>
+            <artifactId>javax.servlet</artifactId>
         </dependency>
         <dependency>
             <groupId>org.eclipse.equinox</groupId>
@@ -156,6 +148,12 @@
                             org.apache.axis2.*; version="${imp.pkg.version.axis2}",
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.micro.integrator.core.services.Axis2ConfigurationContextService,
+                            osgi.service;objectClass=org.wso2.micro.integrator.core.UserStoreTemporaryService,
+                            osgi.service;objectClass=org.wso2.micro.integrator.core.services.CarbonServerConfigurationService,
+                            osgi.service;objectClass=org.wso2.micro.integrator.core.services.ServerConfigurationService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/org.wso2.micro.integrator.core/src/main/java/org/wso2/micro/integrator/transaction/manager/TransactionManagerComponent.java b/components/org.wso2.micro.integrator.core/src/main/java/org/wso2/micro/integrator/transaction/manager/TransactionManagerComponent.java
index 4f0eef4320..a85b22c79f 100644
--- a/components/org.wso2.micro.integrator.core/src/main/java/org/wso2/micro/integrator/transaction/manager/TransactionManagerComponent.java
+++ b/components/org.wso2.micro.integrator.core/src/main/java/org/wso2/micro/integrator/transaction/manager/TransactionManagerComponent.java
@@ -21,10 +21,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-import org.osgi.service.component.annotations.Deactivate;
-import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
 import org.wso2.micro.core.Constants;
@@ -36,8 +32,7 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 
-@Component(name = "org.wso2.micro.integrator.transaction.manager.TransactionManagerComponent",
-        immediate = true)
+//TODO: need a way to solve javax.transaction service dependency
 public class TransactionManagerComponent {
 
     private static Log log = LogFactory.getLog(TransactionManagerComponent.class);
@@ -49,23 +44,16 @@ public class TransactionManagerComponent {
     /* class level lock for controlling synchronized access to static variables */
     private static Object txManagerComponentLock = new Object();
 
-    @Activate
     protected void activate(ComponentContext ctxt) {
 
         bindTransactionManagerWithJNDI();
         log.debug("Transaction Manager bundle is activated ");
     }
 
-    @Deactivate
     protected void deactivate(ComponentContext ctxt) {
         log.debug("Transaction Manager bundle is deactivated ");
     }
 
-    @Reference(name = "transactionmanager",
-            service = TransactionManager.class,
-            cardinality = ReferenceCardinality.MANDATORY,
-            policy = ReferencePolicy.DYNAMIC,
-            unbind = "unsetTransactionManager")
     protected void setTransactionManager(TransactionManager txManager) {
 
         synchronized (txManagerComponentLock) {
@@ -88,11 +76,6 @@ private static TransactionManager getTransactionManager() {
         return txManager;
     }
 
-    @Reference(name = "usertransaction",
-            service = UserTransaction.class,
-            cardinality = ReferenceCardinality.MANDATORY,
-            policy = ReferencePolicy.DYNAMIC,
-            unbind = "unsetUserTransaction")
     protected void setUserTransaction(UserTransaction userTransaction) {
 
         synchronized (txManagerComponentLock) {
diff --git a/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/pom.xml b/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/pom.xml
index dac96a71d4..e6260effe1 100644
--- a/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/pom.xml
+++ b/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/pom.xml
@@ -15,14 +15,6 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.ei</groupId>
             <artifactId>org.wso2.micro.integrator.inbound.endpoint</artifactId>
@@ -64,6 +56,11 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -84,7 +81,7 @@
                             com.nimbusds.jose.jwk;version="${nimbus-jose.orbit.imp.pkg.version}",
                             com.nimbusds.jose.crypto;version="${nimbus-jose.orbit.imp.pkg.version}",
                             com.nimbusds.jwt;version="${nimbus-jose.orbit.imp.pkg.version}",
-                            org.osgi.service.cm;version="${version.eclipse.equinox.cm}",
+                            org.osgi.service.cm;version=${osgi.service.cm.version},
                             org.apache.commons.configuration2;version="${commons.configuration2.imp.pkg.version}",
                             *;resolution:=optional
                         </Import-Package>
diff --git a/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/src/test/java/org/wso2/micro/integrator/management/apis/ManagementApiParserTest.java b/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/src/test/java/org/wso2/micro/integrator/management/apis/ManagementApiParserTest.java
index 17b3bd930a..96508c0a06 100644
--- a/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/src/test/java/org/wso2/micro/integrator/management/apis/ManagementApiParserTest.java
+++ b/components/org.wso2.micro.integrator.extensions/org.wso2.micro.integrator.management.apis/src/test/java/org/wso2/micro/integrator/management/apis/ManagementApiParserTest.java
@@ -21,29 +21,16 @@
 import org.apache.axiom.om.OMElement;
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-import org.wso2.carbon.inbound.endpoint.internal.http.api.ConfigurationLoader;
 import org.wso2.micro.core.util.CarbonException;
 import org.wso2.micro.integrator.core.internal.MicroIntegratorBaseConstants;
 
 import javax.xml.stream.XMLStreamException;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 
 import static org.wso2.micro.integrator.management.apis.Constants.MGT_API_NAME;
 import static org.wso2.micro.integrator.management.apis.Constants.NAME_ATTR;
 
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest(ConfigurationLoader.class)
-@PowerMockIgnore({"javax.xml.*", "org.xml.*", "javax.management.*", "javax.xml.parsers.*", "javax.naming.spi.*", "javax.naming.*", "javax" +
-        ".xml.stream.*",  "org.apache.xerces.jaxp.*", "com.sun.org.apache.xerces.internal.jaxp.*", "org.w3c.dom.*"})
 public class ManagementApiParserTest {
 
     private void initializeConfDirectory() {
diff --git a/components/org.wso2.micro.integrator.initializer/pom.xml b/components/org.wso2.micro.integrator.initializer/pom.xml
index 4c1059f4d6..001e985e08 100755
--- a/components/org.wso2.micro.integrator.initializer/pom.xml
+++ b/components/org.wso2.micro.integrator.initializer/pom.xml
@@ -142,6 +142,11 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.micro.integrator.initializer.services.SynapseEnvironmentService,
+                            osgi.service;objectClass=org.wso2.micro.integrator.initializer.services.SynapseRegistrationsService,
+                            osgi.service;objectClass=org.wso2.micro.integrator.initializer.services.SynapseConfigurationService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/org.wso2.micro.integrator.log4j2.plugins/pom.xml b/components/org.wso2.micro.integrator.log4j2.plugins/pom.xml
index 964cfb05d8..9b5706722a 100644
--- a/components/org.wso2.micro.integrator.log4j2.plugins/pom.xml
+++ b/components/org.wso2.micro.integrator.log4j2.plugins/pom.xml
@@ -52,10 +52,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
diff --git a/components/org.wso2.micro.integrator.ndatasource.capp.deployer/pom.xml b/components/org.wso2.micro.integrator.ndatasource.capp.deployer/pom.xml
index 886c4c863c..dba337e118 100644
--- a/components/org.wso2.micro.integrator.ndatasource.capp.deployer/pom.xml
+++ b/components/org.wso2.micro.integrator.ndatasource.capp.deployer/pom.xml
@@ -49,10 +49,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
diff --git a/components/org.wso2.micro.integrator.ndatasource.common/pom.xml b/components/org.wso2.micro.integrator.ndatasource.common/pom.xml
index 3da3497601..0b649a6dae 100644
--- a/components/org.wso2.micro.integrator.ndatasource.common/pom.xml
+++ b/components/org.wso2.micro.integrator.ndatasource.common/pom.xml
@@ -44,6 +44,8 @@
                         <Export-Package>
                             org.wso2.micro.integrator.ndatasource.common.*;version="${project.version}"
                         </Export-Package>
+                        <Import-Package>
+                        </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                     </instructions>
                 </configuration>
diff --git a/components/org.wso2.micro.integrator.ndatasource.core/pom.xml b/components/org.wso2.micro.integrator.ndatasource.core/pom.xml
index 8bcfc3e981..607bd76565 100644
--- a/components/org.wso2.micro.integrator.ndatasource.core/pom.xml
+++ b/components/org.wso2.micro.integrator.ndatasource.core/pom.xml
@@ -31,8 +31,14 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.eclipse.osgi</groupId>
+            <groupId>org.eclipse.platform</groupId>
             <artifactId>org.eclipse.osgi.services</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.eclipse.jetty.toolchain</groupId>
+                    <artifactId>jetty-servlet</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -48,10 +54,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -74,6 +76,9 @@
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
                         <DeployBefore>UserCore</DeployBefore>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.micro.integrator.ndatasource.core.DataSourceService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/components/org.wso2.micro.integrator.security/pom.xml b/components/org.wso2.micro.integrator.security/pom.xml
index 427c44a385..84513bde2f 100644
--- a/components/org.wso2.micro.integrator.security/pom.xml
+++ b/components/org.wso2.micro.integrator.security/pom.xml
@@ -109,10 +109,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>de.jflex</groupId>
                 <artifactId>maven-jflex-plugin</artifactId>
@@ -165,6 +161,9 @@
                             *;resolution:=optional
                         </Import-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>
+                        <Provide-Capability>
+                            osgi.service;objectClass=org.wso2.micro.integrator.security.user.core.service.RealmService
+                        </Provide-Capability>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.observability.feature/pom.xml b/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.observability.feature/pom.xml
index d4601775ed..e2cb3c5c55 100644
--- a/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.observability.feature/pom.xml
+++ b/features/mediation-features/data-publisher-features/org.wso2.micro.integrator.observability.feature/pom.xml
@@ -42,34 +42,63 @@
             <groupId>org.apache.synapse</groupId>
             <artifactId>synapse-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.ei</groupId>
+            <artifactId>org.wso2.micro.integrator.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.ei</groupId>
+            <artifactId>org.wso2.micro.integrator.inbound.endpoint</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
             <artifactId>simpleclient</artifactId>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
-            <artifactId>simpleclient_common</artifactId>
+            <artifactId>simpleclient_hotspot</artifactId>
         </dependency>
         <dependency>
             <groupId>io.prometheus</groupId>
-            <artifactId>simpleclient_hotspot</artifactId>
+            <artifactId>prometheus-metrics-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.ei</groupId>
-            <artifactId>org.wso2.micro.integrator.core</artifactId>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-instrumentation-jvm</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-exposition-formats</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
-            <scope>provided</scope>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-config</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.ei</groupId>
-            <artifactId>org.wso2.micro.integrator.inbound.endpoint</artifactId>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-model</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-tracer-initializer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.prometheus</groupId>
+            <artifactId>prometheus-metrics-exposition-textformats</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>3.0.0</version>
         </dependency>
     </dependencies>
 
@@ -93,6 +122,16 @@
                                 <bundleDef>
                                     org.wso2.ei:org.wso2.micro.integrator.observability:${project.version}
                                 </bundleDef>
+<!--                                <bundleDef>io.prometheus:simpleclient</bundleDef>-->
+<!--                                <bundleDef>io.prometheus:simpleclient_hotspot</bundleDef>-->
+<!--                                <bundleDef>io.prometheus:prometheus-metrics-core</bundleDef>-->
+<!--                                <bundleDef>io.prometheus:prometheus-metrics-instrumentation-jvm</bundleDef>-->
+<!--                                <bundleDef>io.prometheus:prometheus-metrics-exposition-formats</bundleDef>-->
+<!--                                <bundleDef>io.prometheus:prometheus-metrics-config</bundleDef>-->
+<!--                                <bundleDef>io.prometheus:prometheus-metrics-model</bundleDef>-->
+<!--                                <bundleDef>io.prometheus:prometheus-metrics-tracer-initializer</bundleDef>-->
+<!--                                <bundleDef>io.prometheus:prometheus-metrics-exposition-textformats</bundleDef>-->
+<!--                                <bundleDef>jakarta.annotation:jakarta.annotation-api:3.0.0</bundleDef>-->
                             </bundles>
                         </configuration>
                     </execution>
diff --git a/features/org.wso2.micro.integrator.server.feature/pom.xml b/features/org.wso2.micro.integrator.server.feature/pom.xml
index d797fde7cd..122b7ba8c6 100644
--- a/features/org.wso2.micro.integrator.server.feature/pom.xml
+++ b/features/org.wso2.micro.integrator.server.feature/pom.xml
@@ -37,6 +37,66 @@
             <groupId>org.wso2.ei</groupId>
             <artifactId>org.wso2.micro.integrator.core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.promise</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.util.function</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.upnp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.device</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.event</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.wireadmin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.provisioning</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.useradmin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.permissionadmin</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.coordinator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.soap</groupId>
+            <artifactId>javax.xml.soap-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -60,6 +120,7 @@
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
                 <version>${carbon.p2.plugin.version}</version>
+                <extensions>true</extensions>
                 <executions>
                     <execution>
                         <id>p2-feature-generation</id>
@@ -212,8 +273,9 @@
                                 <bundleDef>
                                     org.wso2.orbit.javax.activation:activation:${version.org.wso2.orbit.javax.activation}
                                 </bundleDef>
+                                <bundleDef>javax.xml.soap:javax.xml.soap-api:${javax.xml.soap-api.version}</bundleDef>
                                 <bundleDef>
-                                    javax.annotation:javax.annotation-api:${verion.javax.annotation.annotation-api}
+                                    javax.annotation:javax.annotation-api:${version.javax.annotation.annotation-api}
                                 </bundleDef>
                                 <bundleDef>
                                     org.wso2.orbit.javax.transaction:jta:${version.org.wso2.orbit.javax.jta}
@@ -285,6 +347,22 @@
                                 <bundleDef>org.wso2.ei:javax.cache.wso2:${project.version}</bundleDef>
                                 <bundleDef>org.wso2.orbit.io.grpc:grpc-context:${grpc-context.orbit.version}</bundleDef>
                                 <bundleDef>org.wso2.orbit.io.opencensus:opencensus:${opencensus.orbit.version}</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.cm:${osgi.service.cm.version}</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.coordinator:${osgi.service.coordinator.version}</bundleDef>
+                                <bundleDef>org.apache.felix:org.apache.felix.scr:${felix.scr.version}</bundleDef>
+                                <bundleDef>org.eclipse.platform:org.eclipse.osgi:${version.equinox.platform.osgi}</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.component</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.util.promise</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.util.function</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.cm</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.upnp</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.device</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.event</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.wireadmin</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.provisioning</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.useradmin</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.metatype</bundleDef>
+                                <bundleDef>org.osgi:org.osgi.service.permissionadmin</bundleDef>
                             </bundles>
 
                             <importFeatures>
diff --git a/integration/pom.xml b/integration/pom.xml
index 2d3e55569d..bcfed8729f 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -826,7 +826,7 @@
         <h2.version>1.4.199</h2.version>
         <jersey-client.version>1.8</jersey-client.version>
         <awaitility.version>3.1.2</awaitility.version>
-        <jacoco.agent.version>0.8.8</jacoco.agent.version>
+        <jacoco.agent.version>0.8.12</jacoco.agent.version>
         <greenmail.version>1.3</greenmail.version>
         <esotericsoftware.kryo.version>3.0.3</esotericsoftware.kryo.version>
         <rabbitmq.version>5.8.0</rabbitmq.version>
diff --git a/p2-profile/carbon.product b/p2-profile/carbon.product
index e0db4ec0bf..0a38f582a7 100755
--- a/p2-profile/carbon.product
+++ b/p2-profile/carbon.product
@@ -2,7 +2,7 @@
 <?pde version="3.5"?>
 
 <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
-version="4.9.30" useFeatures="true" includeLaunchers="true">
+version="4.9.34.SNAPSHOT" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,7 +14,7 @@ version="4.9.30" useFeatures="true" includeLaunchers="true">
    </plugins>
 
    <features>
-      <feature id="org.wso2.carbon.core.runtime" version="4.9.30"/>
+      <feature id="org.wso2.carbon.core.runtime" version="4.9.34.SNAPSHOT"/>
    </features>
 
   <configurations>
diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml
index d578f71643..4b95637dcd 100644
--- a/p2-profile/pom.xml
+++ b/p2-profile/pom.xml
@@ -33,36 +33,11 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <inherited>false</inherited>
-                <executions>
-                    <execution>
-                        <id>2-unpack-equinox-executable</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.eclipse.equinox</groupId>
-                                    <artifactId>org.eclipse.equinox.executable</artifactId>
-                                    <version>3.5.0.v20110530-7P7NFUFFLWUl76mart</version>
-                                    <type>zip</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>target</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
                 <version>${carbon.p2.plugin.version}</version>
+                <extensions>true</extensions>
                 <executions>
                     <execution>
                         <id>2-p2-repo-generation</id>
diff --git a/pom.xml b/pom.xml
index 14b1b6eafd..835c7b34b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,19 +53,19 @@
                 <version>${openjpa.version.wso2}</version>
             </dependency>
             <dependency>
-                <groupId>org.eclipse.osgi</groupId>
-                <artifactId>org.eclipse.osgi</artifactId>
-                <version>${version.equinox.osgi}</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>
-            <dependency>
-                <groupId>org.eclipse.equinox</groupId>
-                <artifactId>org.eclipse.equinox.http.helper</artifactId>
-                <version>${version.equinox.http.helper}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.eclipse.jetty.toolchain</groupId>
+                        <artifactId>jetty-servlet</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.eclipse.jetty.toolchain</groupId>
+                        <artifactId>jetty-servlet-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.equinox</groupId>
@@ -75,7 +75,7 @@
             <dependency>
                 <groupId>org.eclipse.platform</groupId>
                 <artifactId>org.eclipse.osgi</artifactId>
-                <version>${version.equinox.platform}</version>
+                <version>${version.equinox.platform.osgi}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.axis2.wso2</groupId>
@@ -1610,6 +1610,86 @@
                 <artifactId>jakarta.jms-api</artifactId>
                 <version>${jakarta.jms-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.scr</artifactId>
+                <version>${felix.scr.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.xml.soap</groupId>
+                <artifactId>javax.xml.soap-api</artifactId>
+                <version>${javax.xml.soap-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.component</artifactId>
+                <version>${osgi.service.component.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.util.promise</artifactId>
+                <version>${osgi.util.promise.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.util.function</artifactId>
+                <version>${osgi.util.function.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.cm</artifactId>
+                <version>${osgi.service.cm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.upnp</artifactId>
+                <version>${osgi.service.upnp.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.device</artifactId>
+                <version>${osgi.service.device.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.event</artifactId>
+                <version>${osgi.service.event.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.wireadmin</artifactId>
+                <version>${osgi.service.wireadmin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.provisioning</artifactId>
+                <version>${osgi.service.provisioning.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.useradmin</artifactId>
+                <version>${osgi.service.useradmin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.metatype</artifactId>
+                <version>${osgi.service.metatype.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.permissionadmin</artifactId>
+                <version>${osgi.service.permissionadmin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.coordinator</artifactId>
+                <version>${osgi.service.coordinator.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.annotation</groupId>
+                <artifactId>javax.annotation-api</artifactId>
+                <version>${version.javax.annotation.annotation-api}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1685,10 +1765,29 @@
         <carbon.identity.framework.version>5.15.17</carbon.identity.framework.version>
         <carbon.identity.imp.pkg.version>[5.14.0, 6.0.0)</carbon.identity.imp.pkg.version>
 
-        <version.equinox.osgi>3.9.1.v20130814-1242</version.equinox.osgi>
-        <version.equinox.osgi.services>3.3.100.v20130513-1956</version.equinox.osgi.services>
+        <version.equinox.osgi.services>3.12.300</version.equinox.osgi.services>
+        <version.equinox.platform.osgi>3.19.0</version.equinox.platform.osgi>
         <version.equinox.http.helper>1.1.0.wso2v1</version.equinox.http.helper>
         <version.equinox.p2.metadata>2.2.0.v20130523-1557</version.equinox.p2.metadata>
+        <felix.scr.version>2.1.30</felix.scr.version>
+
+        <!-- javax.xml.soap version -->
+        <javax.xml.soap-api.version>1.4.0</javax.xml.soap-api.version>
+
+        <!-- OSGi service versions -->
+        <osgi.service.component.version>1.5.1</osgi.service.component.version>
+        <osgi.util.promise.version>1.3.0</osgi.util.promise.version>
+        <osgi.util.function.version>1.2.0</osgi.util.function.version>
+        <osgi.service.cm.version>1.6.1</osgi.service.cm.version>
+        <osgi.service.upnp.version>1.2.1</osgi.service.upnp.version>
+        <osgi.service.device.version>1.1.1</osgi.service.device.version>
+        <osgi.service.event.version>1.4.1</osgi.service.event.version>
+        <osgi.service.wireadmin.version>1.0.2</osgi.service.wireadmin.version>
+        <osgi.service.provisioning.version>1.2.0</osgi.service.provisioning.version>
+        <osgi.service.useradmin.version>1.1.1</osgi.service.useradmin.version>
+        <osgi.service.metatype.version>1.4.1</osgi.service.metatype.version>
+        <osgi.service.permissionadmin.version>1.2.1</osgi.service.permissionadmin.version>
+        <osgi.service.coordinator.version>1.0.2</osgi.service.coordinator.version>
 
         <openjpa.version>2.2.2</openjpa.version>
         <openjpa.version.wso2>2.2.2.wso2v2</openjpa.version.wso2>
@@ -1696,17 +1795,18 @@
         <!-- Maven Plugin Version -->
         <maven.build.helper.plugin.version>3.0.0</maven.build.helper.plugin.version>
         <maven.xmlbeans-maven-plugin.plugin.version>2.3.3</maven.xmlbeans-maven-plugin.plugin.version>
-        <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
+        <carbon.p2.plugin.version>5.4.12-SNAPSHOT</carbon.p2.plugin.version>
 
         <!-- Carbon kernel version-->
-        <carbon.kernel.version>4.9.30</carbon.kernel.version>
+<!--        <carbon.kernel.version>4.10.108-SNAPSHOT</carbon.kernel.version>-->
+        <carbon.kernel.version>4.9.34-SNAPSHOT</carbon.kernel.version>
         <carbon.kernel.imp.pkg.version>[4.5.0,5.0.0)</carbon.kernel.imp.pkg.version>
         <version.jaxb.api>2.4.0-b180830.0359</version.jaxb.api>
         <com.sun.jaxb.version>2.3.0</com.sun.jaxb.version>
         <com.sun.jaxb.impl.version>2.3.1</com.sun.jaxb.impl.version>
-        <synapse.version>4.0.0-wso2v270</synapse.version>
+        <synapse.version>4.0.0-wso2v300-SNAPSHOT</synapse.version>
         <imp.pkg.version.synapse>[4.0.0, 4.0.1)</imp.pkg.version.synapse>
-        <carbon.mediation.version>4.7.266</carbon.mediation.version>
+        <carbon.mediation.version>4.7.269-SNAPSHOT</carbon.mediation.version>
         <carbon.crypto.version>1.1.3</carbon.crypto.version>
         <carbon.crypto.api.imp.pkg.version.range>[1.1.0,1.2.0)</carbon.crypto.api.imp.pkg.version.range>
         <carbon.data.version>4.5.2</carbon.data.version>
@@ -1752,7 +1852,7 @@
         <bouncycastle.orbit.version>1.81.0.wso2v1</bouncycastle.orbit.version>
         <orbit.version.poi.ooxml>5.3.0.wso2v1</orbit.version.poi.ooxml>
         <org.wso2.json.version>3.0.0.wso2v4</org.wso2.json.version>
-        <version.equinox.http.servlet>1.1.400.v20130418-1354</version.equinox.http.servlet>
+        <version.equinox.http.servlet>1.8.100</version.equinox.http.servlet>
         <version.tomcat>9.0.110</version.tomcat>
         <orbit.version.tomcat.jsp.api>${version.tomcat}.wso2v1</orbit.version.tomcat.jsp.api>
         <orbit.version.tomcat.el.api>${version.tomcat}.wso2v1</orbit.version.tomcat.el.api>
@@ -1797,7 +1897,7 @@
         <maven.resources.plugin.version>3.1.0</maven.resources.plugin.version>
         <maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
         <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
-        <jacoco.maven.plugin.version>0.8.8</jacoco.maven.plugin.version>
+        <jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
         <testng.version>6.11</testng.version>
         <javax.jms-api.version>2.0.1</javax.jms-api.version>
         <jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>
@@ -1813,11 +1913,11 @@
         <pax.logging.api.version>2.1.0-wso2v5</pax.logging.api.version>
         <pax.logging.log4j2.version>2.1.0-wso2v5</pax.logging.log4j2.version>
         <org.apache.commons.logging.version>1.1.1</org.apache.commons.logging.version>
-        <version.eclipse.equinox.cm>1.3.100</version.eclipse.equinox.cm>
+        <version.eclipse.equinox.cm>1.6.300</version.eclipse.equinox.cm>
         <version.eclipse.equinox.event>1.5.100</version.eclipse.equinox.event>
 
         <version.org.wso2.orbit.javax.activation>1.1.1.wso2v3</version.org.wso2.orbit.javax.activation>
-        <verion.javax.annotation.annotation-api>1.3.2</verion.javax.annotation.annotation-api>
+        <version.javax.annotation.annotation-api>1.3.2</version.javax.annotation.annotation-api>
         <version.org.wso2.orbit.javax.jta>1.1.0.wso2v2</version.org.wso2.orbit.javax.jta>
         <org.wso2.orbit.sun.xml.ws.version>2.3.2.wso2v1</org.wso2.orbit.sun.xml.ws.version>
         <apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>
@@ -1825,10 +1925,10 @@
         <json.smart.version>2.5.2</json.smart.version>
         <google.guava.version>33.0.0-jre</google.guava.version>
         <ca.uhn.hapi.wso2.version>2.4.0.wso2v2</ca.uhn.hapi.wso2.version>
-        <junit.version>4.8.2</junit.version>
+        <junit.version>4.12</junit.version>
         <netty.version>4.1.127.Final</netty.version>
         <netty.tcnative.version>2.0.53.Final</netty.tcnative.version>
-        <jacoco.agent.version>0.8.8</jacoco.agent.version>
+        <jacoco.agent.version>0.8.12</jacoco.agent.version>
         <activemq.version>5.2.0</activemq.version>
         <activemq.broker.version>5.15.2</activemq.broker.version>
         <aries.version>1.1.0</aries.version>
@@ -1923,7 +2023,7 @@
         <commons-codec.orbit.imp.pkg.version>0.0.0</commons-codec.orbit.imp.pkg.version> <!--todo change this to appropriate version range ([1.4.0.wso2v1,1.5.0)) after osgi bundle is corrected - rajith-->
 
 <!--        <osgi.imp.pkg.version>[1.9.0,2.0.0)</osgi.imp.pkg.version> &lt;!&ndash; todo change this version to proper version range after osgi bundles are corrected (because export versions are different from bundle version) -rajith &ndash;&gt;-->
-        <osgi.service.imp.pkg.version>[1.2.0,1.3.0)</osgi.service.imp.pkg.version> <!-- todo change this version to proper version range after osgi bundles are corrected -rajith -->
+        <osgi.service.imp.pkg.version>[1.2.0,1.6.0)</osgi.service.imp.pkg.version> <!-- todo change this version to proper version range after osgi bundles are corrected -rajith -->
 
         <carbon-commons.trnsaction.mgt.imp.pkg.version>0.0.0</carbon-commons.trnsaction.mgt.imp.pkg.version> <!-- todo remove this and use {carbon-commons.imp.pkg.version} after org.wso2.carbon.transaction.manager (bundle - org.wso2.carbon.transaction.manager) is corrected to export correct versions-->
 
@@ -2020,7 +2120,7 @@
         <saxon.wso2.version>10.8</saxon.wso2.version>
         <xercesImpl.orbit.version>2.12.2.wso2v1</xercesImpl.orbit.version>
         <commons-logging.version>1.2</commons-logging.version>
-        <mockito.version>2.23.4</mockito.version>
+        <mockito.version>5.3.1</mockito.version>
         <wrapper.version>3.2.3</wrapper.version>
         <nimbus-jose.orbit.version>9.22.0.wso2v1</nimbus-jose.orbit.version>
         <nimbus-jose.orbit.imp.pkg.version>[9.22,10.0)</nimbus-jose.orbit.imp.pkg.version>
@@ -2030,7 +2130,7 @@
         <prometheus.version>0.8.1</prometheus.version>
         <!-- Prometheus API version 1.x-->
         <prometheus.v1.version>1.4.3</prometheus.v1.version>
-        <version.equinox.platform>3.14.0</version.equinox.platform>
+        <version.equinox.platform>3.23.200</version.equinox.platform>
         <!-- OAS3 Versions -->
         <swagger.parser.orbit.version>2.1.18.wso2v3</swagger.parser.orbit.version>
         <snakeyaml.version>2.2</snakeyaml.version>
@@ -2039,7 +2139,7 @@
         <version.geronimo.jta.spec>1.1</version.geronimo.jta.spec>
         <quartz.orbit.version>2.3.2.wso2v1</quartz.orbit.version>
         <!-- Maven bundle plugin -->
-        <maven.bundle.plugin.version>3.3.0</maven.bundle.plugin.version>
+        <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
         <apache.http.nio.version>4.4.15.wso2v1</apache.http.nio.version>
         <wso2.caching.version>4.0.3</wso2.caching.version>
         <apache.http.protocol.version>4.4.14.wso2v1</apache.http.protocol.version>
@@ -2169,19 +2269,13 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.26.2</version>
-
-                </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>