.github/stale.yml

@@ -0,0 +1,15 @@
+# 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

.gitlab-ci.yml

@@ -0,0 +1,30 @@
+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

.travis.yml

@@ -0,0 +1,8 @@
+language: java
+jdk:
+    - oraclejdk8
+cache:
+  directories:
+  - .autoconf
+  - $HOME/.m2
+script: mvn clean install

Jenkinsfile

@@ -1,127 +0,0 @@
-pipeline {
-    agent {
-        label 'node-agent'
-    }
-    environment {
-        def isPendingUpstreamDependenciesExists = false
-        def triggeredViaPush = false
-        JAVA_HOME = '/usr/lib/jvm/java-11-openjdk'
-        PATH = "${JAVA_HOME}/bin:${env.PATH}" 
-    }
-    stages {
-        stage('Initialize Variables') {
-            steps {
-                script {
-                    // Define swaggerEndPoint as a global variable
-                    swaggerEndPoint = {
-                        def matcher = (env.CHANGE_URL =~ /^(?<host>https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b)(?<path>[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$/)
-                        matcher.find()
-                        return matcher.group('host') + '/api/v1/repos' + matcher.group('path')
-                    }
-
-                    echo "Swagger Endpoint: ${swaggerEndPoint.call()}"
-                }
-            }
-        }
-
-        stage('Tool Versioning') {
-            steps {
-                script {
-                    sh 'java -version'
-                    sh 'node --version'
-                    sh 'npm --version'
-                    sh 'jq --version'
-                }
-            }
-        }
-
-        stage('Check Environment Variables') {
-            steps {
-                script {
-                    echo "CHANGE_ID: ${env.CHANGE_ID}"
-                    echo "CHANGE_URL: ${env.CHANGE_URL}"
-                    echo "CHANGE_AUTHOR: ${env.CHANGE_AUTHOR}"
-                    echo "CHANGE_BRANCH: ${env.CHANGE_BRANCH}"
-                    echo "JAVA_HOME: ${JAVA_HOME}"
-        	    echo "PATH: ${PATH}"
-                }
-            }
-        }
-
-        stage('Fetch Pending Upstream Dependencies') {
-            steps {
-                script {
-                    if (env.CHANGE_ID) {
-                        def url = swaggerEndPoint.call()
-                        echo "Fetching from URL: ${url}"
-                        withCredentials([usernamePassword(credentialsId: 'entgra-gitea-credentials', passwordVariable: 'password', usernameVariable: 'username')]) {
-                            def response = sh(script: """curl -X GET "${url}" -H 'accept: application/json' -u \$username:\$password""", returnStdout: true).trim()
-                            echo "API Response: ${response}"
-                            isPendingUpstreamDependenciesExists = sh(script: "echo '${response}' | jq 'contains({\"labels\": [{ \"name\": \"pending upstream\"}]})'", returnStdout: true).trim().toBoolean()
-                        }
-                    } else {
-                        echo '[Jenkinsfile] Triggered via a push request.'
-                        echo '[Jenkinsfile] Skipping dependency checking.'
-                        triggeredViaPush = true
-                    }
-                }
-            }
-        }
-
-        stage('Execute Test Suites') {
-            steps {
-                script {
-                    if (!isPendingUpstreamDependenciesExists) {
-                        echo '[Jenkinsfile] Pending upstream dependencies do not exist.'
-                        echo '[Jenkinsfile] Entering testing phase.'
-                        try {
-                            checkout scm
-                            withCredentials([usernamePassword(credentialsId: 'builder2-deployer-nexus', passwordVariable: 'password', usernameVariable: 'username')]) {
-                                sh """/opt/scripts/run-test.sh -u \$username -p \$password"""
-                            }
-                            currentBuild.result = 'SUCCESS'
-                            message = 'Tests approved'
-                        } catch (error) {
-                            currentBuild.result = 'FAILURE'
-                            message = 'Tests cannot be approved'
-                        }
-                    } else {
-                        echo '[Jenkinsfile] Pending upstream dependencies exist.'
-                        echo '[Jenkinsfile] Entering waiting phase.'
-                        currentBuild.result = 'NOT_BUILT'
-                        message = 'PR waiting due to pending upstream dependencies'
-                    }
-                }
-            }
-        }
-        
-        stage('Report Job Status') {
-            steps {
-                script {
-                    if (true) {
-                        withCredentials([usernamePassword(credentialsId: 'entgra-gitea-credentials', passwordVariable: 'password', usernameVariable: 'username')]) {
-                            def url = swaggerEndPoint.call() + '/reviews'
-                            echo "[Jenkinsfile] Notifying pull request build status to ${url}"
-                            def response = sh(script: """curl -X POST "${url}" -H 'accept: application/json' -H 'Content-Type: application/json' -u \$username:\$password -d '{ "body": "${message}" }'""", returnStdout: true).trim()
-                            echo "API Response: ${response}"
-                        }
-                    }
-
-                    def committerEmail = sh(
-                        script: 'git --no-pager show -s --format=\'%ae\'',
-                        returnStdout: true
-                    ).trim()
-
-                    if (currentBuild.result == 'FAILURE') {
-                        emailext(
-                            subject: "${currentBuild.result}: Job ${env.JOB_NAME} [${env.BUILD_NUMBER}]",
-                            body: 'Hi, Please find below.\n<pre>${BUILD_LOG_REGEX, regex="BUILD FAILURE", linesAfter=30, showTruncatedLines=false, escapeHtml=true}</pre>' + "Find more at : ${env.BUILD_URL}",
-                            to: triggeredViaPush ? '$DEFAULT_RECIPIENTS' : committerEmail
-                        )
-                    }
-                }
-            }
-        }
-    }
-}
-

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>Entgra Device Management Plugins - IoT Geo Dashboard C-APP</name>
+    <name>WSO2 Carbon - IoT Geo Dashboard C-APP</name>
     <url>http://entgra.io</url>
     <description>This feature contains the IoT geo dashboard gadget</description>
     <packaging>pom</packaging>

components/analytics/iot-analytics/pom.xml

@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-analytics</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - IoT Analytics Scripts</name>
+    <name>WSO2 Carbon - IoT Analytics Scripts</name>
     <url>http://entgra.io</url>
 
     <modules>

components/analytics/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</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>Entgra Device Management Plugins - Mobile Plugins Extensions</name>
+    <name>WSO2 Carbon - Mobile Plugins Extensions</name>
     <url>http://entgra.io</url>
 
     <modules>

components/device-types/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>device-types</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - IoT Plugins</name>
+    <name>WSO2 Carbon - IoT Plugins</name>
     <url>http://entgra.io</url>
 
     <modules>

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>7.0.0-SNAPSHOT</version>
+		<version>6.1.1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl</artifactId>
-	<name>Entgra Device Management Plugins - IoT Server VirtualFireAlarm Agent</name>
+	<name>WSO2 Carbon - IoT Server VirtualFireAlarm Agent</name>
-	<description>Entgra Device Management Plugins - VirtualFireAlarm Device Agent Implementation</description>
+	<description>WSO2 Carbon - VirtualFireAlarm Device Agent Implementation</description>
 	<url>http://entgra.io</url>
 
 	<build>

components/device-types/virtual-fire-alarm-plugin/io.entgra.device.mgt.plugins.virtualfirealarm.agent.impl/src/main/ui/nbproject/project.properties

@@ -53,8 +53,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=11
+javac.source=1.8
-javac.target=11
+javac.target=1.8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}

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>7.0.0-SNAPSHOT</version>
+		<version>6.1.1-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>Entgra Device Management Plugins - IoT Server VirtualFireAlarm API</name>
+	<name>WSO2 Carbon - IoT Server VirtualFireAlarm API</name>
-	<description>Entgra Device Management Plugins - Virtual FireAlarm Service Management API Implementation</description>
+	<description>WSO2 Carbon - Virtual FireAlarm Service Management API Implementation</description>
 	<url>http://entgra.io</url>
 
 
@@ -293,6 +293,10 @@
     </dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>virtual-fire-alarm-plugin</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Virtual Fire Alarm Plugin</name>
+    <name>WSO2 Carbon - Virtual Fire Alarm Plugin</name>
     <url>http://entgra.io</url>
 
     <modules>

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>7.0.0-SNAPSHOT</version>
+		<version>6.1.1-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>Entgra Device Management Plugins - Device Mgt Input Adaptor Extensions Module</name>
+    <name>WSO2 Carbon - Device Mgt Input Adaptor Extensions Module</name>
     <description>Provides the back-end functionality of Input adaptor</description>
     <url>http://entgra.io</url>
 
@@ -37,6 +37,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Device Mgt Input Adaptor Module - Http</name>
+    <name>WSO2 Carbon - Device Mgt Input Adaptor Module - Http</name>
     <description>Provides the back-end functionality of Input adaptor</description>
     <url>http://entgra.io</url>
 
@@ -105,6 +105,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -135,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="${io.entgra.device.mgt.plugins.version.range}",
+                            io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
                             io.entgra.device.mgt.plugins.input.adapter.http.oauth.exception,
                             io.entgra.device.mgt.plugins.input.adapter.http.util,
                             javax.net.ssl,

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Device Mgt Input Adaptor Module - MQTT</name>
+    <name>WSO2 Carbon - Device Mgt Input Adaptor Module - MQTT</name>
     <description>Provides the back-end functionality of Input adaptor</description>
     <url>http://entgra.io</url>
 
@@ -97,6 +97,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -119,12 +127,12 @@
                             io.entgra.device.mgt.plugins.input.adapter.mqtt.*
                         </Export-Package>
                         <Import-Package>
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)",
-                            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.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)",
-                            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.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
-                            io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
+                            io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
                             io.entgra.device.mgt.plugins.input.adapter.mqtt,
                             io.entgra.device.mgt.plugins.input.adapter.mqtt.util,
                             javax.net.ssl,

