Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins

components/analytics/iot-analytics/org.wso2.carbon.device.mgt.cdmf.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.iot.device.statistics.dashboard/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>iot-analytics</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/iot-analytics/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>androidsense-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/androidsense-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>arduino-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/arduino-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>raspberrypi-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>raspberrypi-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>raspberrypi-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/raspberrypi-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>virtual-fire-alarm-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<artifactId>virtual-fire-alarm-plugin</artifactId>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>virtual-fire-alarm-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-types/virtual-fire-alarm-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml

@@ -18,7 +18,7 @@
      <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>appm-connector</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>appm-connector</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/appm-connector/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml

@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>cdmf-transport-adapters</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>cdmf-transport-adapters</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mb-extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mb-extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/mb-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>pull-notification-listeners</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

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

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>remote-session-extension</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>remote-session-extension</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/remote-session-extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -148,6 +148,32 @@
                     </suiteXmlFiles>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>jacoco-initialize</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                        <configuration>
+                            <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
+                            <outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/ExtensionTestCase.java

@@ -49,7 +49,6 @@ import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 import org.wso2.extension.siddhi.device.test.util.SiddhiTestHelper;
 import org.wso2.extension.siddhi.device.test.util.TestDataHolder;
 import org.wso2.extension.siddhi.device.test.util.TestDeviceManagementService;
-import org.wso2.extension.siddhi.device.test.util.TestUtils;
 import org.wso2.extension.siddhi.device.utils.DeviceUtils;
 import org.wso2.siddhi.core.ExecutionPlanRuntime;
 import org.wso2.siddhi.core.SiddhiManager;
