From e85e6a462dacf44bcab708df3493f1f69b5ee82f Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Thu, 3 Jan 2019 12:03:53 +0530
Subject: [PATCH 1/2] Modify feature deploying

---
 modules/p2-profile/iot-core-profile/pom.xml | 72 +--------------------
 pom.xml                                     |  8 +--
 2 files changed, 6 insertions(+), 74 deletions(-)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 7548018a..ae06510c 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -501,14 +501,11 @@
 
                                 <!-- New App Manager Features-->
 
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.feature:${carbon.device.mgt.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.application.mgt.publisher.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}
@@ -992,18 +989,13 @@
 
                                 <!-- New App Manager Features-->
 
-                                <feature>
-                                    <id>org.wso2.carbon.device.application.mgt.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
 
                                 <feature>
-                                    <id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>
+                                    <id>org.wso2.carbon.application.mgt.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
 
@@ -2046,72 +2038,17 @@
                                     <version>${project.version}</version>
                                 </feature>
                                 <!-- End of IoTServer Features -->
-                                <!-- App management features-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
-                                    <!--<version>${appmgt.feature.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>-->
-                                    <!--<version>${appmgt.feature.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.appmgt.mobile.feature.group</id>-->
-                                    <!--<version>${appmgt.feature.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.appmgt.services.api.feature.group</id>-->
-                                    <!--<version>${appmgt.feature.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
-                                <!--</feature>-->
-								<!--<feature>-->
-									<!--<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id>-->
-									<!--<version>${appmgt.feature.version}</version>-->
-								<!--</feature>-->
-								<!--<feature>-->
-									<!--<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>-->
-									<!--<version>${appmgt.feature.version}</version>-->
-								<!--</feature>-->
-								<!--<feature>-->
-									<!--<id>org.wso2.carbon.appmgt.oauth.feature.group</id>-->
-									<!--<version>${appmgt.feature.version}</version>-->
-								<!--</feature>-->
-                                <!-- End of app management features-->
-
-                                <!-- New App Manager Features-->
-
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.application.mgt.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.version}</version>-->
-                                <!--</feature>-->
 
                                 <feature>
                                     <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
 
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.version}</version>-->
-                                <!--</feature>-->
-
                                 <feature>
                                     <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
 
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.device.application.mgt.store.ui.feature.group</id>-->
-                                    <!--<version>${carbon.device.mgt.version}</version>-->
-                                <!--</feature>-->
-
                                 <!-- End of New App Manager Features-->
 
                                 <!-- Dashboard Features -->
@@ -2736,11 +2673,6 @@
 
                                 <!-- New App Manager Features-->
 
-                                <feature>
-                                    <id>org.wso2.carbon.device.application.mgt.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
-
                                 <feature>
                                     <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
diff --git a/pom.xml b/pom.xml
index 1f06201b..923fd8c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1269,7 +1269,7 @@
             <!-- Dependencies for login ui -->
             <dependency>
                 <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
+                <artifactId>javax.servlet-api</artifactId>
                 <version>${servlet-api.version}</version>
             </dependency>
             <dependency>
@@ -1528,14 +1528,14 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.2.1-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.2.2-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.1-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.2.2-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>
@@ -1556,7 +1556,7 @@
         <orbit.tomcat.version>7.0.85.wso2v1</orbit.tomcat.version>
         <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
         <orbit.version.tomcat-servlet-api>7.0.85.wso2v1</orbit.version.tomcat-servlet-api>
-        <servlet-api.version>2.4</servlet-api.version>
+        <servlet-api.version>4.0.1</servlet-api.version>
 
         <!-- Rampart -->
         <rampart.version>1.6.1-wso2v12</rampart.version>

From 715ca227ccc333f7de907db7e405e8695f5ff7e2 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Sun, 3 Mar 2019 08:44:51 +0530
Subject: [PATCH 2/2] Add new app manager componennts bundling

---
 modules/p2-profile/iot-core-profile/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index ae06510c..b4ac27d6 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -505,7 +505,7 @@
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.application.mgt.publisher.feature:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}
@@ -995,7 +995,7 @@
                                 </feature>
 
                                 <feature>
-                                    <id>org.wso2.carbon.application.mgt.publisher.feature.group</id>
+                                    <id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>