components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/src/main/java/io/entgra/device/mgt/plugins/input/adapter/mqtt/util/MQTTAdapterListener.java

@@ -243,8 +243,6 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
             } else {
                 inputEventAdapterListener.onEvent(msgText);
             }
-        } catch (Exception ex) {
-          log.error("Error in message arrive : ", ex);
         } finally {
             PrivilegedCarbonContext.endTenantFlow();
         }

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>7.0.0-SNAPSHOT</version>
+		<version>6.1.1-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>Entgra Device Management Plugins - Event Input Thrift Adapter Module</name>
+	<name>WSO2 Carbon - Event Input Thrift Adapter Module</name>
 	<description>org.wso2.carbon.event.input.adapter.thrift provides the back-end
 		functionality of input wso2event adapter
 	</description>
@@ -77,6 +77,14 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Device Mgt Input Adaptor Module - XMPP</name>
+    <name>WSO2 Carbon - Device Mgt Input Adaptor Module - XMPP</name>
     <description>Provides the back-end functionality of Input adaptor</description>
     <url>http://entgra.io</url>
 
@@ -81,6 +81,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -95,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.xmpp.internal.*
+                            io.entgra.device.mgt.plugins.input.adapter.http.internal.*
                         </Private-Package>
                         <Export-Package>
                             !io.entgra.device.mgt.plugins.input.adapter.xmpp.internal,