@@ -79,7 +78,7 @@ public class ExtensionTestCase extends BaseDeviceManagementTest {
         @Override
         public void receive(long timeStamp, Event[] inEvents, Event[] removeEvents) {
             EventPrinter.print(timeStamp, inEvents, removeEvents);
-            for (Event event : inEvents) {
+            for (Event ignored : inEvents) {
                 count.incrementAndGet();
                 eventArrived = true;
             }
@@ -127,8 +126,10 @@ public class ExtensionTestCase extends BaseDeviceManagementTest {
 
     @Test
     public void createGroup() throws GroupManagementException, GroupAlreadyExistException {
-        groupManagementProviderService.createGroup(TestUtils.createDeviceGroup1(), DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_PERMISSIONS);
+        groupManagementProviderService.createGroup(TestDataHolder.generateDummyGroupData(1),
-        groupManagementProviderService.createGroup(TestUtils.createDeviceGroup2(), DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_PERMISSIONS);
+                                                   DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_PERMISSIONS);
+        groupManagementProviderService.createGroup(TestDataHolder.generateDummyGroupData(2),
+                                                   DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_PERMISSIONS);
     }
 
     @Test
@@ -149,13 +150,38 @@ public class ExtensionTestCase extends BaseDeviceManagementTest {
         configuration.setEnabled(false);
 
         DeviceConfigurationManager.getInstance().getDeviceManagementConfig().setDeviceCacheConfiguration(configuration);
-        List<DeviceIdentifier> list = TestUtils.getDeviceIdentifiersList(DEVICE_TYPE);
+        List<DeviceIdentifier> list = TestDataHolder.getDeviceIdentifiersList(DEVICE_TYPE);
-        DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestUtils.createDeviceGroup1().getName());
+        DeviceGroup deviceGroup = groupManagementProviderService.getGroup(TestDataHolder.generateDummyGroupData(1).getName());
         Assert.assertNotNull(deviceGroup);
         groupManagementProviderService.addDevices(deviceGroup.getGroupId(), list);
     }
 
     @Test(dependsOnMethods = {"addDevices"})
+    public void testIsEnrolledExtension() throws InterruptedException, GroupManagementException {
+        log.info("IsEnrolled TestCase");
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        count.set(0);
+        eventArrived = false;
+
+        String inStreamDefinition = "define stream inputStream (deviceId string, deviceType string);";
+        String query = ("@info(name = 'query1') from inputStream[device:isEnrolled(deviceId, deviceType)] " +
+                        "select deviceId insert into outputStream;");
+        ExecutionPlanRuntime executionPlanRuntime = siddhiManager.createExecutionPlanRuntime(inStreamDefinition + query);
+        executionPlanRuntime.addCallback("query1", queryCallback);
+
+        InputHandler inputHandler = executionPlanRuntime.getInputHandler("inputStream");
+        executionPlanRuntime.start();
+        DeviceIdentifier deviceIdentifier = TestDataHolder.getDeviceIdentifiersList(DEVICE_TYPE).get(0);
+        inputHandler.send(new Object[]{deviceIdentifier.getId(), deviceIdentifier.getType()});
+        inputHandler.send(new Object[]{"99999", deviceIdentifier.getType()});
+        SiddhiTestHelper.waitForEvents(100, 1, count, 10000);
+        Assert.assertTrue(eventArrived);
+        Assert.assertEquals(1, count.get());
+        executionPlanRuntime.shutdown();
+    }
+
+    @Test(dependsOnMethods = {"testIsEnrolledExtension"})
     public void testIsInGroupExtension() throws InterruptedException, GroupManagementException {
         log.info("IsInGroup TestCase");
         SiddhiManager siddhiManager = new SiddhiManager();
@@ -171,11 +197,11 @@ public class ExtensionTestCase extends BaseDeviceManagementTest {
 
         InputHandler inputHandler = executionPlanRuntime.getInputHandler("inputStream");
         executionPlanRuntime.start();
-        DeviceIdentifier deviceIdentifier = TestUtils.getDeviceIdentifiersList(DEVICE_TYPE).get(0);
+        DeviceIdentifier deviceIdentifier = TestDataHolder.getDeviceIdentifiersList(DEVICE_TYPE).get(0);
         inputHandler.send(new Object[]{groupManagementProviderService.getGroup(
-                TestUtils.createDeviceGroup1().getName()).getGroupId(), deviceIdentifier.getId(), deviceIdentifier.getType()});
+                TestDataHolder.generateDummyGroupData(1).getName()).getGroupId(), deviceIdentifier.getId(), deviceIdentifier.getType()});
         inputHandler.send(new Object[]{groupManagementProviderService.getGroup(
-                TestUtils.createDeviceGroup2().getName()).getGroupId(), deviceIdentifier.getId(), deviceIdentifier.getType()});
+                TestDataHolder.generateDummyGroupData(2).getName()).getGroupId(), deviceIdentifier.getId(), deviceIdentifier.getType()});
         SiddhiTestHelper.waitForEvents(100, 1, count, 10000);
         Assert.assertTrue(eventArrived);
         Assert.assertEquals(1, count.get());

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDataHolder.java

