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

modules/distribution/src/core/conf/datasources/cdm-datasources.xml

@@ -29,7 +29,7 @@
             </jndiConfig>
             <definition type="RDBMS">
                 <configuration>
-                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <url>jdbc:h2:repository/database/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000</url>
                     <username>wso2carbon</username>
                     <password>wso2carbon</password>
                     <driverClassName>org.h2.Driver</driverClassName>

modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/samples/MobileQSGTestCase.java

@@ -86,8 +86,8 @@ public class MobileQSGTestCase extends TestBase {
                 Constants.APPLICATION_JSON, accessTokenString);
         HttpResponse response = appManagerRestClient.get(Constants.QSGManagement.GET_MOBILE_APPS_ENDPONT);
         Assert.assertEquals(response.getResponseCode(), HttpStatus.SC_OK);
-        Assert.assertTrue(response.getData().contains("Catalog"),
-                "Catalog app addition through script is not successful");
+        Assert.assertTrue(response.getData().contains("NFC"),
+                "NFC app addition through script is not successful");
     }
 
     @Test(description = "This test case tests the policy creation through qsg script", dependsOnMethods = {"executeQSGScript"})

modules/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java

@@ -116,7 +116,7 @@ public class QSGExecutor {
 
         System.out.println("Upload the android application ");
         //Upload the android application
-        MobileApplication application = AppOperations.uploadApplication(Constants.DeviceType.ANDROID, "catalog.apk",
+        MobileApplication application = AppOperations.uploadApplication(Constants.DeviceType.ANDROID, "nfc-app.apk",
                                                                         "application/vnd.android.package-archive");
         if (application == null) {
             System.out.println("Unable to upload the sample android application. Terminating the IoTS QSG now.");
@@ -132,7 +132,7 @@ public class QSGExecutor {
 
         System.out.println("Create the android application ");
         //Create application entry in publisher
-        status = AppOperations.addApplication("Catalog", application, true);
+        status = AppOperations.addApplication("NFC", application, true);
         if (!status) {
             System.out.println("Unable to create the android mobile application. Terminating the IoTS QSG now.");
             System.exit(0);

pom.xml

@@ -1517,14 +1517,14 @@
         <carbon.governance.version>4.7.0</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.17</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.29</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-	    <carbon.device.mgt.plugin.version>4.0.16</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.26</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.95</carbon.api.mgt.version>