@@ -103,7 +111,8 @@
                             io.entgra.device.mgt.plugins.input.adapter.xmpp.*
                         </Export-Package>
                         <Import-Package>
-                            io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
+                            io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
+                            io.entgra.device.mgt.plugins.input.adapter.xmpp,
                             org.apache.commons.logging;version="[1.2,2)",
                             org.jivesoftware.smack,
                             org.jivesoftware.smack.filter,

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Device Management Output HTTP adapter Module</name>
+    <name>WSO2 Carbon - 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>
@@ -70,6 +70,16 @@
     </dependencies>
     <build>
         <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -77,6 +87,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
@@ -92,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="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension;version="[5.0,6)",
-                            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.dto;version="[5.0,6)",
-                            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.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
                             io.entgra.device.mgt.plugins.output.adapter.http.util,
                             javax.net.ssl,
                             org.apache.commons.httpclient;version="[3.1,4)",

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Device Mgt Output MQTT Adaptor Module</name>
+    <name>WSO2 Carbon - 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>
@@ -85,6 +85,15 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -107,11 +116,11 @@
                             io.entgra.device.mgt.plugins.output.adapter.mqtt.*,
                         </Export-Package>
                         <Import-Package>
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension;version="[5.0,6)",
-                            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.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.apimgt.keymgt.extension.service;version="[5.0,6)",
-                            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.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
                             io.entgra.device.mgt.plugins.output.adapter.mqtt,
                             io.entgra.device.mgt.plugins.output.adapter.mqtt.util,
                             javax.net.ssl,

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Webapp for UI Output Event Adapter</name>
+    <name>WSO2 - Webapp for UI Output Event Adapter</name>
     <url>http://entgra.io</url>
 
     <dependencies>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Event Output UI Adapter Module</name>