@@ -30,13 +30,8 @@ import java.util.Properties;
 
 public class TestDataHolder {
 
-    public final static String TEST_DEVICE_TYPE = "Test";
-    public final static Integer SUPER_TENANT_ID = -1234;
-    public final static String SUPER_TENANT_DOMAIN = "carbon.super";
     public final static String initialDeviceIdentifier = "12345";
     public final static String OWNER = "admin";
-    public static Device initialTestDevice;
-    public static DeviceType initialTestDeviceType;
 
     public static Device generateDummyDeviceData(String deviceType) {
         Device device = new Device();
@@ -53,75 +48,23 @@ public class TestDataHolder {
         return device;
     }
 
-    public static Notification getNotification(int notificationId, String status, String deviceId,
+    public static DeviceGroup generateDummyGroupData(int testId) {
-                                               String description, String deviceName, int operationId,
-                                               String deviceType) {
-        Notification notification = new Notification();
-        notification.setNotificationId(notificationId);
-        notification.setStatus(status);
-        notification.setDeviceIdentifier(deviceId);
-        notification.setDescription(description);
-        notification.setDeviceName(deviceName);
-        notification.setOperationId(operationId);
-        notification.setDeviceType(deviceType);
-        return notification;
-    }
-
-    public static Device generateDummyDeviceData(String deviceIdentifier, String deviceType,
-                                                 EnrolmentInfo enrolmentInfo) {
-        Device device = new Device();
-        device.setEnrolmentInfo(enrolmentInfo);
-        device.setDescription("Test Description");
-        device.setDeviceIdentifier(deviceIdentifier);
-        device.setType(deviceType);
-        return device;
-    }
-
-    public static List<Device> generateDummyDeviceData(List<DeviceIdentifier> deviceIds) {
-        List<Device> devices = new ArrayList<>();
-        for (DeviceIdentifier deviceId : deviceIds) {
-            Device device = new Device();
-            EnrolmentInfo enrolmentInfo = new EnrolmentInfo();
-            enrolmentInfo.setDateOfEnrolment(new Date().getTime());
-            enrolmentInfo.setDateOfLastUpdate(new Date().getTime());
-            enrolmentInfo.setOwner(OWNER);
-            enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.BYOD);
-            enrolmentInfo.setStatus(EnrolmentInfo.Status.CREATED);
-            device.setEnrolmentInfo(enrolmentInfo);
-            device.setDescription("Test Description");
-            device.setDeviceIdentifier(deviceId.getId());
-            device.setType(deviceId.getType());
-            devices.add(device);
-        }
-        return devices;
-    }
-
-    public static DeviceType generateDeviceTypeData(String devTypeName) {
-        DeviceType deviceType = new DeviceType();
-        deviceType.setName(devTypeName);
-        return deviceType;
-    }
-
-    public static Application generateApplicationDummyData(String appIdentifier) {
-        Application application = new Application();
-        Properties properties = new Properties();
-        properties.setProperty("test1", "testVal");
-        application.setName("SimpleCalculator");
-        application.setCategory("TestCategory");
-        application.setApplicationIdentifier(appIdentifier);
-        application.setType("TestType");
-        application.setVersion("1.0.0");
-        application.setImageUrl("http://test.org/image/");
-        application.setLocationUrl("http://test.org/location/");
-        application.setAppProperties(properties);
-        return application;
-    }
-
-    public static DeviceGroup generateDummyGroupData() {
         DeviceGroup deviceGroup = new DeviceGroup();
-        deviceGroup.setName("Test device group");
+        deviceGroup.setName("Test" + testId);
-        deviceGroup.setDescription("Test description");
+        deviceGroup.setDescription("Test description " + testId);
         deviceGroup.setOwner(OWNER);
         return deviceGroup;
     }
+
+    public static List<DeviceIdentifier> getDeviceIdentifiersList(String deviceType){
+        Device device = generateDummyDeviceData(deviceType);
+        DeviceIdentifier identifier = new DeviceIdentifier();
+        identifier.setId(device.getDeviceIdentifier());
+        identifier.setType(deviceType);
+
+        List<DeviceIdentifier> list = new ArrayList<>();
+        list.add(identifier);
+
+        return list;
+    }
 }

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestDeviceManager.java

@@ -88,6 +88,11 @@ public class TestDeviceManager implements DeviceManager {
         return null;
     }
 
+    @Override
+    public boolean updateDeviceProperties(DeviceIdentifier deviceIdentifier, List<Device.Property> list) throws DeviceManagementException {
+        return false;
+    }
+
     @Override
     public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device)
             throws DeviceManagementException {

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/java/org/wso2/extension/siddhi/device/test/util/TestUtils.java

@@ -58,35 +58,4 @@ public class TestUtils {
             }
         }
     }
