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 @@
maven-assembly-plugin
2.5.5
- ${project.artifactId}-${carbon.devicemgt.plugins.version}
+ ${project.artifactId}-${io.entgra.device.mgt.plugins.version}
false
src/assembly/src.xml
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 @@
${project.artifactId}
${project.artifactId}
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
MQTT Pull Notification Provider Bundle
!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 @@
maven-assembly-plugin
2.5.5
- ${project.artifactId}-${carbon.devicemgt.plugins.version}
+ ${project.artifactId}-${io.entgra.device.mgt.plugins.version}
false
src/assembly/src.xml
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 @@
${project.artifactId}
${project.artifactId}
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
Device Management Mobile Android Impl Bundle
io.entgra.device.mgt.plugins.mobile.android.internal
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 @@
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.virtualfirealarm.api
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
war
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 @@
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
war
true
@@ -162,31 +162,31 @@
- 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}
- 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}
- 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}
- 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}
- 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}
- 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}
org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.wso2event:${carbon.analytics.common.version}
- 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}
- 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}
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 @@
- 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}
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 @@
- 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}
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 @@
- 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}
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 @@
-
+
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 @@
- 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}
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 @@
- 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}
@@ -250,7 +250,7 @@
org.wso2.carbon.core.server:${carbon.kernel.version}
- org.wso2.carbon.device.mgt.server:${carbon.devicemgt.version}
+ org.wso2.carbon.device.mgt.server:${io.entgra.device.mgt.core.version}
diff --git a/pom.xml b/pom.xml
index df5903f12..6c426c576 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,27 +253,27 @@
io.entgra.device.mgt.core
io.entgra.device.mgt.core.device.mgt.core
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.device.mgt.common
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.device.mgt.extensions
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.policy.mgt.common
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.policy.mgt.core
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
org.mockito
@@ -285,38 +285,38 @@
io.entgra.device.mgt.core
io.entgra.device.mgt.core.device.mgt.server.feature
zip
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.device.mgt.extensions.feature
zip
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.certificate.mgt.core
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.identity.jwt.client.extension
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.apimgt.keymgt.extension
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.apimgt.application.extension
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
io.entgra.device.mgt.core
io.entgra.device.mgt.core.apimgt.annotations
- ${carbon.devicemgt.version}
+ ${io.entgra.device.mgt.core.version}
@@ -380,117 +380,117 @@
io.entgra.device.mgt.plugins
health-check-api
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.extension.siddhi.device
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.extension.siddhi.execution.json
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.output.adapter.http
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.output.adapter.mqtt
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.input.adapter.thrift
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.output.adapter.xmpp
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.input.adapter.extension
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.input.adapter.http
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.input.adapter.mqtt
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.input.adapter.xmpp
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
org.wso2.carbon.device.mgt.iot.api
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
war
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.output.adapter.websocket
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.mqtt.notification.listener
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.core.device.mgt.extensions.remote.session
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
org.wso2.carbon.device.mgt.mobile
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
org.wso2.carbon.device.mgt.mobile.api
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
org.wso2.carbon.device.mgt.mobile.url.printer
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.mobile.android
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.mobile.android.api
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.virtualfirealarm.api
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
@@ -1002,12 +1002,12 @@
io.entgra.device.mgt.plugins
org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
org.wso2.carbon.andes.extensions.device.mgt.api
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
@@ -1015,12 +1015,12 @@
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.emqx.exhook
jar-with-dependencies
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
io.entgra.device.mgt.plugins
io.entgra.device.mgt.plugins.emqx.initializer
- ${carbon.devicemgt.plugins.version}
+ ${io.entgra.device.mgt.plugins.version}
org.ops4j.pax.logging
@@ -1166,11 +1166,11 @@
- 5.0.26-SNAPSHOT
- [5.0.0, 6.0.0)
+ 5.0.26-SNAPSHOT
+ [5.0.0, 6.0.0)
- 6.0.17-SNAPSHOT
+ 6.0.17-SNAPSHOT
4.0.0