Bump development version to 7.0.0-SNAPSHOT

2025-09-16 23:42:15 +00:00 · 2024-10-05 19:19:48 +00:00 · 2024-10-05 19:19:48 +00:00 · c99f867830
commit c99f867830
parent 2142082951 1fa93231f8
57 changed files with 186 additions and 265 deletions
--- a/.github/stale.yml
+++ b/.github/stale.yml
@ -1,15 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 10
-# Don't close isssues or pulls
-daysUntilClose: false
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - Resolution/Postponed
-# Label to use when marking an issue as stale
-staleLabel: Resolution/Stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,30 +0,0 @@
-image: charithag/docker-mvn-jdk8:latest
-
-variables:
-  MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
-  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
-
-cache:
-  paths:
-    - .m2/repository/
-    - target/
-
-build:
-  stage: build
-  script:
-    - rm -rf .m2/repository/
-    - mvn $MAVEN_CLI_OPTS clean install -Dmaven.test.skip=true
-
-test:
-  stage: test
-  script:
-    - mvn $MAVEN_CLI_OPTS test
-
-deploy:
-  stage: deploy
-  script:
-    - mvn $MAVEN_CLI_OPTS deploy -Dmaven.test.skip=true
-    - rm -rf .m2/repository/*
-  only:
-    - master@entgra/carbon-device-mgt-plugins
-    - kernel-4.6.x@entgra/carbon-device-mgt-plugins
--- a/.travis.yml
+++ b/.travis.yml
@ -1,8 +0,0 @@
-language: java
-jdk:
-    - oraclejdk8
-cache:
-  directories:
-  - .autoconf
-  - $HOME/.m2
-script: mvn clean install
--- 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
@ -27,7 +27,7 @@

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.iot.geo.dashboard</artifactId>
-    <name>WSO2 Carbon - IoT Geo Dashboard C-APP</name>
+    <name>Entgra Device Management Plugins - IoT Geo Dashboard C-APP</name>
    <url>http://entgra.io</url>
    <description>This feature contains the IoT geo dashboard gadget</description>
    <packaging>pom</packaging>
--- a/components/analytics/iot-analytics/pom.xml
+++ b/components/analytics/iot-analytics/pom.xml
@ -29,7 +29,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>iot-analytics</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - IoT Analytics Scripts</name>
+    <name>Entgra Device Management Plugins - IoT Analytics Scripts</name>
    <url>http://entgra.io</url>

    <modules>
--- a/components/analytics/pom.xml
+++ b/components/analytics/pom.xml
@ -21,7 +21,7 @@

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
+        <artifactId>device-mgt-plugins</artifactId>
        <version>6.0.13-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
@ -29,7 +29,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>analytics</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Mobile Plugins Extensions</name>
+    <name>Entgra Device Management Plugins - Mobile Plugins Extensions</name>
    <url>http://entgra.io</url>

    <modules>
--- a/components/device-types/pom.xml
+++ b/components/device-types/pom.xml
@ -21,15 +21,15 @@

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <artifactId>device-mgt-plugins</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>device-types</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - IoT Plugins</name>
+    <name>Entgra Device Management Plugins - IoT Plugins</name>
    <url>http://entgra.io</url>

    <modules>
--- 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
@ -23,13 +23,13 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

 	<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl</artifactId>
-	<name>WSO2 Carbon - IoT Server VirtualFireAlarm Agent</name>
-	<description>WSO2 Carbon - VirtualFireAlarm Device Agent Implementation</description>
+	<name>Entgra Device Management Plugins - IoT Server VirtualFireAlarm Agent</name>
+	<description>Entgra Device Management Plugins - VirtualFireAlarm Device Agent Implementation</description>
 	<url>http://entgra.io</url>

 	<build>
--- 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
@ -21,15 +21,15 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.api</artifactId>
 	<packaging>war</packaging>
-	<name>WSO2 Carbon - IoT Server VirtualFireAlarm API</name>
-	<description>WSO2 Carbon - Virtual FireAlarm Service Management API Implementation</description>
+	<name>Entgra Device Management Plugins - IoT Server VirtualFireAlarm API</name>
+	<description>Entgra Device Management Plugins - Virtual FireAlarm Service Management API Implementation</description>
 	<url>http://entgra.io</url>


--- a/components/device-types/virtual-fire-alarm-plugin/pom.xml
+++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>device-types</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>virtual-fire-alarm-plugin</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Virtual Fire Alarm Plugin</name>
+    <name>Entgra Device Management Plugins - Virtual Fire Alarm Plugin</name>
    <url>http://entgra.io</url>

    <modules>
--- 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
@ -20,14 +20,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>io.entgra.device.mgt.plugins.input.adapter.extension</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Mgt Input Adaptor Extensions Module</name>
+    <name>Entgra Device Management Plugins - Device Mgt Input Adaptor Extensions Module</name>
    <description>Provides the back-end functionality of Input adaptor</description>
    <url>http://entgra.io</url>

--- 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
@ -20,14 +20,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.input.adapter.http</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Mgt Input Adaptor Module - Http</name>
+    <name>Entgra Device Management Plugins - Device Mgt Input Adaptor Module - Http</name>
    <description>Provides the back-end functionality of Input adaptor</description>
    <url>http://entgra.io</url>

@ -143,7 +143,7 @@
                            feign.codec;version="[11.0,12)",
                            feign.gson;version="[11.0,12)",
                            feign.slf4j;version="[11.0,12)",
-                            io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
+                            io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
                            io.entgra.device.mgt.plugins.input.adapter.http.oauth.exception,
                            io.entgra.device.mgt.plugins.input.adapter.http.util,
                            javax.net.ssl,
--- 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
@ -20,14 +20,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>io.entgra.device.mgt.plugins.input.adapter.mqtt</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Mgt Input Adaptor Module - MQTT</name>
+    <name>Entgra Device Management Plugins - Device Mgt Input Adaptor Module - MQTT</name>
    <description>Provides the back-end functionality of Input adaptor</description>
    <url>http://entgra.io</url>

@ -127,12 +127,12 @@
                            io.entgra.device.mgt.plugins.input.adapter.mqtt.*
                        </Export-Package>
                        <Import-Package>
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)",
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
-                            io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
                            io.entgra.device.mgt.plugins.input.adapter.mqtt,
                            io.entgra.device.mgt.plugins.input.adapter.mqtt.util,
                            javax.net.ssl,
--- 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
@ -21,14 +21,14 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>cdmf-transport-adapters</artifactId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>

 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>io.entgra.device.mgt.plugins.input.adapter.thrift</artifactId>
 	<packaging>bundle</packaging>
-	<name>WSO2 Carbon - Event Input Thrift Adapter Module</name>
+	<name>Entgra Device Management Plugins - Event Input Thrift Adapter Module</name>
 	<description>org.wso2.carbon.event.input.adapter.thrift provides the back-end
 		functionality of input wso2event adapter
 	</description>
--- 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
@ -20,14 +20,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>io.entgra.device.mgt.plugins.input.adapter.xmpp</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Mgt Input Adaptor Module - XMPP</name>
+    <name>Entgra Device Management Plugins - Device Mgt Input Adaptor Module - XMPP</name>
    <description>Provides the back-end functionality of Input adaptor</description>
    <url>http://entgra.io</url>

@ -103,7 +103,7 @@
                        <Bundle-Name>${project.artifactId}</Bundle-Name>
                        <Private-Package>
                            io.entgra.device.mgt.plugins.input.adapter.xmpp.internal,
-                            io.entgra.device.mgt.plugins.input.adapter.http.internal.*
+                            io.entgra.device.mgt.plugins.input.adapter.xmpp.internal.*
                        </Private-Package>
                        <Export-Package>
                            !io.entgra.device.mgt.plugins.input.adapter.xmpp.internal,
@ -111,8 +111,7 @@
                            io.entgra.device.mgt.plugins.input.adapter.xmpp.*
                        </Export-Package>
                        <Import-Package>
-                            io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
-                            io.entgra.device.mgt.plugins.input.adapter.xmpp,
+                            io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
                            org.apache.commons.logging;version="[1.2,2)",
                            org.jivesoftware.smack,
                            org.jivesoftware.smack.filter,
--- 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
@ -20,14 +20,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.output.adapter.http</artifactId>

    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Management Output HTTP adapter Module</name>
+    <name>Entgra Device Management Plugins - Device Management Output HTTP adapter Module</name>
    <description>
        io.entgra.device.mgt.plugins.output.adapter.http provides the back-end functionality of oauth http event adapter
    </description>
@ -103,10 +103,10 @@
                            io.entgra.device.mgt.plugins.output.adapter.http.*
                        </Export-Package>
                        <Import-Package>
-                            io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
                            io.entgra.device.mgt.plugins.output.adapter.http.util,
                            javax.net.ssl,
                            org.apache.commons.httpclient;version="[3.1,4)",
--- 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
@ -20,14 +20,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.output.adapter.mqtt</artifactId>

    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Mgt Output MQTT Adaptor Module</name>
+    <name>Entgra Device Management Plugins - Device Mgt Output MQTT Adaptor Module</name>
    <description>io.entgra.device.mgt.plugins.output.adapter.mqtt provides the back-end functionality of mqtt adaptor
    </description>
    <url>http://entgra.io</url>
@ -116,11 +116,11 @@
                            io.entgra.device.mgt.plugins.output.adapter.mqtt.*,
                        </Export-Package>
                        <Import-Package>
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)",
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
                            io.entgra.device.mgt.plugins.output.adapter.mqtt,
                            io.entgra.device.mgt.plugins.output.adapter.mqtt.util,
                            javax.net.ssl,
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint</artifactId>
    <packaging>war</packaging>
-    <name>WSO2 - Webapp for UI Output Event Adapter</name>
+    <name>Entgra Device Management Plugins - Webapp for UI Output Event Adapter</name>
    <url>http://entgra.io</url>

    <dependencies>
--- 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
@ -21,14 +21,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Event Output UI Adapter Module</name>
+    <name>Entgra Device Management Plugins - Event Output UI Adapter Module</name>
    <description>org.wso2.carbon.event.output.adapter.ui provides the back-end functionality of
        ui event adapter
    </description>
--- 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
@ -20,7 +20,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@ -28,7 +28,7 @@
    <artifactId>io.entgra.device.mgt.plugins.output.adapter.xmpp</artifactId>

    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Device Mgt Output XMPP Adaptor Module</name>
+    <name>Entgra Device Management Plugins - Device Mgt Output XMPP Adaptor Module</name>
    <description>io.entgra.device.mgt.plugins.output.adapter.xmpp provides the back-end functionality of xmpp adaptor
    </description>
    <url>http://entgra.io</url>
--- a/components/extensions/cdmf-transport-adapters/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>extensions</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>cdmf-transport-adapters</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - IoT Base Plugin</name>
+    <name>Entgra Device Management Plugins - IoT Base Plugin</name>
    <url>http://entgra.io</url>

    <modules>
--- 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
@ -21,14 +21,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>emqx-extensions</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.emqx.exhook</artifactId>
    <packaging>jar</packaging>
-    <name>EMQX Extensions - Extension Hook</name>
+    <name>Entgra Device Management Plugins - EMQX Extension Hook</name>


    <dependencies>
--- 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
@ -21,14 +21,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>emqx-extensions</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.emqx.initializer</artifactId>
    <packaging>bundle</packaging>
-    <name>EMQX Extensions - Extension Hook Initializer</name>
+    <name>Entgra Device Management Plugins - EMQX Extension Hook Initializer</name>

    <dependencies>
        <dependency>
--- a/components/extensions/emqx-extensions/pom.xml
+++ b/components/extensions/emqx-extensions/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>extensions</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>emqx-extensions</artifactId>
    <packaging>pom</packaging>
-    <name>EMQX Extensions</name>
+    <name>Entgra Device Management Plugins - EMQX Extensions</name>

    <modules>
       <module>io.entgra.device.mgt.plugins.emqx.exhook</module>
--- 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
@ -29,8 +29,8 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.andes.extensions.device.mgt.api</artifactId>
    <packaging>war</packaging>
-    <name>WSO2 Carbon - MQTT Topics Management API</name>
-    <description>WSO2 Carbon - MQTT Topics Management API</description>
+    <name>Entgra Device Management Plugins - MQTT Topics Management API</name>
+    <description>Entgra Device Management Plugins - MQTT Topics Management API</description>
    <url>http://entgra.io</url>

    <build>
--- a/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
+++ b/components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
@ -29,7 +29,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Component - MQTT - Authorization Manager</name>
+    <name>Entgra Device Management Plugins - Component - MQTT - Authorization Manager</name>
    <description>MQTT authorization manager based on Carbon device manager</description>
    <url>http://entgra.io</url>

--- a/components/extensions/mb-extensions/pom.xml
+++ b/components/extensions/mb-extensions/pom.xml
@ -29,7 +29,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>mb-extensions</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - MB Extension</name>
+    <name>Entgra Device Management Plugins - MB Extension</name>
    <url>http://entgra.io</url>

    <modules>
--- a/components/extensions/pom.xml
+++ b/components/extensions/pom.xml
@ -21,15 +21,15 @@

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <artifactId>device-mgt-plugins</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>extensions</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Mobile Plugins Extensions</name>
+    <name>Entgra Device Management Plugins - Mobile Plugins Extensions</name>
    <url>http://entgra.io</url>

    <modules>
--- 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
@ -22,7 +22,7 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>pull-notification-listeners</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

@ -30,8 +30,8 @@
 	<modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.mqtt.notification.listener</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - MQTT Pull Notification Listener Implementation</name>
-    <description>WSO2 Carbon - MQTT Pull Notification Lister Implementation</description>
+    <name>Entgra Device Management Plugins - MQTT Pull Notification Listener Implementation</name>
+    <description>Entgra Device Management Plugins - MQTT Pull Notification Lister Implementation</description>
    <url>http://entgra.io</url>

    <dependencies>
@ -88,14 +88,14 @@
                        </Export-Package>
                        <Import-Package>
                            com.google.gson;version="[2.9,3)",
-                            io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.config;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.config.pull.notification;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)",
-                            io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
+                            io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.core.config;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.core.config.pull.notification;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
                            org.apache.commons.logging;version="[1.2,2)",
                            org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
                            org.osgi.service.*;version="${imp.package.version.osgi.service}",
--- a/components/extensions/pull-notification-listeners/pom.xml
+++ b/components/extensions/pull-notification-listeners/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>extensions</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>pull-notification-listeners</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Pull Notification Extension</name>
+    <name>Entgra Device Management Plugins - Pull Notification Extension</name>
    <url>http://entgra.io</url>

    <modules>
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml
@ -17,19 +17,20 @@
  ~ under the License.
  -->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>siddhi-extensions</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Siddhi Execution Extension - Device management Core functionality as Siddhi extension</name>
+    <name>Entgra Device Management Plugins - Siddhi Extensions - Device management Core</name>
    <url>http://entgra.io</url>

    <dependencies>
@ -168,26 +169,21 @@
                            io.entgra.device.mgt.plugins.extension.siddhi.device.*
                        </Export-Package>
                        <Import-Package>
-<!--                            android.net.http,-->
-<!--                            android.net.ssl,-->
-<!--                            android.os,-->
-<!--                            android.security,-->
-<!--                            android.util,-->
                            feign;version="[11.0,12)",
                            feign.auth;version="[11.0,12)",
                            feign.codec;version="[11.0,12)",
                            feign.gson;version="[11.0,12)",
                            feign.slf4j;version="[11.0,12)",
-                            io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.group.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.notification.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
+                            io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.group.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.notification.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.dto;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.exception;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
                            io.entgra.device.mgt.plugins.extension.siddhi.device.client.configs,
                            io.entgra.device.mgt.plugins.extension.siddhi.device.client.dto,
                            io.entgra.device.mgt.plugins.extension.siddhi.device.client.exception,
@ -198,29 +194,9 @@
                            javax.security.auth.x500,javax.xml.bind;version="[0.0,1)",
                            javax.xml.bind.annotation;version="[0.0,1)",
                            javax.xml.parsers,
-<!--                            kotlin;resolution:=optional,-->
-<!--                            kotlin.*;resolution:=optional,-->
-<!--                            kotlin,-->
-<!--                            kotlin.annotation,-->
-<!--                            kotlin.collections,-->
-<!--                            kotlin.comparisons,-->
-<!--                            kotlin.io,-->
-<!--                            kotlin.jvm,-->
-<!--                            kotlin.jvm.functions,-->
-<!--                            kotlin.jvm.internal,-->
-<!--                            kotlin.jvm.internal.markers,-->
-<!--                            kotlin.ranges,-->
-<!--                            kotlin.reflect,-->
-<!--                            kotlin.sequences,-->
-<!--                            kotlin.text,-->
                            org.apache.commons.lang;version="[2.6,3)",
                            org.apache.commons.logging;version="[1.2,2)",
-<!--                            org.bouncycastle.jsse;version="[1.70,2)",-->
-<!--                            org.bouncycastle.jsse.provider;version="[1.70,2)",-->
-<!--                            org.conscrypt,-->
                            org.json;version="[3.0,4)",
-<!--                            org.openjsse.javax.net.ssl,-->
-<!--                            org.openjsse.net.ssl,-->
                            org.w3c.dom,
                            org.wso2.carbon.base;version="[1.0,2)",
                            org.wso2.carbon.context;version="[4.8,5)",
--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.execution.json/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>siddhi-extensions</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Siddhi Execution Extension - Json</name>
+    <name>Entgra Device Management Plugins - Siddhi Extensions - Json</name>
    <url>http://entgra.io</url>

    <dependencies>
--- a/components/extensions/siddhi-extensions/pom.xml
+++ b/components/extensions/siddhi-extensions/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>extensions</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>siddhi-extensions</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Siddhi Extension</name>
+    <name>Entgra Device Management Plugins - Siddhi Extension</name>
    <url>http://entgra.io</url>

    <modules>
--- 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
@ -21,13 +21,13 @@
    <parent>
        <artifactId>android-plugin</artifactId>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.mobile.android.api</artifactId>
-    <name>WSO2 Carbon - Android JAX-RS API</name>
+    <name>Entgra Device Management Plugins - Android JAX-RS API</name>
    <description>Android JAX-RS API</description>
    <packaging>war</packaging>

--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.emulator/pom.xml
@ -21,14 +21,14 @@
    <parent>
        <artifactId>android-plugin</artifactId>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.mobile.android.emulator</artifactId>
-    <name>AndroidTryIt Emulator</name>
-    <description>Android Virtual Device</description>
+    <name>Entgra Device Management Plugins - AndroidTryIt Emulator</name>
+    <description>Entgra Device Management Plugins - Android Virtual Device</description>

    <build>
        <finalName>EmulatorJava</finalName>
--- 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
@ -23,13 +23,13 @@
    <parent>
        <artifactId>android-plugin</artifactId>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.mobile.android.ui</artifactId>
-    <name>WSO2 Carbon - Mobile Android UI</name>
+    <name>Entgra Device Management Plugins - Mobile Android UI</name>
    <packaging>pom</packaging>

    <dependencies>
--- 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
@ -22,15 +22,15 @@
    <parent>
        <artifactId>android-plugin</artifactId>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.mobile.android</artifactId>
    <packaging>bundle</packaging>
-    <name>WSO2 Carbon - Mobile Device Management Android Impl</name>
-    <description>WSO2 Carbon - Mobile Device Management Android Implementation</description>
+    <name>Entgra Device Management Plugins - Mobile Device Management Android Impl</name>
+    <description>Entgra Device Management Plugins - Mobile Device Management Android Implementation</description>
    <url>http://entgra.io</url>

    <build>
@ -56,21 +56,21 @@
                        <Private-Package>io.entgra.device.mgt.plugins.mobile.android.internal</Private-Package>
                        <Import-Package>
                            com.google.gson;version="[2.9,3)",
-                            io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.app.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.configuration.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.exceptions;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.general;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.invitation.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.license.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.policy.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.push.notification;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.spi;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.common.type.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry;version="[5.0,6)",
+                            io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.app.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.configuration.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.exceptions;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.general;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.invitation.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.license.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.operation.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.policy.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.policy.mgt.monitor;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.pull.notification;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.push.notification;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.spi;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common.type.mgt;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry;version="${io.entgra.device.mgt.core.version.range}",
                            io.entgra.device.mgt.plugins.mobile.android.impl.config.datasource,
                            io.entgra.device.mgt.plugins.mobile.android.impl.dao,
                            io.entgra.device.mgt.plugins.mobile.android.impl.dao.impl,
--- a/components/mobile-plugins/android-plugin/pom.xml
+++ b/components/mobile-plugins/android-plugin/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>mobile-plugins</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>android-plugin</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Mobile Plugins</name>
+    <name>Entgra Device Management Plugins - Mobile Plugins</name>
    <url>http://entgra.io</url>

    <modules>
--- a/components/mobile-plugins/pom.xml
+++ b/components/mobile-plugins/pom.xml
@ -21,15 +21,15 @@

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <artifactId>device-mgt-plugins</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>mobile-plugins</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Mobile Plugins</name>
+    <name>Entgra Device Management Plugins - Mobile Plugins</name>
    <url>http://entgra.io</url>

    <modules>
--- a/components/test-coverage/pom.xml
+++ b/components/test-coverage/pom.xml
@ -20,7 +20,7 @@

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
+        <artifactId>device-mgt-plugins</artifactId>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <version>6.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
@ -28,7 +28,7 @@
    <modelVersion>4.0.0</modelVersion>

    <artifactId>test-coverage</artifactId>
-    <name>WSO2 Carbon - Carbon Device Management Plugins Test Coverage Component</name>
+    <name>Entgra Device Management Plugins - Carbon Device Management Plugins Test Coverage Component</name>

    <properties>
        <target>target</target>
--- a/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
+++ b/features/analytics-feature/io.entgra.device.mgt.plugins.analytics.feature/pom.xml
@ -23,14 +23,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>analytics-feature</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.analytics.feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - IoT Server Analytics Feature</name>
+    <name>Entgra Device Management Plugins - IoT Server Analytics Feature</name>
    <url>http://entgra.io</url>
    <description>This feature contains the Analytics Script for the IoT Server</description>

--- a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
+++ b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
@ -30,7 +30,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.iot.geo.dashboard.feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - IoT Geo Dashboard Feature</name>
+    <name>Entgra Device Management Plugins - IoT Geo Dashboard Feature</name>
    <url>http://entgra.io</url>
    <description>This feature contains the IoT geo dashboard gadget</description>

--- a/features/analytics-feature/pom.xml
+++ b/features/analytics-feature/pom.xml
@ -21,15 +21,15 @@

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <artifactId>device-mgt-plugins</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>analytics-feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - IoT Server IoT Analytics Feature</name>
+    <name>Entgra Device Management Plugins - IoT Server IoT Analytics Feature</name>
    <url>http://entgra.io</url>

    <modules>
--- a/features/device-types-feature/pom.xml
+++ b/features/device-types-feature/pom.xml
@ -21,15 +21,15 @@

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <artifactId>device-mgt-plugins</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>device-types-feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
+    <name>Entgra Device Management Plugins - Device Management IoT Plugins Feature</name>
    <url>http://entgra.io</url>

    <modules>
--- 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
@ -23,14 +23,14 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.backend.feature</artifactId>
 	<packaging>pom</packaging>
-	<name>WSO2 Carbon - IoT Server VirtualFireAlarm Backend Feature</name>
+	<name>Entgra Device Management Plugins - IoT Server VirtualFireAlarm Backend Feature</name>
 	<url>http://entgra.io</url>
 	<description>This feature contains the VirtualFireAlarm Device type specific backend implementations for the IoT Server
 	</description>
--- a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
+++ b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>device-types-feature</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>virtual-fire-alarm-plugin-feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - IoT Server VirtualFireAlarm Device Feature</name>
+    <name>Entgra Device Management Plugins - IoT Server VirtualFireAlarm Device Feature</name>
    <url>http://entgra.io</url>

    <modules>
--- 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
@ -23,14 +23,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>extensions-feature</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.adapter.feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management Adapters Feature</name>
+    <name>Entgra Device Management Plugins - Device Management Adapters Feature</name>
    <url>http://entgra.io</url>
    <description>This feature contains the adapter bundles required for IoT Server</description>

--- 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
@ -22,13 +22,13 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>extensions-feature</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device.feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Siddhi Execution Extension - Device Group Feature</name>
+    <name>Entgra Device Management Plugins - Siddhi Extensions - Device Group Feature</name>
    <url>http://entgra.io</url>
    <description>This feature contains Siddhi extension feature for device groups</description>

--- 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
@ -22,13 +22,13 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>extensions-feature</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Siddhi Execution Extension - Json Feature</name>
+    <name>Entgra Device Management Plugins - Siddhi Extensions - Json Feature</name>
    <url>http://entgra.io</url>
    <description>This feature contains Siddhi extension feature for changing a json string to individual properties.</description>

--- 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
@ -21,14 +21,14 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>extensions-feature</artifactId>
-		<version>6.1.1-SNAPSHOT</version>
+		<version>7.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>

 	<artifactId>io.entgra.device.mgt.plugins.notification.listener.feature</artifactId>
 	<packaging>pom</packaging>
-	<name>WSO2 Carbon - Notification Listener</name>
+	<name>Entgra Device Management Plugins - Notification Listener</name>
 	<url>http://entgra.io</url>
 	<description>This feature contains the core bundles required iot core listeners</description>

--- 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
@ -30,7 +30,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.andes.extensions.device.mgt.api.feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - MQTT Topics Management API Feature</name>
+    <name>Entgra Device Management Plugins - MQTT Topics Management API Feature</name>
    <url>http://entgra.io</url>
    <description>This feature contains the API feature for the MQTT dashboard</description>

--- 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
@ -30,7 +30,7 @@
    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - MQTT Authorization Feature</name>
+    <name>Entgra Device Management Plugins - MQTT Authorization Feature</name>
    <url>http://entgra.io</url>
    <description>This feature contains the bundles required for mqtt authorization</description>

--- a/features/extensions-feature/pom.xml
+++ b/features/extensions-feature/pom.xml
@ -21,15 +21,15 @@

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <artifactId>device-mgt-plugins</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>extensions-feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management Extensions</name>
+    <name>Entgra Device Management Plugins - Device Management Extensions</name>
    <url>http://entgra.io</url>

    <modules>
--- 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
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>android-plugin-feature</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>io.entgra.device.mgt.plugins.mobile.android.feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Android Device Management Feature</name>
+    <name>Entgra Device Management Plugins - Android Device Management Feature</name>
    <url>http://entgra.io</url>
    <description>This feature contains the core bundles required for Android Device Management
        functionality
--- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>mobile-plugins-feature</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>android-plugin-feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management Android Plugin Feature</name>
+    <name>Entgra Device Management Plugins - Device Management Android Plugin Feature</name>
    <url>http://entgra.io</url>

    <modules>
--- a/features/mobile-plugins-feature/pom.xml
+++ b/features/mobile-plugins-feature/pom.xml
@ -21,15 +21,15 @@

    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.1.1-SNAPSHOT</version>
+        <artifactId>device-mgt-plugins</artifactId>
+        <version>7.0.0-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>mobile-plugins-feature</artifactId>
    <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Management EMM Plugins Feature</name>
+    <name>Entgra Device Management Plugins - Device Management EMM Plugins Feature</name>
    <url>http://entgra.io</url>

    <modules>
--- a/pom.xml
+++ b/pom.xml
@ -17,16 +17,17 @@
  ~ under the License.
  -->

-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

    <modelVersion>4.0.0</modelVersion>
    <groupId>io.entgra.device.mgt.plugins</groupId>
-    <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
+    <artifactId>device-mgt-plugins</artifactId>
    <packaging>pom</packaging>
-    <version>6.1.1-SNAPSHOT</version>
-    <name>WSO2 Carbon - Device Management Plugins Parent</name>
+    <version>7.0.0-SNAPSHOT</version>
+    <name>Entgra Device Management Plugins - Parent</name>
    <url>http://entgra.io</url>
-    <description>WSO2 Carbon - Device Management Plugins Parent</description>
+    <description>Entgra Device Management Plugins - Parent</description>

    <parent>
        <groupId>org.wso2</groupId>
@ -964,19 +965,16 @@
    <properties>

        <!-- Carbon Device Management -->
-        <io.entgra.device.mgt.core.version>5.2.4-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>
+        <io.entgra.device.mgt.core.version>6.0.0-SNAPSHOT</io.entgra.device.mgt.core.version>
+        <io.entgra.device.mgt.core.version.range>[6.0.0, 7.0.0)</io.entgra.device.mgt.core.version.range>

        <!-- Carbon Device Management Plugins -->
-        <io.entgra.device.mgt.plugins.version>6.1.1-SNAPSHOT</io.entgra.device.mgt.plugins.version>
+        <io.entgra.device.mgt.plugins.version>7.0.0-SNAPSHOT</io.entgra.device.mgt.plugins.version>
+        <io.entgra.device.mgt.plugins.version.range>[7.0.0, 8.0.0)</io.entgra.device.mgt.plugins.version.range>

        <!-- Android Agent Artifact Version-->
        <android.agent.version>4.0.0</android.agent.version>

-        <!-- Java Version Compatibility -->
-        <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.8.1</carbon.kernel.version>
        <pax.logging.api.version>1.11.2</pax.logging.api.version>
@ -1102,7 +1100,8 @@

    <scm>
        <url>https://repository.entgra.net/community/device-mgt-plugins.git</url>
-        <developerConnection>scm:git:https://repository.entgra.net/community/device-mgt-plugins.git</developerConnection>
+        <developerConnection>scm:git:https://repository.entgra.net/community/device-mgt-plugins.git
+        </developerConnection>
        <connection>scm:git:https://repository.entgra.net/community/device-mgt-plugins.git</connection>
        <tag>v6.0.14</tag>
    </scm>