-
-
-    public static DeviceGroup createDeviceGroup1(){
-        DeviceGroup group = new DeviceGroup();
-        group.setName("TEST_GROUP_01");
-        group.setDescription("TEST_GROUP_01 - Description");
-        group.setOwner("admin");
-        return group;
-    }
-
-
-    public static DeviceGroup createDeviceGroup2(){
-        DeviceGroup group = new DeviceGroup();
-        group.setName("TEST_GROUP_02");
-        group.setDescription("TEST_GROUP_02 - Description");
-        group.setOwner("admin");
-        return group;
-    }
-
-    public static List<DeviceIdentifier> getDeviceIdentifiersList(String deviceType){
-
-        Device device = TestDataHolder.generateDummyDeviceData(deviceType);
-        DeviceIdentifier identifier = new DeviceIdentifier();
-        identifier.setId(device.getDeviceIdentifier());
-        identifier.setType(deviceType);
-
-        List<DeviceIdentifier> list = new ArrayList<>();
-        list.add(identifier);
-
-        return list;
-    }
 }

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/resources/testng.xml

@@ -19,7 +19,7 @@
 
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
-<suite name="CheckDeviceInGroup">
+<suite name="DeviceExtensionTestSuite">
     <parameter name="useDefaultListeners" value="false"/>
 
     <test name="Extension Unit Tests" preserve-order="true">

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -48,8 +48,8 @@
             <artifactId>json</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.testng</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -84,6 +84,18 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
+                    </systemPropertyVariables>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+                    </suiteXmlFiles>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/main/java/org/wso2/extension/siddhi/execution/json/GetArrayFunctionExtension.java

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c)  2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.extension.siddhi.execution.json;
+
+import org.json.JSONArray;
+import org.wso2.siddhi.core.config.ExecutionPlanContext;
+import org.wso2.siddhi.core.executor.ExpressionExecutor;
+import org.wso2.siddhi.core.executor.function.FunctionExecutor;
+import org.wso2.siddhi.query.api.definition.Attribute;
+import org.wso2.siddhi.query.api.exception.ExecutionPlanValidationException;
+
+/**
+ * getArray(elements..)
+ * Returns json array of elements as a string
+ * Accept Type(s): (STRING|INT|DOUBLE|FLOAT|OBJECT ..)
+ * Return Type(s): (STRING)
+ */
+public class GetArrayFunctionExtension extends FunctionExecutor {
+
+    private Attribute.Type returnType = Attribute.Type.STRING;
+
+    @Override
+    protected void init(ExpressionExecutor[] attributeExpressionExecutors,
+                        ExecutionPlanContext executionPlanContext) {
+        if (attributeExpressionExecutors.length <= 0) {
+            throw new ExecutionPlanValidationException(
+                    "Invalid no of arguments passed to json:getArray() function," + " required one or more, but found "
+                    + attributeExpressionExecutors.length);
+        }
+        Attribute.Type inputType = attributeExpressionExecutors[0].getReturnType();
+        for (int i = 1; i < attributeExpressionExecutors.length; i++) {
+            if (attributeExpressionExecutors[0].getReturnType() != inputType) {
+                throw new ExecutionPlanValidationException(
+                        "Parameter types are inconsistent. All parameters should be same");
+            }
+        }
+    }
+
+    @Override
+    protected Object execute(Object[] data) {
+
+        JSONArray jsonArray = new JSONArray();
+        for (Object obj : data) {
+            jsonArray.put(obj);
+        }
+        return jsonArray.toString();
+    }
+
+    @Override
+    protected Object execute(Object data) {
+        return execute(new Object[]{data});
+    }
+
+    @Override
+    public void start() {
+        //Nothing to start
+    }
+
+    @Override
+    public void stop() {
+        //Nothing to stop
+    }
+
+    @Override
+    public Attribute.Type getReturnType() {
+        return returnType;
+    }
+
+    @Override
+    public Object[] currentState() {
+        return null;    //No need to maintain a state.
+    }
+
+    @Override
+    public void restoreState(Object[] state) {
+        //Since there's no need to maintain a state, nothing needs to be done here.
+    }
+}
+
+

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/main/resources/json.siddhiext

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+# Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 #
 # WSO2 Inc. licenses this file to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file except
