From 1fec4b3289c205809ca6871e286791ebc1938172 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Mon, 30 Jan 2017 23:56:00 +0530
Subject: [PATCH 1/3] Removed unwanted dependency

---
 modules/integration/tests-integration/pom.xml | 10 ++++------
 pom.xml                                       |  6 ------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index 57a0e5bd..f0a50005 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -31,8 +31,6 @@
     <description>Backend Integration Tests for WSO2 IOT Server.</description>
     <packaging>jar</packaging>
 
-
-
     <build>
         <plugins>
             <plugin>
@@ -46,7 +44,7 @@
                         <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
                     </suiteXmlFiles>
 
-                    <skipTests>${skipTests}</skipTests>
+                    <!--<skipTests>${skipTests}</skipTests>-->
 
                     <systemProperties>
                         <property>
@@ -269,8 +267,8 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <skipTests>true</skipTests>
-    </properties>
+    <!--<properties>-->
+        <!--<skipTests>true</skipTests>-->
+    <!--</properties>-->
 
 </project>
diff --git a/pom.xml b/pom.xml
index 94a44b07..517a5812 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,12 +297,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.iot</groupId>
-                <artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
-                <version>${product.iot.version}</version>
-                <scope>test</scope>
-            </dependency>
 
             <!--Carbon Kernel Dependencies-->
             <dependency>

From 756ecb17692fb055ca017fbcc6f18f07901a87f5 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Tue, 31 Jan 2017 01:29:54 +0530
Subject: [PATCH 2/3] Enabled backend integration tests in the build

---
 modules/integration/tests-integration/pom.xml                 | 4 ----
 .../test/java/org/wso2/iot/integration/common/Constants.java  | 2 +-
 modules/integration/tests-iot-web-ui/pom.xml                  | 1 +
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index f0a50005..9b44bbd6 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -245,10 +245,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.wso2.iot</groupId>
-            <artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.automation</groupId>
             <artifactId>org.wso2.carbon.automation.engine</artifactId>
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
index 915dbac8..d80a0042 100644
--- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
+++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
@@ -144,7 +144,7 @@ public final class Constants {
     }
 
     public static final class AndroidOperations {
-        private final String PAYLOAD_COMMON = "["+DEVICE_ID+"]";
+        private static final String PAYLOAD_COMMON = "["+DEVICE_ID+"]";
 
         public static final String OPERATION_PAYLOAD_FILE_NAME = "android-operation-payloads.json";
         public static final String OPERATIONS_GROUP = "operations";
diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml
index 3aab2b9e..779940fb 100644
--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@@ -250,6 +250,7 @@
         <dependency>
             <groupId>org.wso2.iot</groupId>
             <artifactId>org.wso2.carbon.iot.core.integration.ui.pages</artifactId>
+            <version>${product.iot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.automation</groupId>

From 98f5e86fd995ed629b12da0b92d14f66569e0198 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena <menaka@wso2.com>
Date: Tue, 31 Jan 2017 01:30:33 +0530
Subject: [PATCH 3/3] Bumped cdmf version to the latest release.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 517a5812..b66e1742 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1541,7 +1541,7 @@
         <product.iot.version>3.1.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>3.0.8</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.9</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.35</carbon.api.mgt.version>