+    <name>WSO2 Carbon - Event Output UI Adapter Module</name>
     <description>org.wso2.carbon.event.output.adapter.ui provides the back-end functionality of
         ui event adapter
     </description>
@@ -108,6 +108,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Device Mgt Output XMPP Adaptor Module</name>
+    <name>WSO2 Carbon - 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>
@@ -62,6 +62,15 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

components/extensions/cdmf-transport-adapters/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cdmf-transport-adapters</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - IoT Base Plugin</name>
+    <name>WSO2 Carbon - IoT Base Plugin</name>
     <url>http://entgra.io</url>
 
     <modules>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - EMQX Extension Hook</name>
+    <name>EMQX Extensions - Extension Hook</name>
 
 
     <dependencies>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - EMQX Extension Hook Initializer</name>
+    <name>EMQX Extensions - Extension Hook Initializer</name>
 
     <dependencies>
         <dependency>
@@ -60,6 +60,14 @@
             </extension>
         </extensions>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

components/extensions/emqx-extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>emqx-extensions</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - EMQX Extensions</name>
+    <name>EMQX Extensions</name>
 
     <modules>
        <module>io.entgra.device.mgt.plugins.emqx.exhook</module>

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>Entgra Device Management Plugins - MQTT Topics Management API</name>
+    <name>WSO2 Carbon - MQTT Topics Management API</name>
-    <description>Entgra Device Management Plugins - MQTT Topics Management API</description>
+    <description>WSO2 Carbon - MQTT Topics Management API</description>
     <url>http://entgra.io</url>
 
     <build>

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>Entgra Device Management Plugins - Component - MQTT - Authorization Manager</name>
+    <name>WSO2 Carbon - Component - MQTT - Authorization Manager</name>
     <description>MQTT authorization manager based on Carbon device manager</description>
     <url>http://entgra.io</url>
 

components/extensions/mb-extensions/pom.xml

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

components/extensions/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extensions</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Mobile Plugins Extensions</name>
+    <name>WSO2 Carbon - Mobile Plugins Extensions</name>
     <url>http://entgra.io</url>
 
     <modules>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - MQTT Pull Notification Listener Implementation</name>
+    <name>WSO2 Carbon - MQTT Pull Notification Listener Implementation</name>
-    <description>Entgra Device Management Plugins - MQTT Pull Notification Lister Implementation</description>
+    <description>WSO2 Carbon - MQTT Pull Notification Lister Implementation</description>
     <url>http://entgra.io</url>
 
     <dependencies>
@@ -64,6 +64,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -80,14 +88,14 @@
                         </Export-Package>
                         <Import-Package>
                             com.google.gson;version="[2.9,3)",
-                            io.entgra.device.mgt.core.device.mgt.common;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",
-                            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.exceptions;version="[5.0,6)",
-                            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.operation.mgt;version="[5.0,6)",
-                            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.pull.notification;version="[5.0,6)",
-                            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;version="[5.0,6)",
-                            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.config.pull.notification;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.core.service;version="[5.0,6)",
-                            io.entgra.device.mgt.plugins.input.adapter.extension;version="${io.entgra.device.mgt.plugins.version.range}",
+                            io.entgra.device.mgt.plugins.input.adapter.extension;version="[6.0,7)",
                             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}",

components/extensions/pull-notification-listeners/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pull-notification-listeners</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Pull Notification Extension</name>
+    <name>WSO2 Carbon - Pull Notification Extension</name>
     <url>http://entgra.io</url>
 
     <modules>

