diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
index 5f836c1843..6c347c9e43 100644
--- a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
@@ -36,7 +36,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
                 <executions>
                     <execution>
                         <phase>process-resources</phase>
@@ -53,7 +52,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.5</version>
                 <configuration>
                     <finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
diff --git a/components/analytics/pom.xml b/components/analytics/pom.xml
index cb3c65d69f..99132b5a11 100644
--- a/components/analytics/pom.xml
+++ b/components/analytics/pom.xml
@@ -36,23 +36,22 @@
         <module>iot-analytics</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml
index 504cde055d..42795c59cb 100644
--- a/components/device-types/pom.xml
+++ b/components/device-types/pom.xml
@@ -36,24 +36,24 @@
         <module>virtual-fire-alarm-plugin</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>1.7.2</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 
 </project>
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
index 1722ccde55..d58d0f8325 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/pom.xml
@@ -41,8 +41,11 @@
 					<encoding>UTF-8</encoding>
 					<source>${wso2.maven.compiler.source}</source>
 					<target>${wso2.maven.compiler.target}</target>
+					<compilerArgs>
+						<arg>--add-exports</arg><arg>java.base/sun.security.x509=ALL-UNNAMED</arg>
+					</compilerArgs>
 				</configuration>
-				<version>2.3.2</version>
+
 			</plugin>
 
 			<plugin>
@@ -84,7 +87,6 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>${log4j.version}</version>
 		</dependency>
 
 
@@ -92,45 +94,38 @@
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-server</artifactId>
-			<version>${jetty.version}</version>
 		</dependency>
 
 		<!--Dependency on MQTT Client Library-->
 		<dependency>
 			<groupId>org.eclipse.paho</groupId>
 			<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-			<version>${paho.mqtt.version}</version>
 		</dependency>
 
 		<!--Dependencies on XMPP Client Library-->
 		<dependency>
 			<groupId>org.igniterealtime.smack.wso2</groupId>
 			<artifactId>smack</artifactId>
