Merge remote-tracking branch 'upstream/master' into iot-master

modules/distribution/src/assembly/bin.xml

@@ -900,6 +900,13 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources</outputDirectory>
         </fileSet>
 
+        <fileSet>
+            <directory>
+                ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts
+            </directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/dbscripts</outputDirectory>
+        </fileSet>
+
         <fileSet>
             <directory>
                 src/analytics/resources/allthemes

pom.xml

@@ -1517,14 +1517,14 @@
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.52</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.57</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.41</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.47</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.95</carbon.api.mgt.version>
@@ -1638,7 +1638,7 @@
         <carbon.um.ws.version>5.1.4</carbon.um.ws.version>
 
         <!-- Cipher tool version-->
-        <cipher.tool.version>1.0.0-wso2v4</cipher.tool.version>
+        <cipher.tool.version>1.0.0-wso2v5</cipher.tool.version>
 
         <!--XMPP/MQTT Version-->
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>