components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/pom.xml

@@ -17,20 +17,19 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
-         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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Siddhi Extensions - Device management Core</name>
+    <name>WSO2 Siddhi Execution Extension - Device management Core functionality as Siddhi extension</name>
     <url>http://entgra.io</url>
 
     <dependencies>
@@ -148,6 +147,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -161,21 +168,26 @@
                             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="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",
-                            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.exceptions;version="[5.0,6)",
-                            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.group.mgt;version="[5.0,6)",
-                            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.notification.mgt;version="[5.0,6)",
-                            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.operation.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.core.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.core.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;version="[5.0,6)",
-                            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.dto;version="[5.0,6)",
-                            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.exception;version="[5.0,6)",
-                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.identity.jwt.client.extension.service;version="[5.0,6)",
                             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,
@@ -186,9 +198,29 @@
                             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)",

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Siddhi Extensions - Json</name>
+    <name>WSO2 Siddhi Execution Extension - Json</name>
     <url>http://entgra.io</url>
 
     <dependencies>
@@ -63,6 +63,14 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

components/extensions/siddhi-extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>siddhi-extensions</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Siddhi Extension</name>
+    <name>WSO2 Carbon - Siddhi Extension</name>
     <url>http://entgra.io</url>
 
     <modules>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/pom.xml

@@ -21,18 +21,22 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.plugins.mobile.android.api</artifactId>
-    <name>Entgra Device Management Plugins - Android JAX-RS API</name>
+    <name>WSO2 Carbon - Android JAX-RS API</name>
     <description>Android JAX-RS API</description>
     <packaging>war</packaging>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/main/java/io/entgra/device/mgt/plugins/mobile/android/api/services/DeviceManagementAdminService.java

@@ -91,7 +91,7 @@ import java.util.List;
                 @Scope(
                         name = "Clear Password",
                         description = "Clear the password on Android devices",
-                        key = "and:ops:clear-pwd",
+                        key = "and:ops:clear-password",
                         roles = {"Internal/devicemgt-admin"},
                         permissions = {"/device-mgt/devices/owning-device/operations/android/clear-password"}
                 ),
@@ -231,7 +231,7 @@ import java.util.List;
                 @Scope(
                         name = "Password Policy",
                         description = "Set password policy of an Android Device",
-                        key = "and:ops:pwd-policy",
+                        key = "and:ops:password-policy",
                         roles = {"Internal/devicemgt-admin"},
                         permissions = {"/device-mgt/devices/owning-device/operations/android/password-policy"}
                 ),
@@ -511,7 +511,7 @@ public interface DeviceManagementAdminService {
             tags = "Android Device Management Administrative Service",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:clear-pwd")
+                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:clear-password")
                     })
             }
     )
@@ -1751,7 +1751,7 @@ public interface DeviceManagementAdminService {
             tags = "Android Device Management Administrative Service",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:pwd-policy")
+                            @ExtensionProperty(name = AndroidConstants.SCOPE, value = "and:ops:password-policy")
                     })
             }
     )

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.plugins.mobile.android.emulator</artifactId>
-    <name>Entgra Device Management Plugins - AndroidTryIt Emulator</name>
+    <name>AndroidTryIt Emulator</name>
-    <description>Entgra Device Management Plugins - Android Virtual Device</description>
+    <description>Android Virtual Device</description>
 
     <build>
         <finalName>EmulatorJava</finalName>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>io.entgra.device.mgt.plugins.mobile.android.ui</artifactId>
-    <name>Entgra Device Management Plugins - Mobile Android UI</name>
+    <name>WSO2 Carbon - Mobile Android UI</name>
     <packaging>pom</packaging>
 
     <dependencies>

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json

@@ -21,9 +21,9 @@
             "and:ops:mute",
             "and:ops:change-lock-code",
             "and:ops:blacklist-app",
-            "and:ops:pwd-policy",
+            "and:ops:password-policy",
             "and:ops:encrypt-storage",
-            "and:ops:clear-pwd",
+            "and:ops:clear-password",
             "and:ops:enterprise-wipe",
             "and:ops:device-info",
             "and:conf:view",