-			<version>${smack.wso2.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.igniterealtime.smack.wso2</groupId>
 			<artifactId>smackx</artifactId>
-			<version>${smackx.wso2.version}</version>
 		</dependency>
 
 		<!--Dependency on BouncyCastle Library for SCEP-->
 		<dependency>
 			<groupId>org.bouncycastle.wso2</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>
-			<version>${bcprov.wso2.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle.wso2</groupId>
 			<artifactId>bcpkix-jdk15on</artifactId>
-			<version>${bcpkix.wso2.version}</version>
 		</dependency>
 
 		<!--Dependency on WSO2 JSCEP Orbit-->
 		<dependency>
 			<groupId>com.google.code.jscep.wso2</groupId>
 			<artifactId>jscep</artifactId>
-			<version>${jscep.version}</version>
 		</dependency>
 
 		<dependency>
@@ -141,31 +136,26 @@
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
-			<version>${commons-lang.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
-			<version>${common-logging.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>commons-io</groupId>
+			<groupId>commons-io.wso2</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>${commons.io}</version>
 		</dependency>
 
 		<!--Dependency on SLF4J - required by BouncyCastle-->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>${slf4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
-			<version>${slf4j.version}</version>
 		</dependency>
 
 		<dependency>
@@ -176,62 +166,61 @@
 		<dependency>
 			<groupId>commons-configuration</groupId>
 			<artifactId>commons-configuration</artifactId>
-			<version>1.10</version>
 		</dependency>
 
 
 	</dependencies>
 
 
-	<repositories>
-		<repository>
-			<id>wso2-nexus</id>
-			<name>WSO2 internal Repository</name>
-			<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>daily</updatePolicy>
-				<checksumPolicy>ignore</checksumPolicy>
-			</releases>
-		</repository>
-		<repository>
-			<id>wso2-maven2-repository</id>
-			<url>http://dist.wso2.org/maven2</url>
-		</repository>
-	</repositories>
-
-	<properties>
-
-		<!-- Java Version Compatibility -->
-		<wso2.maven.compiler.source>1.7</wso2.maven.compiler.source>
-		<wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
-
-		<!-- Jetty Server Version -->
-		<jetty.version>8.1.3.v20120416</jetty.version>
-
-		<!-- MQTT Paho Version -->
-		<paho.mqtt.version>1.0.2</paho.mqtt.version>
-
-		<!-- Jivesoftware XMPP Version -->
-		<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
-		<smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>
-
-		<!-- BouncyCastle Version -->
-		<bcprov.wso2.version>1.49.wso2v1</bcprov.wso2.version>
-		<bcpkix.wso2.version>1.49.wso2v1</bcpkix.wso2.version>
-
-		<!-- WSO2 JSCEP Orbit Version -->
-		<jscep.version>2.0.2.wso2v2</jscep.version>
-
-		<!-- Commons Libraries -->
-		<log4j.version>1.2.17</log4j.version>
-		<common-logging.version>1.2</common-logging.version>
-		<commons.io>2.4</commons.io>
-		<commons-codec.version>1.7</commons-codec.version>
-		<commons-lang.version>2.6</commons-lang.version>
-
-		<!-- SLF4J Version -->
-		<slf4j.version>1.7.13</slf4j.version>
-	</properties>
+<!--	<repositories>-->
+<!--		<repository>-->
+<!--			<id>wso2-nexus</id>-->
+<!--			<name>WSO2 internal Repository</name>-->
+<!--			<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>-->
+<!--			<releases>-->
+<!--				<enabled>true</enabled>-->
+<!--				<updatePolicy>daily</updatePolicy>-->
+<!--				<checksumPolicy>ignore</checksumPolicy>-->
+<!--			</releases>-->
+<!--		</repository>-->
+<!--		<repository>-->
+<!--			<id>wso2-maven2-repository</id>-->
+<!--			<url>http://dist.wso2.org/maven2</url>-->
+<!--		</repository>-->
+<!--	</repositories>-->
+
+<!--	<properties>-->
+
+<!--		&lt;!&ndash; Java Version Compatibility &ndash;&gt;-->
+<!--		<wso2.maven.compiler.source>17</wso2.maven.compiler.source>-->
+<!--		<wso2.maven.compiler.target>17</wso2.maven.compiler.target>-->
+
+<!--		&lt;!&ndash; Jetty Server Version &ndash;&gt;-->
+<!--		<jetty.version>8.1.3.v20120416</jetty.version>-->
+
+<!--		&lt;!&ndash; MQTT Paho Version &ndash;&gt;-->
+<!--		<paho.mqtt.version>1.0.2</paho.mqtt.version>-->
+
+<!--		&lt;!&ndash; Jivesoftware XMPP Version &ndash;&gt;-->
+<!--		<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>-->
+<!--		<smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>-->
+
+<!--		&lt;!&ndash; BouncyCastle Version &ndash;&gt;-->
+<!--		<bcprov.wso2.version>1.49.wso2v1</bcprov.wso2.version>-->
+<!--		<bcpkix.wso2.version>1.49.wso2v1</bcpkix.wso2.version>-->
+
+<!--		&lt;!&ndash; WSO2 JSCEP Orbit Version &ndash;&gt;-->
+<!--		<jscep.version>2.0.2.wso2v2</jscep.version>-->
+
+<!--		&lt;!&ndash; Commons Libraries &ndash;&gt;-->
+<!--		<log4j.version>1.2.17</log4j.version>-->
+<!--		<common-logging.version>1.2</common-logging.version>-->
+<!--		<commons.io>2.4</commons.io>-->
+<!--		<commons-codec.version>1.7</commons-codec.version>-->
+<!--		<commons-lang.version>2.6</commons-lang.version>-->
+
+<!--		&lt;!&ndash; SLF4J Version &ndash;&gt;-->
+<!--		<slf4j.version>1.7.13</slf4j.version>-->
+<!--	</properties>-->
 
 </project>
diff --git a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
index 598be9ad60..69b57648e8 100644
--- a/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.api/pom.xml
@@ -32,9 +32,7 @@
 	<description>WSO2 Carbon - Virtual FireAlarm Service Management API Implementation</description>
 	<url>http://wso2.org</url>
 
-	<properties>
-		<cxf-bundle-package.version>2.7.18</cxf-bundle-package.version>
-	</properties>
+
 
 	<dependencies>
 		<!-- CDM -->
@@ -96,7 +94,6 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpasyncclient</artifactId>
-			<version>4.1</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -233,17 +230,14 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.cxf</groupId>
+			<groupId>org.apache.cxf.wso2</groupId>
 			<artifactId>cxf-bundle</artifactId>
-			<version>3.0.0-milestone2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-bundle-jaxrs</artifactId>
 			<scope>provided</scope>
-			<version>${cxf-bundle-package.version}</version>
-
 		</dependency>
 
 		<dependency>
diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml
index fc0ca1ab1b..a028b52a54 100644
--- a/components/device-types/virtual-fire-alarm-plugin/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml
@@ -37,23 +37,23 @@
         <module>io.entgra.device.mgt.plugins.virtualfirealarm.api</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>1.7.2</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
index 0f63432569..4bfd6f8323 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
@@ -36,14 +36,14 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-scr-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-scr-descriptor</id>
-						<goals>
-							<goal>scr</goal>
-						</goals>
-					</execution>
-				</executions>
+<!--				<executions>-->
+<!--					<execution>-->
+<!--						<id>generate-scr-descriptor</id>-->
+<!--						<goals>-->
+<!--							<goal>scr</goal>-->
+<!--						</goals>-->
+<!--					</execution>-->
+<!--				</executions>-->
 			</plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -107,8 +107,8 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.wso2.carbon</groupId>
-			<artifactId>org.wso2.carbon.logging</artifactId>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.json-simple.wso2</groupId>
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
index 380b65d469..97974fdcda 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
@@ -37,8 +37,8 @@
             <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -103,14 +103,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-descriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>generate-scr-descriptor</id>-->
+<!--                        <goals>-->
+<!--                            <goal>scr</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
index e2d044d981..e282106f7f 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
@@ -41,8 +41,8 @@
             <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -95,14 +95,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-descriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>generate-scr-descriptor</id>-->
+<!--                        <goals>-->
+<!--                            <goal>scr</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
index b3a7c70429..dfc39049ef 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
@@ -44,8 +44,8 @@
 			<artifactId>org.wso2.carbon.event.input.adapter.wso2event</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.wso2.carbon</groupId>
-			<artifactId>org.wso2.carbon.logging</artifactId>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.wso2.carbon</groupId>
@@ -75,14 +75,14 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-scr-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>generate-scr-descriptor</id>
-						<goals>
-							<goal>scr</goal>
-						</goals>
-					</execution>
-				</executions>
+<!--				<executions>-->
+<!--					<execution>-->
+<!--						<id>generate-scr-descriptor</id>-->
+<!--						<goals>-->
+<!--							<goal>scr</goal>-->
+<!--						</goals>-->
+<!--					</execution>-->
+<!--				</executions>-->
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
index 3a2e465917..5c360ff732 100644
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
@@ -37,8 +37,8 @@
             <artifactId>org.wso2.carbon.event.input.adapter.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -79,14 +79,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-descriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>generate-scr-descriptor</id>-->
+<!--                        <goals>-->
+<!--                            <goal>scr</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
index aaa6624be1..212c6df7a4 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
@@ -39,8 +39,8 @@
             <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.wso2</groupId>
@@ -69,14 +69,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-descriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>generate-scr-descriptor</id>-->
+<!--                        <goals>-->
+<!--                            <goal>scr</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
             </plugin>
 
             <plugin>
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
index eb26dd5889..2001fb6eb3 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
@@ -50,8 +50,8 @@
             <artifactId>org.wso2.carbon.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents.wso2</groupId>
@@ -83,14 +83,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-descriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>generate-scr-descriptor</id>-->
+<!--                        <goals>-->
+<!--                            <goal>scr</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
             </plugin>
 
             <plugin>
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
index 762eecfe36..2e6894448f 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket/pom.xml
@@ -40,8 +40,8 @@
             <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
@@ -106,14 +106,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-descriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>generate-scr-descriptor</id>-->
+<!--                        <goals>-->
+<!--                            <goal>scr</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
index fe35d0cdb9..96afa1e13c 100644
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.xmpp/pom.xml
@@ -43,8 +43,8 @@
             <artifactId>org.wso2.carbon.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.igniterealtime.smack.wso2</groupId>
@@ -60,14 +60,14 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>generate-scr-descriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>generate-scr-descriptor</id>-->
+<!--                        <goals>-->
+<!--                            <goal>scr</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
             </plugin>
 
             <plugin>
diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml
index 1b90ea40cf..8161c08103 100644
--- a/components/extensions/cdmf-transport-adapters/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/pom.xml
@@ -45,23 +45,23 @@
         <module>output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>1.7.2</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
index 7cf7639214..9ac5970e9a 100644
--- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
+++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.exhook/pom.xml
@@ -87,7 +87,6 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.6.1</version>
                 <configuration>
                     <protocArtifact>com.google.protobuf:protoc:3.12.0:exe:${os.detected.classifier}</protocArtifact>
                     <pluginId>grpc-java</pluginId>
diff --git a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
index 89a939f370..03a8424178 100644
--- a/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
+++ b/components/extensions/emqx-extensions/io.entgra.device.mgt.plugins.emqx.initializer/pom.xml
@@ -52,14 +52,12 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh</artifactId>
-                <version>2.1</version>
             </extension>
         </extensions>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.2</version>
                 <configuration>
                     <source>${wso2.maven.compiler.source}</source>
                     <target>${wso2.maven.compiler.target}</target>
@@ -68,20 +66,18 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-scr-plugin</artifactId>
-                <version>1.7.2</version>
-                <executions>
-                    <execution>
-                        <id>generate-scr-scrdescriptor</id>
-                        <goals>
-                            <goal>scr</goal>
-                        </goals>
-                    </execution>
-                </executions>
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>generate-scr-scrdescriptor</id>-->
+<!--                        <goals>-->
+<!--                            <goal>scr</goal>-->
+<!--                        </goals>-->
+<!--                    </execution>-->
+<!--                </executions>-->
             </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
index 330656a18a..d1352ae656 100644
--- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
+++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
@@ -38,8 +38,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -87,7 +87,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.7</version>
                         <executions>
                             <execution>
                                 <phase>compile</phase>
@@ -117,7 +116,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.2.1</version>
                         <executions>
                             <execution>
                                 <phase>test</phase>
@@ -169,8 +167,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/components/extensions/mb-extensions/pom.xml b/components/extensions/mb-extensions/pom.xml
index 90bb868a01..e61f93a05a 100644
--- a/components/extensions/mb-extensions/pom.xml
+++ b/components/extensions/mb-extensions/pom.xml
@@ -37,23 +37,23 @@
         <module>org.wso2.carbon.andes.extensions.device.mgt.api</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>1.7.2</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml
index 3bca242712..812ad1fbbc 100644
--- a/components/extensions/pom.xml
+++ b/components/extensions/pom.xml
@@ -40,23 +40,23 @@
         <module>siddhi-extensions</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>${maven.scr.version}</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>${maven.scr.version}</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml
index 64051d9736..5a2187fc23 100644
--- a/components/extensions/pull-notification-listeners/pom.xml
+++ b/components/extensions/pull-notification-listeners/pom.xml
@@ -36,23 +36,23 @@
         <module>io.entgra.device.mgt.plugins.mqtt.notification.listener</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>1.7.2</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml
index 87418eeaa5..9193ab39a6 100644
--- a/components/extensions/siddhi-extensions/pom.xml
+++ b/components/extensions/siddhi-extensions/pom.xml
@@ -37,23 +37,23 @@
         <module>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>1.7.2</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
index 12c34c66d9..7c7848990d 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml
@@ -36,14 +36,12 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
-                <version>2.3.2</version>
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.2</version>
                 <configuration>
                     <packagingExcludes>WEB-INF/lib/*cxf*.jar</packagingExcludes>
                     <warName>api#device-mgt#android#v1.0</warName>
@@ -99,7 +97,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.7</version>
                         <executions>
                             <execution>
                                 <phase>compile</phase>
@@ -156,7 +153,6 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.2.1</version>
                         <executions>
                             <execution>
                                 <phase>test</phase>
@@ -205,8 +201,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
index c2286cf2be..405f7049f1 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/pom.xml
@@ -105,7 +105,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.5</version>
                 <configuration>
                     <finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
index 6b7fb22f2e..fa6e764523 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml
@@ -46,7 +46,6 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -128,8 +127,8 @@
             <artifactId>org.wso2.carbon.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon</groupId>
-            <artifactId>org.wso2.carbon.logging</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml
index d0f00dea35..230d6b61d3 100644
--- a/components/mobile-plugins/android-plugin/pom.xml
+++ b/components/mobile-plugins/android-plugin/pom.xml
@@ -39,23 +39,22 @@
         <module>io.entgra.device.mgt.plugins.mobile.android.ui</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml
index 00143b6150..2f3c1d0147 100644
--- a/components/mobile-plugins/pom.xml
+++ b/components/mobile-plugins/pom.xml
@@ -36,23 +36,23 @@
         <module>android-plugin</module>
     </modules>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+<!--    <build>-->
+<!--        <pluginManagement>-->
+<!--            <plugins>-->
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>1.7.2</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
+<!--            </plugins>-->
+<!--        </pluginManagement>-->
+<!--    </build>-->
 </project>
diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
index b9190464cd..d458d3afbc 100644
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature/pom.xml
@@ -49,7 +49,6 @@
 		<dependency>
 			<groupId>org.wso2.orbit.com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>${orbit.h2.version}</version>
 		</dependency>
 	</dependencies>
 
diff --git a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
index 10b854a3e4..8e9c89df68 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/io.entgra.device.mgt.plugins.mobile.android.feature/pom.xml
@@ -68,7 +68,6 @@
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
                 <executions>
                     <execution>
                         <id>copy-resources</id>
diff --git a/pom.xml b/pom.xml
index 6985fdf340..01d7a5f70d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
     <parent>
         <groupId>org.wso2</groupId>
         <artifactId>wso2</artifactId>
-        <version>1</version>
+        <version>1.3</version>
     </parent>
 
     <modules>
@@ -97,25 +97,6 @@
                 <artifactId>org.wso2.carbon.base</artifactId>
                 <version>${carbon.kernel.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon</groupId>
-                <artifactId>org.wso2.carbon.logging</artifactId>
-                <version>${carbon.logging.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.log4j.wso2</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.bootstrap</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
                 <artifactId>org.wso2.carbon.utils</artifactId>
@@ -324,17 +305,17 @@
                 <artifactId>org.wso2.carbon.databridge.commons</artifactId>
                 <version>${carbon.commons.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.analytics-common</groupId>
-                <artifactId>org.wso2.carbon.databridge.agent</artifactId>
-                <version>${carbon.analytics.common.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-codec.wso2</groupId>
-                        <artifactId>commons-codec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.carbon.analytics-common</groupId>-->
+<!--                <artifactId>org.wso2.carbon.databridge.agent</artifactId>-->
+<!--                <version>${carbon.analytics.common.version}</version>-->
+<!--                <exclusions>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>commons-codec.wso2</groupId>-->
+<!--                        <artifactId>commons-codec</artifactId>-->
+<!--                    </exclusion>-->
+<!--                </exclusions>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.analytics-common</groupId>
                 <artifactId>org.wso2.carbon.event.output.adapter.core</artifactId>
@@ -526,7 +507,7 @@
             <dependency>
                 <groupId>org.eclipse.osgi</groupId>
                 <artifactId>org.eclipse.osgi.services</artifactId>
-                <version>3.3.100.v20120522-1822</version>
+                <version>${eclipse.equinox.services.version}</version>
             </dependency>
 
             <!--Orbit dependencies-->
@@ -553,61 +534,61 @@
                 <version>${carbon.kernel.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.wso2.carbon.governance</groupId>
-                <artifactId>org.wso2.carbon.governance.api</artifactId>
-                <version>${carbon.governance.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.juddi.wso2</groupId>
-                        <artifactId>juddi</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.registry</groupId>
-                        <artifactId>org.wso2.carbon.registry.common</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon</groupId>
-                        <artifactId>org.wso2.carbon.registry.core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.registry</groupId>
-                        <artifactId>org.wso2.carbon.registry.admin.api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.registry</groupId>
-                        <artifactId>org.wso2.carbon.registry.indexing</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>com.ibm.icu</groupId>
-                        <artifactId>icu4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.eclipse.equinox</groupId>
-                        <artifactId>org.eclipse.equinox.registry</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>eclipse</groupId>
-                        <artifactId>validateutility</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-impl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.wso2.carbon.registry</groupId>
-                        <artifactId>org.wso2.carbon.registry.extensions</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.carbon.governance</groupId>-->
+<!--                <artifactId>org.wso2.carbon.governance.api</artifactId>-->
+<!--                <version>${carbon.governance.version}</version>-->
+<!--                <exclusions>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.apache.juddi.wso2</groupId>-->
+<!--                        <artifactId>juddi</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.wso2.carbon.registry</groupId>-->
+<!--                        <artifactId>org.wso2.carbon.registry.common</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.wso2.carbon</groupId>-->
+<!--                        <artifactId>org.wso2.carbon.registry.core</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.wso2.carbon.registry</groupId>-->
+<!--                        <artifactId>org.wso2.carbon.registry.admin.api</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.wso2.carbon.registry</groupId>-->
+<!--                        <artifactId>org.wso2.carbon.registry.indexing</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>com.ibm.icu</groupId>-->
+<!--                        <artifactId>icu4j</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.eclipse.equinox</groupId>-->
+<!--                        <artifactId>org.eclipse.equinox.registry</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>eclipse</groupId>-->
+<!--                        <artifactId>validateutility</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.apache.ws.commons.axiom</groupId>-->
+<!--                        <artifactId>axiom-api</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.apache.ws.commons.axiom</groupId>-->
+<!--                        <artifactId>axiom-impl</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>org.wso2.carbon.registry</groupId>-->
+<!--                        <artifactId>org.wso2.carbon.registry.extensions</artifactId>-->
+<!--                    </exclusion>-->
+<!--                    <exclusion>-->
+<!--                        <groupId>javax.servlet</groupId>-->
+<!--                        <artifactId>servlet-api</artifactId>-->
+<!--                    </exclusion>-->
+<!--                </exclusions>-->
+<!--            </dependency>-->
 
             <dependency>
                 <groupId>org.wso2.carbon</groupId>
@@ -682,11 +663,11 @@
                 <artifactId>gson</artifactId>
                 <version>${google.gson.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.android.gcm</groupId>
-                <artifactId>gcm-server</artifactId>
-                <version>${gcm.server.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.google.android.gcm</groupId>-->
+<!--                <artifactId>gcm-server</artifactId>-->
+<!--                <version>${gcm.server.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.json.wso2</groupId>
                 <artifactId>json</artifactId>
@@ -739,6 +720,19 @@
                 <artifactId>cxf-rt-transports-http</artifactId>
                 <version>${cxf.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.cxf.wso2</groupId>
+                <artifactId>cxf-bundle</artifactId>
+                <version>${cxf-bundle.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-bundle-jaxrs</artifactId>
+                <scope>provided</scope>
+                <version>${cxf-bundle-package.version}</version>
+
+            </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>jsr311-api</artifactId>
@@ -771,58 +765,58 @@
                 <artifactId>jackson-jaxrs</artifactId>
                 <version>${jackson.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.orbit.com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${jackson-annotations.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.orbit.com.fasterxml.jackson.core</groupId>-->
+<!--                <artifactId>jackson-annotations</artifactId>-->
+<!--                <version>${jackson-annotations.version}</version>-->
+<!--            </dependency>-->
 
             <!--Windows Jax-RS dependencies-->
-            <dependency>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-rt-bindings-soap</artifactId>
-                <version>${cxf.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-rt-bindings-http</artifactId>
-                <version>${cxf.bindings.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.ws.security</groupId>
-                <artifactId>wss4j</artifactId>
-                <version>${wss4j.security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-rt-rs-extension-providers</artifactId>
-                <version>${cxf.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-rt-ws-security</artifactId>
-                <version>${cxf.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.wss4j</groupId>
-                <artifactId>wss4j-ws-security-common</artifactId>
-                <version>${wss4j.security.common.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.ws.commons.axiom.wso2</groupId>
-                <artifactId>axiom</artifactId>
-                <version>${axiom-api.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.apache.cxf</groupId>-->
+<!--                <artifactId>cxf-rt-bindings-soap</artifactId>-->
+<!--                <version>${cxf.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.apache.cxf</groupId>-->
+<!--                <artifactId>cxf-rt-bindings-http</artifactId>-->
+<!--                <version>${cxf.bindings.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.apache.ws.security</groupId>-->
+<!--                <artifactId>wss4j</artifactId>-->
+<!--                <version>${wss4j.security.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.apache.cxf</groupId>-->
+<!--                <artifactId>cxf-rt-rs-extension-providers</artifactId>-->
+<!--                <version>${cxf.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.apache.cxf</groupId>-->
+<!--                <artifactId>cxf-rt-ws-security</artifactId>-->
+<!--                <version>${cxf.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.apache.wss4j</groupId>-->
+<!--                <artifactId>wss4j-ws-security-common</artifactId>-->
+<!--                <version>${wss4j.security.common.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.apache.ws.commons.axiom.wso2</groupId>-->
+<!--                <artifactId>axiom</artifactId>-->
+<!--                <version>${axiom-api.version}</version>-->
+<!--            </dependency>-->
             <!--dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-impl</artifactId>
                 <version>${axiom-api.version}</version>
             </dependency-->
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons-io.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>commons-io</groupId>-->
+<!--                <artifactId>commons-io</artifactId>-->
+<!--                <version>${commons-io.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>commons-io.wso2</groupId>
                 <artifactId>commons-io</artifactId>
@@ -838,94 +832,124 @@
                 <artifactId>spring-web</artifactId>
                 <version>${spring-web.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.ws</groupId>
-                <artifactId>spring-ws-security</artifactId>
-                <version>${spring-ws-security.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-context</artifactId>
-                <version>${spring-web.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.ws</groupId>
-                <artifactId>jaxws-rt</artifactId>
-                <version>${jaxws-rt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.xml.messaging.saaj</groupId>
-                <artifactId>saaj-impl</artifactId>
-                <version>${saaj-impl.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.orbit.org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15on</artifactId>
-                <version>${bcpkix-jdk15on.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.orbit.org.bouncycastle</groupId>
+<!--            <dependency>-->
+<!--                <groupId>org.springframework.ws</groupId>-->
+<!--                <artifactId>spring-ws-security</artifactId>-->
+<!--                <version>${spring-ws-security.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.springframework</groupId>-->
+<!--                <artifactId>spring-context</artifactId>-->
+<!--                <version>${spring-web.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.sun.xml.ws</groupId>-->
+<!--                <artifactId>jaxws-rt</artifactId>-->
+<!--                <version>${jaxws-rt.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.sun.xml.messaging.saaj</groupId>-->
+<!--                <artifactId>saaj-impl</artifactId>-->
+<!--                <version>${saaj-impl.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.orbit.org.bouncycastle</groupId>-->
+<!--                <artifactId>bcpkix-jdk15on</artifactId>-->
+<!--                <version>${bcpkix-jdk15on.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.orbit.org.bouncycastle</groupId>-->
+<!--                <artifactId>bcprov-jdk15on</artifactId>-->
+<!--                <version>${bcprov-jdk15on.version}</version>-->
+<!--            </dependency>-->
+            <dependency>
+                <groupId>org.bouncycastle.wso2</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
                 <version>${bcprov-jdk15on.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-utils</artifactId>
-                <version>${plexus-utils.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.madgag.spongycastle</groupId>
-                <artifactId>pkix</artifactId>
-                <version>${spongycastle.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.madgag.spongycastle</groupId>
-                <artifactId>prov</artifactId>
-                <version>${spongycastle.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.madgag.spongycastle</groupId>
-                <artifactId>core</artifactId>
-                <version>${spongycastle.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time</artifactId>
-                <version>${joda-time.version}</version>
+                <groupId>org.bouncycastle.wso2</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>${bcpkix-jdk15on.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.scr</artifactId>
-                <version>${apache-felix.version}</version>
-            </dependency>
+                <groupId>com.google.code.jscep.wso2</groupId>
+                <artifactId>jscep</artifactId>
+                <version>${jscep.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>${common-logging.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.codehaus.plexus</groupId>-->
+<!--                <artifactId>plexus-utils</artifactId>-->
+<!--                <version>${plexus-utils.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.madgag.spongycastle</groupId>-->
+<!--                <artifactId>pkix</artifactId>-->
+<!--                <version>${spongycastle.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.madgag.spongycastle</groupId>-->
+<!--                <artifactId>prov</artifactId>-->
+<!--                <version>${spongycastle.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.madgag.spongycastle</groupId>-->
+<!--                <artifactId>core</artifactId>-->
+<!--                <version>${spongycastle.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>joda-time</groupId>-->
+<!--                <artifactId>joda-time</artifactId>-->
+<!--                <version>${joda-time.version}</version>-->
+<!--            </dependency>-->
+
+<!--            <dependency>-->
+<!--                <groupId>org.apache.felix</groupId>-->
+<!--                <artifactId>org.apache.felix.scr</artifactId>-->
+<!--                <version>${apache-felix.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.googlecode.json-simple.wso2</groupId>
                 <artifactId>json-simple</artifactId>
                 <version>${json-simple.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.googlecode.plist</groupId>
-                <artifactId>dd-plist</artifactId>
-                <version>${googlecode.plist.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.googlecode.plist</groupId>-->
+<!--                <artifactId>dd-plist</artifactId>-->
+<!--                <version>${googlecode.plist.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
                 <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
                 <version>${identity.inbound.auth.oauth.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
-                <artifactId>org.wso2.carbon.identity.oauth</artifactId>
-                <version>${identity.inbound.auth.oauth.version}</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.identity.carbon.auth.jwt</groupId>
-                <artifactId>org.wso2.carbon.identity.authenticator.signedjwt</artifactId>
-                <version>${identity.carbon.auth.jwt.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>-->
+<!--                <artifactId>org.wso2.carbon.identity.oauth</artifactId>-->
+<!--                <version>${identity.inbound.auth.oauth.version}</version>-->
+<!--                <scope>provided</scope>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.carbon.identity.carbon.auth.jwt</groupId>-->
+<!--                <artifactId>org.wso2.carbon.identity.authenticator.signedjwt</artifactId>-->
+<!--                <version>${identity.carbon.auth.jwt.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.apache.httpcomponents.wso2</groupId>
                 <artifactId>httpcore</artifactId>
@@ -951,11 +975,11 @@
                 <artifactId>commons-configuration</artifactId>
                 <version>${commons-configuration.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.commons</groupId>
-                <artifactId>org.wso2.carbon.user.mgt</artifactId>
-                <version>${carbon.commons.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.carbon.commons</groupId>-->
+<!--                <artifactId>org.wso2.carbon.user.mgt</artifactId>-->
+<!--                <version>${carbon.commons.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.jayway.jsonpath</groupId>
                 <artifactId>json-path</artifactId>
@@ -994,21 +1018,21 @@
                 <version>${hibernate-validator.version}</version>
             </dependency>
             <!--MB feature -->
-            <dependency>
-                <groupId>org.wso2.andes.wso2</groupId>
-                <artifactId>andes</artifactId>
-                <version>${andes.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.entgra.device.mgt.plugins</groupId>
-                <artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</artifactId>
-                <version>${io.entgra.device.mgt.plugins.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.entgra.device.mgt.plugins</groupId>
-                <artifactId>org.wso2.carbon.andes.extensions.device.mgt.api</artifactId>
-                <version>${io.entgra.device.mgt.plugins.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.andes.wso2</groupId>-->
+<!--                <artifactId>andes</artifactId>-->
+<!--                <version>${andes.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>io.entgra.device.mgt.plugins</groupId>-->
+<!--                <artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</artifactId>-->
+<!--                <version>${io.entgra.device.mgt.plugins.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>io.entgra.device.mgt.plugins</groupId>-->
+<!--                <artifactId>org.wso2.carbon.andes.extensions.device.mgt.api</artifactId>-->
+<!--                <version>${io.entgra.device.mgt.plugins.version}</version>-->
+<!--            </dependency>-->
 
             <!--EMQX Extensions -->
             <dependency>
@@ -1052,11 +1076,11 @@
 				<artifactId>feign-slf4j</artifactId>
 				<version>${io.github.openfeign.version}</version>
 			</dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.messaging</groupId>
-                <artifactId>org.wso2.carbon.andes.mqtt.stub</artifactId>
-                <version>${carbon.andes.mqtt.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.wso2.carbon.messaging</groupId>-->
+<!--                <artifactId>org.wso2.carbon.andes.mqtt.stub</artifactId>-->
+<!--                <version>${carbon.andes.mqtt.version}</version>-->
+<!--            </dependency>-->
 
             <!-- dependencies for siddhi extension -->
             <dependency>
@@ -1126,11 +1150,11 @@
                 <type>apk</type>
                 <version>${android.agent.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.apis</groupId>
-                <artifactId>google-api-services-androidenterprise</artifactId>
-                <version>v1-rev214-1.25.0</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.google.apis</groupId>-->
+<!--                <artifactId>google-api-services-androidenterprise</artifactId>-->
+<!--                <version>v1-rev214-1.25.0</version>-->
+<!--            </dependency>-->
 
             <!--Dependencies for EMQX-->
             <dependency>
@@ -1160,6 +1184,11 @@
                 <version>${commons-lang-wso2}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpasyncclient</artifactId>
+                <version>4.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -1176,68 +1205,70 @@
         <android.agent.version>4.0.0</android.agent.version>
 
         <!-- Java Version Compatibility -->
-        <wso2.maven.compiler.source>1.8</wso2.maven.compiler.source>
-        <wso2.maven.compiler.target>1.8</wso2.maven.compiler.target>
+        <wso2.maven.compiler.source>17</wso2.maven.compiler.source>
+        <wso2.maven.compiler.target>17</wso2.maven.compiler.target>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.6.2</carbon.kernel.version>
-        <carbon.kernel.version.range>[4.5.0, 5.0.0)</carbon.kernel.version.range>
-        <carbon.logging.version>4.4.9</carbon.logging.version>
+        <carbon.kernel.version>4.8.1</carbon.kernel.version>
+<!--        <carbon.kernel.version.range>[4.5.0, 5.0.0)</carbon.kernel.version.range>-->
+<!--        <carbon.logging.version>4.4.9</carbon.logging.version>-->
         <pax.logging.api.version>1.11.2</pax.logging.api.version>
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
 
         <!-- Axis2 -->
-        <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>
-        <axis2.orbit.version>1.6.1.wso2v11</axis2.orbit.version>
-        <axis2-transports.version>1.1.0-wso2v10</axis2-transports.version>
+<!--        <axis2.osgi.version.range>[1.6.1.wso2v11, 1.7.0)</axis2.osgi.version.range>-->
+        <axis2.orbit.version>1.6.1-wso2v85</axis2.orbit.version>
+<!--        <axis2-transports.version>1.1.0-wso2v10</axis2-transports.version>-->
 
         <!--Maven build number plugin-->
-        <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
+<!--        <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>-->
 
         <!--Testing -->
-        <junit.version>4.8.2</junit.version>
-        <test.framework.version>4.3.1</test.framework.version>
-        <testng.version>6.8</testng.version>
+        <junit.version>4.13.1</junit.version>
+<!--        <test.framework.version>4.3.1</test.framework.version>-->
+        <testng.version>7.4.0</testng.version>
 
         <!--Eclipse Osgi-->
-        <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
-        <eclipse.osgi.version>3.9.1.v20140110-1610</eclipse.osgi.version>
+        <eclipse.equinox.common.version>3.6.200.v20130402-1505</eclipse.equinox.common.version>
+        <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
+        <eclipse.equinox.services.version>3.3.100.v20120522-1822</eclipse.equinox.services.version>
 
         <!--Orbit versions-->
-        <orbit.h2.version>1.4.199.wso2v1</orbit.h2.version>
-        <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
-        <orbit.tomcat.version>7.0.85.wso2v1</orbit.tomcat.version>
+        <orbit.h2.version>2.1.210.wso2v1</orbit.h2.version>
+<!--        <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>-->
+<!--        <orbit.tomcat.version>7.0.85.wso2v1</orbit.tomcat.version>-->
         <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
 
         <!-- CXF version -->
-        <cxf.version>3.3.6</cxf.version>
+        <cxf.version>3.5.5</cxf.version>
         <cxf.bindings.version>2.5.11</cxf.bindings.version>
-        <jackson.version>1.9.0</jackson.version>
+        <cxf-bundle.version>2.6.1.wso2v2</cxf-bundle.version>
+        <jackson.version>1.9.13</jackson.version>
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Commons -->
-        <carbon.commons.version>4.6.21</carbon.commons.version>
+        <carbon.commons.version>4.9.2</carbon.commons.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.7.15</carbon.deployment.version>
+<!--        <carbon.deployment.version>4.7.15</carbon.deployment.version>-->
 
         <!-- Carbon Identity -->
-        <carbon.identity.framework.version>5.18.187</carbon.identity.framework.version>
-        <identity.inbound.auth.oauth.version>6.4.111</identity.inbound.auth.oauth.version>
-        <carbon.identity.version.range>[5.2.0, 7.0.0)</carbon.identity.version.range>
-        <identity.carbon.auth.jwt.version>5.1.5</identity.carbon.auth.jwt.version>
+<!--        <carbon.identity.framework.version>5.24.8</carbon.identity.framework.version>-->
+        <identity.inbound.auth.oauth.version>6.9.6</identity.inbound.auth.oauth.version>
+<!--        <carbon.identity.version.range>[5.2.0, 7.0.0)</carbon.identity.version.range>-->
+<!--        <identity.carbon.auth.jwt.version>5.1.5</identity.carbon.auth.jwt.version>-->
 
         <!-- Carbon Multi-tenancy -->
-        <carbon.multitenancy.version>4.9.10</carbon.multitenancy.version>
+<!--        <carbon.multitenancy.version>4.9.20</carbon.multitenancy.version>-->
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.7.39</carbon.registry.version>
+<!--        <carbon.registry.version>4.8.13</carbon.registry.version>-->
 
         <!-- Carbon Governance -->
-        <carbon.governance.version>4.8.21</carbon.governance.version>
+<!--        <carbon.governance.version>4.8.30</carbon.governance.version>-->
 
         <!-- Carbon API Management -->
-        <carbon.api.mgt.version>9.0.174</carbon.api.mgt.version>
+<!--        <carbon.api.mgt.version>9.0.174</carbon.api.mgt.version>-->
 
         <!-- XMPP/MQTT Version -->
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
@@ -1248,91 +1279,94 @@
         <jetty.version>8.1.3.v20120416</jetty.version>
 
         <!-- Swagger -->
-        <swagger.version>1.5.10</swagger.version>
+        <swagger.version>1.6.9</swagger.version>
 
         <!-- Carbon Analytics -->
-        <carbon.analytics.common.version>5.2.34</carbon.analytics.common.version>
-        <carbon.analytics.common.version.range>[5.2.0,6.0.0)</carbon.analytics.common.version.range>
+        <carbon.analytics.common.version>5.3.5</carbon.analytics.common.version>
+<!--        <carbon.analytics.common.version.range>[5.3.0,6.0.0)</carbon.analytics.common.version.range>-->
 
         <!-- Third Party Dependencies-->
-        <spongycastle.version>1.51.0.0</spongycastle.version>
-        <bouncycastle.version>1.49</bouncycastle.version>
-        <apache.wss4j.version>2.0.0</apache.wss4j.version>
-        <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
-        <google.gson.version>2.8.5</google.gson.version>
-        <gcm.server.version>1.0.2</gcm.server.version>
+<!--        <spongycastle.version>1.51.0.0</spongycastle.version>-->
+<!--        <bouncycastle.version>1.49</bouncycastle.version>-->
+<!--        <apache.wss4j.version>2.0.0</apache.wss4j.version>-->
+<!--        <codehaus.plexus.version>3.0.21</codehaus.plexus.version>-->
+        <google.gson.version>2.9.1</google.gson.version>
+<!--        <gcm.server.version>1.0.2</gcm.server.version>-->
         <commons-io-wso2.version>2.4.0.wso2v1</commons-io-wso2.version>
-        <commons-io.version>2.4</commons-io.version>
-        <apache-felix.version>1.0.8</apache-felix.version>
-        <googlecode.plist.version>1.8</googlecode.plist.version>
-        <commons.lang.version>2.2</commons.lang.version>
+<!--        <commons-io.version>2.4.0.wso2v1</commons-io.version>-->
+<!--        <apache-felix.version>1.0.8</apache-felix.version>-->
+<!--        <googlecode.plist.version>1.8</googlecode.plist.version>-->
+        <commons.lang.version>2.4</commons.lang.version>
 
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
         <commons-codec.version.wso2>1.4.0.wso2v1</commons-codec.version.wso2>
-        <commons-codec.version>1.7</commons-codec.version>
+        <commons-codec.version>1.9</commons-codec.version>
 
         <javaee-web-api.version>6.0</javaee-web-api.version>
 
-        <axiom-api.version>1.2.11.wso2v10</axiom-api.version>
+<!--        <axiom-api.version>1.2.11.wso2v10</axiom-api.version>-->
         <log4j.version>1.2.17</log4j.version>
-        <spring-web.version>5.1.13.RELEASE</spring-web.version>
-        <spring-ws-security.version>3.0.8.RELEASE</spring-ws-security.version>
-        <jaxws-rt.version>2.2.8</jaxws-rt.version>
-        <saaj-impl.version>1.3.18</saaj-impl.version>
-        <bcpkix-jdk15on.version>1.52.0.wso2v2</bcpkix-jdk15on.version>
-        <bcprov-jdk15on.version>1.52.0.wso2v1</bcprov-jdk15on.version>
-        <plexus-utils.version>3.0.21</plexus-utils.version>
-        <joda-time.version>2.3</joda-time.version>
-        <wss4j.security.version>1.6.17</wss4j.security.version>
-        <wss4j.security.common.version>2.0.0</wss4j.security.common.version>
+        <spring-web.version>5.3.23</spring-web.version>
+<!--        <spring-ws-security.version>3.0.8.RELEASE</spring-ws-security.version>-->
+<!--        <jaxws-rt.version>2.2.8</jaxws-rt.version>-->
+<!--        <saaj-impl.version>1.3.18</saaj-impl.version>-->
+        <bcpkix-jdk15on.version>1.49.0.wso2v2</bcpkix-jdk15on.version>
+        <bcprov-jdk15on.version>1.49.0.wso2v2</bcprov-jdk15on.version>
+        <jscep.version>2.0.2.wso2v2</jscep.version>
+        <common-logging.version>1.2</common-logging.version>
+        <slf4j.version>1.7.13</slf4j.version>
+<!--        <plexus-utils.version>3.0.21</plexus-utils.version>-->
+<!--        <joda-time.version>2.3</joda-time.version>-->
+<!--        <wss4j.security.version>1.6.17</wss4j.security.version>-->
+<!--        <wss4j.security.common.version>2.0.0</wss4j.security.common.version>-->
 
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
-        <commons-json.version.range>(3.0.0, 4.0.0]</commons-json.version.range>
+<!--        <commons-json.version.range>(3.0.0, 4.0.0]</commons-json.version.range>-->
         <orbit.version.json.range>[2.0.0,4.0.0)</orbit.version.json.range>
         <json.path.version>0.9.1</json.path.version>
         <json-simple.version>1.1.wso2v1</json-simple.version>
         <commons-collections.version>3.2.2</commons-collections.version>
-        <commons-configuration.version>1.8</commons-configuration.version>
+        <commons-configuration.version>1.10</commons-configuration.version>
 
-        <orbit.version.tomcat-servlet-api>7.0.85.wso2v1</orbit.version.tomcat-servlet-api>
+        <orbit.version.tomcat-servlet-api>7.0.93.wso2v1</orbit.version.tomcat-servlet-api>
         <!--http client version-->
         <httpclient.version>4.3.1.wso2v2</httpclient.version>
         <httpclient.version.range>[4.3.1, 5.0.0)</httpclient.version.range>
-        <httpcore.version>4.3.3.wso2v1</httpcore.version>
+        <httpcore.version>4.4.16.wso2v1</httpcore.version>
         <apache.http.client.version>4.5.6</apache.http.client.version>
 
         <!-- Nimbus Jose-->
-        <nimbus.orbit.version>7.3.0.wso2v1</nimbus.orbit.version>
-        <nimbus.orbit.version.range>[7.3, 8)</nimbus.orbit.version.range>
+        <nimbus.orbit.version>7.9.0.wso2v1</nimbus.orbit.version>
+<!--        <nimbus.orbit.version.range>[7.3, 8)</nimbus.orbit.version.range>-->
 
         <commons.pool.wso2.version>1.5.6.wso2v1</commons.pool.wso2.version>
 
         <!--websocket related lib versions-->
-        <tomcat.websocket.version>7.0.85</tomcat.websocket.version>
-        <javax.websocket.version>1.0</javax.websocket.version>
+        <tomcat.websocket.version>9.0.24</tomcat.websocket.version>
+        <javax.websocket.version>1.1</javax.websocket.version>
         <javax.version>2.0.1</javax.version>
 
         <!-- Release plugin ID for github-->
-        <project.scm.id>github-scm</project.scm.id>
+<!--        <project.scm.id>github-scm</project.scm.id>-->
 
         <servlet-api.version>2.5</servlet-api.version>
 
         <hibernate-validator.version>5.0.2.Final</hibernate-validator.version>
-        <javax.xml.parsers.import.pkg.version>[0.0.0,1.0.0)</javax.xml.parsers.import.pkg.version>
+<!--        <javax.xml.parsers.import.pkg.version>[0.0.0,1.0.0)</javax.xml.parsers.import.pkg.version>-->
 
         <!-- MB Features -->
-        <carbon.messaging.version>3.2.34</carbon.messaging.version>
-        <andes.version>3.2.50</andes.version>
-        <jackson-annotations.version>2.9.8.wso2v1</jackson-annotations.version>
-        <carbon.andes.mqtt.version>3.2.34</carbon.andes.mqtt.version>
+<!--        <carbon.messaging.version>3.2.34</carbon.messaging.version>-->
+<!--        <andes.version>3.2.50</andes.version>-->
+<!--        <jackson-annotations.version>2.9.8.wso2v1</jackson-annotations.version>-->
+<!--        <carbon.andes.mqtt.version>3.2.34</carbon.andes.mqtt.version>-->
 
         <!--Feign Version-->
-        <io.github.openfeign.version>9.3.1</io.github.openfeign.version>
-        <javax.ws.rs.jsr311-api.version>[1.1.0, 2.0.0)</javax.ws.rs.jsr311-api.version>
+        <io.github.openfeign.version>11.0</io.github.openfeign.version>
+<!--        <javax.ws.rs.jsr311-api.version>[1.1.0, 2.0.0)</javax.ws.rs.jsr311-api.version>-->
         <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
-        <siddhi.version>3.2.6</siddhi.version>
-        <maven.scr.version>1.7.2</maven.scr.version>
+        <siddhi.version>3.2.9</siddhi.version>
+<!--        <maven.scr.version>1.7.2</maven.scr.version>-->
         <maven.javadoc.skip>true</maven.javadoc.skip>
 
         <!-- jacoco plugin version -->
@@ -1341,11 +1375,11 @@
         <ant.contrib.version>1.0b3</ant.contrib.version>
         <commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.version>
         <javassist.version>3.12.1.GA</javassist.version>
-        <powermock.version>1.7.0</powermock.version>
+        <powermock.version>1.7.4</powermock.version>
 
-        <squareup.okhttp3.version>3.8.1</squareup.okhttp3.version>
+        <squareup.okhttp3.version>4.6.0</squareup.okhttp3.version>
         <okio.version>1.13.0</okio.version>
-        <github.openfeign.version>9.3.1</github.openfeign.version>
+        <github.openfeign.version>11.0</github.openfeign.version>
 
         <cxf-bundle-package.version>2.7.18</cxf-bundle-package.version>
 
@@ -1390,11 +1424,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.1</version>
+                <version>3.8.1</version>
                 <configuration>
                     <encoding>UTF-8</encoding>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -1409,26 +1443,36 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.6.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.4.0</version>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-scr-plugin</artifactId>
-                    <version>1.7.2</version>
-                    <executions>
-                        <execution>
-                            <id>generate-scr-scrdescriptor</id>
-                            <goals>
-                                <goal>scr</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
+<!--                <plugin>-->
+<!--                    <groupId>org.apache.felix</groupId>-->
+<!--                    <artifactId>maven-scr-plugin</artifactId>-->
+<!--                    <version>1.7.2</version>-->
+<!--                    <executions>-->
+<!--                        <execution>-->
+<!--                            <id>generate-scr-scrdescriptor</id>-->
+<!--                            <goals>-->
+<!--                                <goal>scr</goal>-->
+<!--                            </goals>-->
+<!--                        </execution>-->
+<!--                    </executions>-->
+<!--                </plugin>-->
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>5.1.1</version>
                     <extensions>true</extensions>
                     <configuration>
                         <obrRepository>NONE</obrRepository>
@@ -1454,7 +1498,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-2</version>
+                    <version>2.5.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1469,7 +1513,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>