Merge branch 'newAPPM' into 'application-manager-new'

Bump core and plugins versions in APPM

See merge request entgra/product-iots!10

modules/distribution/src/assembly/bin.xml

@@ -417,21 +417,21 @@
                 <!--<exclude>**/jaggery.conf</exclude>-->
             <!--</excludes>-->
         <!--</fileSet>-->
-        <fileSet>
-            <directory>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/store/
-            </directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store
-            </outputDirectory>
-            <excludes>
-                <exclude>storeLogo/**</exclude>
-                <exclude>storeSite/**</exclude>
-                <exclude>base-page/**</exclude>
-                <exclude>login/**</exclude>
-                <exclude>styles-layout.css</exclude>
-                <exclude>**/jaggery.conf</exclude>
-            </excludes>
-        </fileSet>
+        <!--<fileSet>-->
+            <!--<directory>-->
+                <!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/jaggeryapps/store/-->
+            <!--</directory>-->
+            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store-->
+            <!--</outputDirectory>-->
+            <!--<excludes>-->
+                <!--<exclude>storeLogo/**</exclude>-->
+                <!--<exclude>storeSite/**</exclude>-->
+                <!--<exclude>base-page/**</exclude>-->
+                <!--<exclude>login/**</exclude>-->
+                <!--<exclude>styles-layout.css</exclude>-->
+                <!--<exclude>**/jaggery.conf</exclude>-->
+            <!--</excludes>-->
+        <!--</fileSet>-->
 
         <!-- Copying API Manager Store Jaggery app -->
         <fileSet>
@@ -1617,13 +1617,13 @@
             </outputDirectory>
             <fileMode>755</fileMode>
         </file>
-        <file>
-            <source>src/core/jaggeryapps/store/jaggery.conf</source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store/
-            </outputDirectory>
-            <fileMode>755</fileMode>
-        </file>
+        <!--<file>-->
+            <!--<source>src/core/jaggeryapps/store/jaggery.conf</source>-->
+            <!--<outputDirectory>-->
+                <!--${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/store/-->
+            <!--</outputDirectory>-->
+            <!--<fileMode>755</fileMode>-->
+        <!--</file>-->
         <file>
             <source>src/core/jaggeryapps/windows-web-agent/jaggery.conf</source>
             <outputDirectory>

pom.xml

@@ -1528,14 +1528,14 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.2.2-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.2.5-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.1.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.2.2-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.2.5-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>