components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android/pom.xml

@@ -22,19 +22,27 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Mobile Device Management Android Impl</name>
+    <name>WSO2 Carbon - Mobile Device Management Android Impl</name>
-    <description>Entgra Device Management Plugins - Mobile Device Management Android Implementation</description>
+    <description>WSO2 Carbon - Mobile Device Management Android Implementation</description>
     <url>http://entgra.io</url>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -48,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="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.common;version="[5.0,6)",
-                            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.app.mgt;version="[5.0,6)",
-                            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.configuration.mgt;version="[5.0,6)",
-                            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.exceptions;version="[5.0,6)",
-                            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.general;version="[5.0,6)",
-                            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.invitation.mgt;version="[5.0,6)",
-                            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.license.mgt;version="[5.0,6)",
-                            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.operation.mgt;version="[5.0,6)",
-                            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;version="[5.0,6)",
-                            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.policy.mgt.monitor;version="[5.0,6)",
-                            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.pull.notification;version="[5.0,6)",
-                            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.push.notification;version="[5.0,6)",
-                            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.spi;version="[5.0,6)",
-                            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.common.type.mgt;version="[5.0,6)",
-                            io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry;version="[5.0,6)",
                             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,
@@ -131,62 +139,50 @@
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.utils</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>io.entgra.device.mgt.core.device.mgt.extensions</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>io.entgra.device.mgt.core.policy.mgt.common</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>io.entgra.device.mgt.core.policy.mgt.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.registry.api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.registry.core</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.orbit.org.apache.tomcat</groupId>
             <artifactId>jdbc-pool</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.orbit.com.h2database</groupId>
@@ -196,7 +192,6 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

components/mobile-plugins/android-plugin/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>android-plugin</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Mobile Plugins</name>
+    <name>WSO2 Carbon - Mobile Plugins</name>
     <url>http://entgra.io</url>
 
     <modules>

components/mobile-plugins/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mobile-plugins</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Mobile Plugins</name>
+    <name>WSO2 Carbon - Mobile Plugins</name>
     <url>http://entgra.io</url>
 
     <modules>

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>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</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>Entgra Device Management Plugins - Carbon Device Management Plugins Test Coverage Component</name>
+    <name>WSO2 Carbon - Carbon Device Management Plugins Test Coverage Component</name>
 
     <properties>
         <target>target</target>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - IoT Server Analytics Feature</name>
+    <name>WSO2 Carbon - IoT Server Analytics Feature</name>
     <url>http://entgra.io</url>
     <description>This feature contains the Analytics Script for the IoT Server</description>
 

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>Entgra Device Management Plugins - IoT Geo Dashboard Feature</name>
+    <name>WSO2 Carbon - IoT Geo Dashboard Feature</name>
     <url>http://entgra.io</url>
     <description>This feature contains the IoT geo dashboard gadget</description>
 

features/analytics-feature/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>analytics-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - IoT Server IoT Analytics Feature</name>
+    <name>WSO2 Carbon - IoT Server IoT Analytics Feature</name>
     <url>http://entgra.io</url>
 
     <modules>

features/device-types-feature/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>device-types-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Device Management IoT Plugins Feature</name>
+    <name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
     <url>http://entgra.io</url>
 
     <modules>

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>7.0.0-SNAPSHOT</version>
+		<version>6.1.1-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>Entgra Device Management Plugins - IoT Server VirtualFireAlarm Backend Feature</name>
+	<name>WSO2 Carbon - 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>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>virtual-fire-alarm-plugin-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - IoT Server VirtualFireAlarm Device Feature</name>
+    <name>WSO2 Carbon - IoT Server VirtualFireAlarm Device Feature</name>
     <url>http://entgra.io</url>
 
     <modules>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Device Management Adapters Feature</name>
