From b51328acedf670243f49059e61a005cb3515b0e5 Mon Sep 17 00:00:00 2001
From: Amalka Subasinghe <amalka.subasinghe>
Date: Thu, 11 May 2023 14:40:05 +0530
Subject: [PATCH] fixed version variables

---
 .../org.wso2.carbon.iot.geo.dashboard/pom.xml |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   | 18 ++--
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  2 +-
 .../pom.xml                                   |  4 +-
 pom.xml                                       | 82 +++++++++----------
 13 files changed, 62 insertions(+), 62 deletions(-)

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 0efa1d39a..5f836c184 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
@@ -55,7 +55,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.5.5</version>
                 <configuration>
-                    <finalName>${project.artifactId}-${carbon.devicemgt.plugins.version}</finalName>
+                    <finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
                         <descriptor>src/assembly/src.xml</descriptor>
diff --git a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
index 558f17567..386490e7d 100644
--- a/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
+++ b/components/extensions/pull-notification-listeners/io.entgra.device.mgt.plugins.mqtt.notification.listener/pom.xml
@@ -79,7 +79,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${carbon.devicemgt.plugins.version}</Bundle-Version>
+                        <Bundle-Version>${io.entgra.device.mgt.plugins.version}</Bundle-Version>
                         <Bundle-Description>MQTT Pull Notification Provider Bundle</Bundle-Description>
                         <Export-Package>
                             !io.entgra.device.mgt.plugins.mqtt.notification.listener.internal,
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 2e5516667..c2286cf2b 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
@@ -107,7 +107,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.5.5</version>
                 <configuration>
-                    <finalName>${project.artifactId}-${carbon.devicemgt.plugins.version}</finalName>
+                    <finalName>${project.artifactId}-${io.entgra.device.mgt.plugins.version}</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
                         <descriptor>src/assembly/src.xml</descriptor>
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 11849a6a7..6b7fb22f2 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
@@ -52,7 +52,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
-                        <Bundle-Version>${carbon.devicemgt.plugins.version}</Bundle-Version>
+                        <Bundle-Version>${io.entgra.device.mgt.plugins.version}</Bundle-Version>
                         <Bundle-Description>Device Management Mobile Android Impl Bundle</Bundle-Description>
                         <Private-Package>io.entgra.device.mgt.plugins.mobile.android.internal</Private-Package>
                         <Import-Package>
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 a207e8990..2027e3e43 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
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>io.entgra.device.mgt.plugins</groupId>
 			<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.api</artifactId>
-			<version>${carbon.devicemgt.plugins.version}</version>
+			<version>${io.entgra.device.mgt.plugins.version}</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
index 910ed20ce..a7eeada6d 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.adapter.feature/pom.xml
@@ -103,7 +103,7 @@
                                 <artifactItem>
                                     <groupId>io.entgra.device.mgt.plugins</groupId>
                                     <artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</artifactId>
-                                    <version>${carbon.devicemgt.plugins.version}</version>
+                                    <version>${io.entgra.device.mgt.plugins.version}</version>
                                     <type>war</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>
@@ -162,31 +162,31 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.http:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.http:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.mqtt:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.mqtt:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.xmpp:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.xmpp:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.extension:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.extension:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.mqtt:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.mqtt:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
 								<bundleDef>
-									io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.thrift:${carbon.devicemgt.plugins.version}
+									io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.thrift:${io.entgra.device.mgt.plugins.version}
 								</bundleDef>
 								<bundleDef>
 									org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.wso2event:${carbon.analytics.common.version}
 								</bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.xmpp:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.input.adapter.xmpp:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.websocket:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.output.adapter.websocket:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
 
                                 <bundleDef>
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
index a10008a8f..ad53dbac8 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.device.feature/pom.xml
@@ -61,7 +61,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.device:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.device:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                             </bundles>
                         </configuration>
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
index 0866ef5a4..00dc9ad54 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
@@ -61,7 +61,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.execution.json:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.extension.siddhi.execution.json:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                             </bundles>
                         </configuration>
diff --git a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
index 3df7b77d4..f70db33f6 100644
--- a/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.notification.listener.feature/pom.xml
@@ -45,7 +45,7 @@
 							</adviceFile>
 							<bundles>
 								<bundleDef>
-									io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mqtt.notification.listener:${carbon.devicemgt.plugins.version}
+									io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mqtt.notification.listener:${io.entgra.device.mgt.plugins.version}
 								</bundleDef>
 							</bundles>
 						</configuration>
diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
index 87086b3cc..fc5fa0e17 100644
--- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
@@ -111,7 +111,7 @@
                             <!--<importFeatures>-->
                                 <!--<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}-->
                                 <!--</importFeatureDef>-->
-                                <!--<importFeatureDef>org.wso2.carbon.device.mgt.server:${carbon.devicemgt.version}-->
+                                <!--<importFeatureDef>org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version}-->
                                 <!--</importFeatureDef>-->
                             <!--</importFeatures>-->
                         </configuration>
diff --git a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
index 47fc8da54..6de41ed31 100644
--- a/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
+++ b/features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
@@ -72,7 +72,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                                 <bundleDef>
                                     io.github.openfeign:feign-core:${io.github.openfeign.version}
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 c77991eed..735fc80ae 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
@@ -242,7 +242,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mobile.android:${carbon.devicemgt.plugins.version}
+                                    io.entgra.device.mgt.plugins:io.entgra.device.mgt.plugins.mobile.android:${io.entgra.device.mgt.plugins.version}
                                 </bundleDef>
                             </bundles>
                             <importFeatures>
@@ -250,7 +250,7 @@
                                     org.wso2.carbon.core.server:${carbon.kernel.version}
                                 </importFeatureDef>
                                 <importFeatureDef>
-                                    org.wso2.carbon.device.mgt.server:${carbon.devicemgt.version}
+                                    org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version}
                                 </importFeatureDef>
                             </importFeatures>
                         </configuration>
diff --git a/pom.xml b/pom.xml
index df5903f12..6c426c576 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,27 +253,27 @@
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.device.mgt.core</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.device.mgt.extensions</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.mockito</groupId>
@@ -285,38 +285,38 @@
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.device.mgt.server.feature</artifactId>
                 <type>zip</type>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.feature</artifactId>
                 <type>zip</type>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.certificate.mgt.core</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.identity.jwt.client.extension</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.apimgt.application.extension</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.core</groupId>
                 <artifactId>io.entgra.device.mgt.core.apimgt.annotations</artifactId>
-                <version>${carbon.devicemgt.version}</version>
+                <version>${io.entgra.device.mgt.core.version}</version>
             </dependency>
 
             <dependency>
@@ -380,117 +380,117 @@
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>health-check-api</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.output.adapter.http</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.output.adapter.mqtt</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.input.adapter.thrift</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.output.adapter.xmpp</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.input.adapter.extension</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.input.adapter.http</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.input.adapter.mqtt</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.input.adapter.xmpp</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.iot.api</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
                 <type>war</type>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
 			<dependency>
 				<groupId>io.entgra.device.mgt.plugins</groupId>
 				<artifactId>io.entgra.device.mgt.plugins.mqtt.notification.listener</artifactId>
-				<version>${carbon.devicemgt.plugins.version}</version>
+				<version>${io.entgra.device.mgt.plugins.version}</version>
 			</dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.remote.session</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
 
             <!--MDM dependencies-->
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.mobile</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.mobile.api</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>org.wso2.carbon.device.mgt.mobile.url.printer</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
 
             <!--Android dependencies-->
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.mobile.android</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.mobile.android.api</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.api</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
 
             <!--Osgi dependencies-->
@@ -1002,12 +1002,12 @@
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <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>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
 
             <!--EMQX Extensions -->
@@ -1015,12 +1015,12 @@
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.emqx.exhook</artifactId>
                 <classifier>jar-with-dependencies</classifier>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.plugins.emqx.initializer</artifactId>
-                <version>${carbon.devicemgt.plugins.version}</version>
+                <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.logging</groupId>
@@ -1166,11 +1166,11 @@
     <properties>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>5.0.26-SNAPSHOT</carbon.devicemgt.version>
-        <carbon.devicemgt.version.range>[5.0.0, 6.0.0)</carbon.devicemgt.version.range>
+        <io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version>
+        <io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range>
 
         <!-- Carbon Device Management Plugins -->
-        <carbon.devicemgt.plugins.version>6.0.17-SNAPSHOT</carbon.devicemgt.plugins.version>
+        <io.entgra.device.mgt.plugins.version>6.0.17-SNAPSHOT</io.entgra.device.mgt.plugins.version>
 
         <!-- Android Agent Artifact Version-->
         <android.agent.version>4.0.0</android.agent.version>