Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0

Conflicts:
	pom.xml

modules/distribution/src/core/resources/migration/3.0.0-to-3.1.0/dbscripts/h2.sql

@@ -2,3 +2,4 @@ ALTER TABLE DM_DEVICE_TYPE  ADD COLUMN LAST_UPDATED_TIMESTAMP TIMESTAMP DEFAULT
 ALTER TABLE DM_DEVICE_TYPE  ADD COLUMN DEVICE_TYPE_META  VARCHAR(20000) DEFAULT NULL;
 ALTER TABLE DM_ENROLMENT_OP_MAPPING ADD COLUMN PUSH_NOTIFICATION_STATUS VARCHAR(50) NULL;
 UPDATE DM_ENROLMENT_OP_MAPPING SET PUSH_NOTIFICATION_STATUS = 'COMPLETED';
+ALTER TABLE DM_CONFIG_OPERATION  ADD COLUMN ENABLED BOOLEAN NOT NULL DEFAULT FALSE,

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) {

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");
             }
         }
     }

pom.xml

@@ -1511,14 +1511,14 @@
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.74-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.75-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>3.1.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>3.0.41-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.42-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>