+    <name>WSO2 Carbon - Device Management Adapters Feature</name>
     <url>http://entgra.io</url>
     <description>This feature contains the adapter bundles required for IoT Server</description>
 

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.device.feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Siddhi Extensions - Device Group Feature</name>
+    <name>WSO2 Siddhi Execution Extension - Device Group Feature</name>
     <url>http://entgra.io</url>
     <description>This feature contains Siddhi extension feature for device groups</description>
 

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Siddhi Extensions - Json Feature</name>
+    <name>WSO2 Siddhi Execution Extension - Json Feature</name>
     <url>http://entgra.io</url>
     <description>This feature contains Siddhi extension feature for changing a json string to individual properties.</description>
 

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>7.0.0-SNAPSHOT</version>
+		<version>6.1.1-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>Entgra Device Management Plugins - Notification Listener</name>
+	<name>WSO2 Carbon - Notification Listener</name>
 	<url>http://entgra.io</url>
 	<description>This feature contains the core bundles required iot core listeners</description>
 

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>Entgra Device Management Plugins - MQTT Topics Management API Feature</name>
+    <name>WSO2 Carbon - MQTT Topics Management API Feature</name>
     <url>http://entgra.io</url>
     <description>This feature contains the API feature for the MQTT dashboard</description>
 

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>Entgra Device Management Plugins - MQTT Authorization Feature</name>
+    <name>WSO2 Carbon - MQTT Authorization Feature</name>
     <url>http://entgra.io</url>
     <description>This feature contains the bundles required for mqtt authorization</description>
 

features/extensions-feature/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>extensions-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Device Management Extensions</name>
+    <name>WSO2 Carbon - Device Management Extensions</name>
     <url>http://entgra.io</url>
 
     <modules>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-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>Entgra Device Management Plugins - Android Device Management Feature</name>
+    <name>WSO2 Carbon - Android Device Management Feature</name>
     <url>http://entgra.io</url>
     <description>This feature contains the core bundles required for Android Device Management
         functionality
@@ -44,6 +44,10 @@
             <groupId>org.wso2.orbit.com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.entgra.device.mgt.core</groupId>
+            <artifactId>io.entgra.device.mgt.core.device.mgt.common</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.entgra.device.mgt.core</groupId>
             <artifactId>io.entgra.device.mgt.core.device.mgt.server.feature</artifactId>

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>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>android-plugin-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Device Management Android Plugin Feature</name>
+    <name>WSO2 Carbon - Device Management Android Plugin Feature</name>
     <url>http://entgra.io</url>
 
     <modules>

features/mobile-plugins-feature/pom.xml

@@ -21,15 +21,15 @@
 
     <parent>
         <groupId>io.entgra.device.mgt.plugins</groupId>
-        <artifactId>device-mgt-plugins</artifactId>
+        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
+        <version>6.1.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mobile-plugins-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Entgra Device Management Plugins - Device Management EMM Plugins Feature</name>
+    <name>WSO2 Carbon - Device Management EMM Plugins Feature</name>
     <url>http://entgra.io</url>
 
     <modules>

pom.xml

@@ -17,17 +17,16 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
-         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>device-mgt-plugins</artifactId>
+    <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
     <packaging>pom</packaging>
-    <version>7.0.0-SNAPSHOT</version>
+    <version>6.1.1-SNAPSHOT</version>
-    <name>Entgra Device Management Plugins - Parent</name>
+    <name>WSO2 Carbon - Device Management Plugins Parent</name>
     <url>http://entgra.io</url>
-    <description>Entgra Device Management Plugins - Parent</description>
+    <description>WSO2 Carbon - Device Management Plugins Parent</description>
 
     <parent>
         <groupId>org.wso2</groupId>
@@ -431,11 +430,11 @@
                 <artifactId>io.entgra.device.mgt.plugins.output.adapter.websocket</artifactId>
                 <version>${io.entgra.device.mgt.plugins.version}</version>
             </dependency>
-            <dependency>
+			<dependency>
-                <groupId>io.entgra.device.mgt.plugins</groupId>
+				<groupId>io.entgra.device.mgt.plugins</groupId>
-                <artifactId>io.entgra.device.mgt.plugins.mqtt.notification.listener</artifactId>
+				<artifactId>io.entgra.device.mgt.plugins.mqtt.notification.listener</artifactId>
-                <version>${io.entgra.device.mgt.plugins.version}</version>
+				<version>${io.entgra.device.mgt.plugins.version}</version>
-            </dependency>
+			</dependency>
             <dependency>
                 <groupId>io.entgra.device.mgt.plugins</groupId>
                 <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.remote.session</artifactId>
