From cf56008672e41049697eb9bcfdb5920c918149c4 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Tue, 20 Sep 2016 12:22:57 +0530
Subject: [PATCH] Updating cdmf and cdmf-plugins versions in samples

---
 modules/samples/connectedcup/pom.xml       | 11 +++++++----
 modules/samples/connectedlap/pom.xml       |  4 ++--
 modules/samples/currentsensor/pom.xml      |  9 ++++++---
 modules/samples/digitaldisplay/pom.xml     |  7 +++++--
 modules/samples/doormanager/pom.xml        |  4 ++--
 modules/samples/droneanalyzer/pom.xml      |  4 ++--
 modules/samples/firealarm/pom.xml          |  4 ++--
 modules/samples/geolocationTracker/pom.xml |  4 ++--
 modules/samples/watertank/pom.xml          |  4 ++--
 9 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/modules/samples/connectedcup/pom.xml b/modules/samples/connectedcup/pom.xml
index 523242d3..2924682a 100644
--- a/modules/samples/connectedcup/pom.xml
+++ b/modules/samples/connectedcup/pom.xml
@@ -370,13 +370,16 @@
 
     <properties>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
-        <carbon.device.mgt.version>1.1.0</carbon.device.mgt.version>
-        <carbon.device.mgt.jar.version>1.1.0</carbon.device.mgt.jar.version>
+
+        <!-- Carbon Device Management -->
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>2.1.0</carbon.device.mgt.plugin.version>
+        <carbon.iot.device.mgt.jar.version>2.1.0</carbon.iot.device.mgt.jar.version>
+
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
         <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
-        <carbon.device.mgt.plugin.version>2.1.0</carbon.device.mgt.plugin.version>
-        <carbon.iot.device.mgt.jar.version>2.1.0</carbon.iot.device.mgt.jar.version>
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!--XMPP/MQTT Version-->
diff --git a/modules/samples/connectedlap/pom.xml b/modules/samples/connectedlap/pom.xml
index f9e94a64..736e66c9 100644
--- a/modules/samples/connectedlap/pom.xml
+++ b/modules/samples/connectedlap/pom.xml
@@ -380,8 +380,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.1.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.1.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/currentsensor/pom.xml b/modules/samples/currentsensor/pom.xml
index 20fd6fcc..fb8f58bd 100644
--- a/modules/samples/currentsensor/pom.xml
+++ b/modules/samples/currentsensor/pom.xml
@@ -386,13 +386,16 @@
     </dependencyManagement>
     <properties>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
-        <carbon.device.mgt.version>1.1.0-SNAPSHOT</carbon.device.mgt.version>
+
+        <!-- Carbon Device Management -->
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+        <carbon.iot.device.mgt.jar.version>2.2.0</carbon.iot.device.mgt.jar.version>
+
         <carbon.device.mgt.jar.version>1.1.0.SNAPSHOT</carbon.device.mgt.jar.version>
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
         <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
-        <carbon.device.mgt.plugin.version>2.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
-        <carbon.iot.device.mgt.jar.version>2.1.0.SNAPSHOT</carbon.iot.device.mgt.jar.version>
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
         <commons-io.version>2.4</commons-io.version>
 
diff --git a/modules/samples/digitaldisplay/pom.xml b/modules/samples/digitaldisplay/pom.xml
index f1373f1f..f10fa76c 100644
--- a/modules/samples/digitaldisplay/pom.xml
+++ b/modules/samples/digitaldisplay/pom.xml
@@ -461,8 +461,11 @@
 
     <properties>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
-        <carbon.device.mgt.version>1.1.0-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.jar.version>1.1.0.SNAPSHOT</carbon.device.mgt.jar.version>
+
+        <!-- Carbon Device Management -->
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
+
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
         <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
diff --git a/modules/samples/doormanager/pom.xml b/modules/samples/doormanager/pom.xml
index c13cd3d8..4c9bdd3c 100644
--- a/modules/samples/doormanager/pom.xml
+++ b/modules/samples/doormanager/pom.xml
@@ -390,8 +390,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.1.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.1.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/droneanalyzer/pom.xml b/modules/samples/droneanalyzer/pom.xml
index 4d2738d1..9cbc581c 100644
--- a/modules/samples/droneanalyzer/pom.xml
+++ b/modules/samples/droneanalyzer/pom.xml
@@ -380,8 +380,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.1.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.1.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/firealarm/pom.xml b/modules/samples/firealarm/pom.xml
index 44617562..6f97460b 100644
--- a/modules/samples/firealarm/pom.xml
+++ b/modules/samples/firealarm/pom.xml
@@ -380,8 +380,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.1.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.1.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/geolocationTracker/pom.xml b/modules/samples/geolocationTracker/pom.xml
index f62a3c5b..caa0f26b 100644
--- a/modules/samples/geolocationTracker/pom.xml
+++ b/modules/samples/geolocationTracker/pom.xml
@@ -380,8 +380,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.1.1-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.1.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>
diff --git a/modules/samples/watertank/pom.xml b/modules/samples/watertank/pom.xml
index ac31232c..6d0c47ba 100644
--- a/modules/samples/watertank/pom.xml
+++ b/modules/samples/watertank/pom.xml
@@ -371,8 +371,8 @@
         <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.1.0</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>2.1.0</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>1.2.0</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>2.2.0</carbon.device.mgt.plugin.version>
 
         <carbon.commons.version>4.4.8</carbon.commons.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>