From 4347c9aca91c53c56a7205d5cf7b6fd278844bdb Mon Sep 17 00:00:00 2001
From: Janak Amarasena <janakamarasena@gmail.com>
Date: Fri, 9 Jun 2017 14:47:53 +0530
Subject: [PATCH 1/2] Update CDM and Plugins version

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 04b80c00..488325ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1512,7 +1512,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>2.0.69</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.74</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1520,7 +1520,7 @@
 
         <!-- Carbon Device Management Plugins-->
 
-        <carbon.device.mgt.plugin.version>3.0.37</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.41</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>

From 6b5d4bf05f5d0b21c62ebfc53e3fa35cae463dfb Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
Date: Sat, 10 Jun 2017 23:46:24 +0530
Subject: [PATCH 2/2] Increasing the timeout

---
 .../common/extensions/CarbonServerManagerExtension.java      | 3 ++-
 .../mobileDevice/MobileDeviceManagementWithNoDevices.java    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
index cd2074df..cbf21428 100644
--- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
+++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CarbonServerManagerExtension.java
@@ -102,7 +102,8 @@ public class CarbonServerManagerExtension {
 
                     }
                 });
-                ClientConnectionUtil.waitForPort(defaultHttpPort + this.portOffset, 300000L, false, (String)this.automationContext.getInstance().getHosts().get("default"));
+                ClientConnectionUtil.waitForPort(defaultHttpPort + this.portOffset, DEFAULT_START_STOP_WAIT_MS, false, (String)this
+                        .automationContext.getInstance().getHosts().get("default"));
                 long time = System.currentTimeMillis() + 60000L;
 
                 while(true) {
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
index 9202331b..1e729462 100644
--- a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
+++ b/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
@@ -58,9 +58,10 @@ public class MobileDeviceManagementWithNoDevices extends TestBase {
 
         while (!checkScopes(Constants.APIApplicationRegistration.PERMISSION_LIST)) {
             TimeUnit.SECONDS.sleep(5);
-            long WAIT_TIME = 30000;
+            long WAIT_TIME = 40000;
             if (System.currentTimeMillis() - startTime > WAIT_TIME) {
-                Assert.fail("Required APIs are not deployed after waiting for " + WAIT_TIME + " time-out has happened");
+                Assert.fail("Required APIs are not deployed after waiting for " + WAIT_TIME + " ms time-out has "
+                        + "happened");
             }
         }
     }