@@ -846,11 +845,11 @@
                 <artifactId>feign-gson</artifactId>
                 <version>${io.github.openfeign.version}</version>
             </dependency>
-            <dependency>
+			<dependency>
-                <groupId>io.github.openfeign</groupId>
+				<groupId>io.github.openfeign</groupId>
-                <artifactId>feign-slf4j</artifactId>
+				<artifactId>feign-slf4j</artifactId>
-                <version>${io.github.openfeign.version}</version>
+				<version>${io.github.openfeign.version}</version>
-            </dependency>
+			</dependency>
 
             <!-- dependencies for siddhi extension -->
             <dependency>
@@ -965,20 +964,23 @@
     <properties>
 
         <!-- Carbon Device Management -->
-        <io.entgra.device.mgt.core.version>6.0.0-SNAPSHOT</io.entgra.device.mgt.core.version>
+        <io.entgra.device.mgt.core.version>5.2.4-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>
+        <io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range>
 
         <!-- Carbon Device Management Plugins -->
-        <io.entgra.device.mgt.plugins.version>7.0.0-SNAPSHOT</io.entgra.device.mgt.plugins.version>
+        <io.entgra.device.mgt.plugins.version>6.1.1-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>
-        <carbon.p2.plugin.version>5.2.74</carbon.p2.plugin.version>
+        <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
 
         <!-- Axis2 -->
         <axis2.orbit.version>1.6.1-wso2v85</axis2.orbit.version>
@@ -1075,7 +1077,7 @@
         <maven.javadoc.skip>true</maven.javadoc.skip>
 
         <!-- jacoco plugin version -->
-        <jacoco.maven.plugin.version>0.8.10</jacoco.maven.plugin.version>
+        <jacoco.maven.plugin.version>0.7.8</jacoco.maven.plugin.version>
         <jacoco.ant.verision>0.7.5.201505241946</jacoco.ant.verision>
         <ant.contrib.version>1.0b3</ant.contrib.version>
         <commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.version>
@@ -1095,13 +1097,12 @@
         <tomcat-annotations-api>6.0.53</tomcat-annotations-api>
         <commons-lang-wso2>2.6.0.wso2v1</commons-lang-wso2>
         <apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>
-        <maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
+        <maven.surefire.plugin.version>2.22.0</maven.surefire.plugin.version>
     </properties>
 
     <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>scm:git:https://repository.entgra.net/community/device-mgt-plugins.git</developerConnection>
-        </developerConnection>
         <connection>scm:git:https://repository.entgra.net/community/device-mgt-plugins.git</connection>
         <tag>v6.0.14</tag>
     </scm>
@@ -1116,69 +1117,71 @@
             </extension>
         </extensions>
 
+        <plugins>
+            <plugin>
+                <groupId>org.jvnet.maven.incrementalbuild</groupId>
+                <artifactId>incremental-build-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>incremental-build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <preparationGoals>clean install</preparationGoals>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.6.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.4.0</version>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+            </plugin>
+        </plugins>
         <pluginManagement>
             <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
-                    <configuration>
-                        <encoding>UTF-8</encoding>
-                        <source>11</source>
-                        <target>11</target>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.0</version>
                     <extensions>true</extensions>
                     <configuration>
-                        <instructions>
-                            <Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=11))"</Require-Capability>
-                        </instructions>
                         <obrRepository>NONE</obrRepository>
+                        <!--<instructions>
+                          <_include>-osgi.bnd</_include>
+                        </instructions>-->
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.jvnet.maven.incrementalbuild</groupId>
-                    <artifactId>incremental-build-plugin</artifactId>
-                    <version>1.3</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>incremental-build</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <configuration>
-                        <preparationGoals>clean install</preparationGoals>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                </plugin>
-                <plugin>
-                    <groupId>org.xolstice.maven.plugins</groupId>
-                    <artifactId>protobuf-maven-plugin</artifactId>
-                    <version>0.6.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.4.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.wso2.maven</groupId>
-                    <artifactId>carbon-p2-plugin</artifactId>
-                    <version>${carbon.p2.plugin.version}</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>