@@ -17,3 +17,4 @@
 #
 
 getProperty=org.wso2.extension.siddhi.execution.json.GetPropertyFunctionExtension
+getArray=org.wso2.extension.siddhi.execution.json.GetArrayFunctionExtension

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/test/java/org/wso2/extension/siddhi/execution/json/ExtensionTestCase.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c)  2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c)  2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -18,10 +18,10 @@
 
 package org.wso2.extension.siddhi.execution.json;
 
-import junit.framework.Assert;
 import org.apache.log4j.Logger;
-import org.junit.Before;
+import org.testng.Assert;
-import org.junit.Test;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 import org.wso2.siddhi.core.ExecutionPlanRuntime;
 import org.wso2.siddhi.core.SiddhiManager;
 import org.wso2.siddhi.core.event.Event;
@@ -32,12 +32,12 @@ import org.wso2.extension.siddhi.execution.json.test.util.SiddhiTestHelper;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class getPropertyFunctionTestCase {
+public class ExtensionTestCase {
-    static final Logger log = Logger.getLogger(getPropertyFunctionTestCase.class);
+    static final Logger log = Logger.getLogger(ExtensionTestCase.class);
     private AtomicInteger count = new AtomicInteger(0);
     private volatile boolean eventArrived;
 
-    @Before
+    @BeforeClass
     public void init() {
         count.set(0);
         eventArrived = false;
@@ -85,4 +85,39 @@ public class getPropertyFunctionTestCase {
         Assert.assertTrue(eventArrived);
         executionPlanRuntime.shutdown();
     }
+
+    @Test(dependsOnMethods = {"testGetPropertyFunctionExtension"})
+    public void testGetArrayFunctionExtension() throws InterruptedException {
+        count.set(0);
+        eventArrived = false;
+        log.info("GetArrayFunctionExtension TestCase");
+        SiddhiManager siddhiManager = new SiddhiManager();
+
+        String inStreamDefinition = "define stream inputStream (arg1 string, arg2 string);";
+        String query = ("@info(name = 'query1') from inputStream select json:getArray(arg1, arg2) "
+                        + "as array insert into outputStream;");
+
+        ExecutionPlanRuntime executionPlanRuntime = siddhiManager.createExecutionPlanRuntime(inStreamDefinition + query);
+
+        executionPlanRuntime.addCallback("query1", new QueryCallback() {
+            @Override
+            public void receive(long timeStamp, Event[] inEvents, Event[] removeEvents) {
+                EventPrinter.print(timeStamp, inEvents, removeEvents);
+                for (Event event : inEvents) {
+                    count.incrementAndGet();
+                    if (count.get() == 1) {
+                        eventArrived = true;
+                    }
+                }
+            }
+        });
+
+        InputHandler inputHandler = executionPlanRuntime.getInputHandler("inputStream");
+        executionPlanRuntime.start();
+        inputHandler.send(new Object[]{"Arg1","Arg2"});
+        SiddhiTestHelper.waitForEvents(100, 1, count, 60000);
+        Assert.assertEquals(1, count.get());
+        Assert.assertTrue(eventArrived);
+        executionPlanRuntime.shutdown();
+    }
 }

components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/src/test/resources/testng.xml

@@ -0,0 +1,30 @@
+
+<!--
+  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ you may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="JsonExtensionTestSuite">
+    <parameter name="useDefaultListeners" value="false"/>
+
+    <test name="Extension Unit Tests" preserve-order="true">
+        <classes>
+            <class name="org.wso2.extension.siddhi.execution.json.ExtensionTestCase"/>
+        </classes>
+    </test>
+</suite>

components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>siddhi-extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/extensions/siddhi-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java

@@ -413,6 +413,11 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
 
     }
 
+    @Override
+    public boolean updateProperties(DeviceIdentifier deviceIdentifier, List<Device.Property> list) throws DeviceManagementException {
+        return false;
+    }
+
     @Override
     public Operation getOperationByDeviceAndOperationId(DeviceIdentifier deviceIdentifier, int i)
             throws OperationManagementException {

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.android.ui</artifactId>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Android UI</name>
     <packaging>pom</packaging>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>android-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java

@@ -262,6 +262,11 @@ public class AndroidDeviceManager implements DeviceManager {
         return device;
     }
 
+    @Override
+    public boolean updateDeviceProperties(DeviceIdentifier deviceIdentifier, List<Device.Property> list) throws DeviceManagementException {
+        return false;
+    }
+
     @Override
     public boolean setOwnership(DeviceIdentifier deviceId, String ownershipType)
             throws DeviceManagementException {

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

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.mobile.windows.ui</artifactId>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <name>WSO2 Carbon - Mobile Windows UI</name>
     <packaging>pom</packaging>
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>windows-plugin</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java

@@ -241,6 +241,11 @@ public class WindowsDeviceManager implements DeviceManager {
         return device;
     }
 
+    @Override
+    public boolean updateDeviceProperties(DeviceIdentifier deviceIdentifier, List<Device.Property> list) throws DeviceManagementException {
+        return false;
+    }
+
     @Override
     public boolean setOwnership(DeviceIdentifier deviceId, String ownershipType)
             throws DeviceManagementException {

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

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>mobile-plugins</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/test-coverage/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -103,9 +103,13 @@
             ${basedir}/../${extensions}/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener
         </pull.notification.listener>
 
-        <siddhi.extensions>
+        <siddhi.extensions>${extensions}/siddhi-extensions</siddhi.extensions>
-            ${basedir}/../${extensions}/siddhi-extensions/org.wso2.extension.siddhi.execution.json
+        <siddhi.json.extensions>
-        </siddhi.extensions>
+            ${basedir}/../${siddhi.extensions}/org.wso2.extension.siddhi.execution.json
+        </siddhi.json.extensions>
+        <siddhi.device.extensions>
+            ${basedir}/../${siddhi.extensions}/org.wso2.extension.siddhi.device
+        </siddhi.device.extensions>
 
         <!-- mobile-plugins component -->
         <mobile.plugins>mobile-plugins</mobile.plugins>
@@ -134,8 +138,9 @@
                                 <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
                                 <if>
                                     <and>
-                                        <available file="${siddhi.extensions}/${target}/${coverge-report}/${individual.test.report.name}" />
+                                        <available file="${siddhi.json.extensions}/${target}/${coverge-report}/${individual.test.report.name}" />
-
+                                        <available file="${siddhi.device.extensions}/${target}/${coverge-report}/${individual.test.report.name}" />
+                                        <available file="${android.api}/${target}/${coverge-report}/${individual.test.report.name}" />
                                     </and>
                                     <then>
                                         <taskdef name="report" classname="org.jacoco.ant.ReportTask">
@@ -144,7 +149,10 @@
                                         <mkdir dir="${basedir}/target/coverage-report" />
                                         <report>
                                             <executiondata>
-                                                <fileset dir="${siddhi.extensions}/${target}/${coverge-report}">
+                                                <fileset dir="${siddhi.device.extensions}/${target}/${coverge-report}">
+                                                    <include name="${individual.test.report.name}" />
+                                                </fileset>
+                                                <fileset dir="${siddhi.json.extensions}/${target}/${coverge-report}">
                                                     <include name="${individual.test.report.name}" />
                                                 </fileset>
                                                 <fileset dir="${android.api}/${target}/${coverge-report}">
@@ -308,13 +316,23 @@
                                                         </sourcefiles>
                                                     </group>
                                                     <group name="siddhi-extensions">
+                                                        <group name="org.wso2.extension.siddhi.execution.json">
                                                             <classfiles>
-                                                            <fileset dir="${siddhi.extensions}/${target}/${classes}" />
+                                                                <fileset dir="${siddhi.json.extensions}/${target}/${classes}" />
                                                             </classfiles>
                                                             <sourcefiles encoding="UTF-8">
-                                                            <fileset dir="${siddhi.extensions}/${source}" />
+                                                                <fileset dir="${siddhi.json.extensions}/${source}" />
                                                             </sourcefiles>
                                                         </group>
+                                                        <group name="org.wso2.extension.siddhi.device">
+                                                            <classfiles>
+                                                                <fileset dir="${siddhi.device.extensions}/${target}/${classes}" />
+                                                            </classfiles>
+                                                            <sourcefiles encoding="UTF-8">
+                                                                <fileset dir="${siddhi.device.extensions}/${source}" />
+                                                            </sourcefiles>
+                                                        </group>
+                                                    </group>
                                                 </group>
                                                 <group name="mobile-plugins">
                                                     <group name="android-plugin">

features/analytics-feature/org.wso2.carbon.device.mgt.cdmf.analytics.feature/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.iot.analytics.feature</artifactId>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Server Analytics Feature</name>
     <url>http://wso2.org</url>

features/analytics-feature/org.wso2.carbon.iot.device.statistics.dashboard.feature/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.device.statistics.dashboard.feature</artifactId>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Server Analytics Feature</name>
     <url>http://wso2.org</url>

features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/analytics-feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>androidsense-plugin-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature</artifactId>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Server Android Sense Analytics Feature</name>
     <url>http://wso2.org</url>

features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>androidsense-plugin-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature</artifactId>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Server Android Sense Backend Feature</name>
     <url>http://wso2.org</url>

features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>androidsense-plugin-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature</artifactId>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - IoT Server Android Sense UI Feature</name>
     <url>http://wso2.org</url>

features/device-types-feature/androidsense-plugin-feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics.feature/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>arduino-plugin-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.backend.feature/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>arduino-plugin-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>arduino-plugin-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-types-feature/arduino-plugin-feature/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>device-types-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>device-types-feature</artifactId>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management IoT Plugins Feature</name>
     <url>http://wso2.org</url>

features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>raspberrypi-plugin-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>raspberrypi-plugin-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>raspberrypi-plugin-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/raspberrypi-plugin-feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/pom.xml

@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
 		<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
-		<version>4.0.100-SNAPSHOT</version>
+		<version>4.0.102-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>device-types-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml

@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector.feature</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <name>WSO2 Carbon - App management MDM OSGI Connector</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for APP management OSGI MDM connection
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
             <artifactId>org.wso2.carbon.appmgt.mdm.osgiconnector</artifactId>
-	    <version>4.0.100-SNAPSHOT</version>
+	    <version>4.0.102-SNAPSHOT</version>
 		<exclusions>
 		     <exclusion>
                         <groupId>org.apache.ws.commons.axiom</groupId>

features/extensions-feature/org.wso2.carbon.appmgt.mdm.restconnector.feature/pom.xml

@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>extensions-feature</artifactId>
-        <version>4.0.100-SNAPSHOT</version>
+        <version>4.0.102-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>org.wso2.carbon.appmgt.mdm.restconnector.feature</artifactId>
     <packaging>pom</packaging>
-    <version>4.0.100-SNAPSHOT</version>
+    <version>4.0.102-SNAPSHOT</version>
     <name>WSO2 Carbon - App management MDM REST Connector</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for APP management MDM REST connection
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
             <artifactId>org.wso2.carbon.appmgt.mdm.restconnector</artifactId>
-            <version>4.0.100-SNAPSHOT</version>
+            <version>4.0.102-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.ws.commons.axiom</groupId>