From 3b0728fd20b45700a2114f2c4a28a31c87916c5c Mon Sep 17 00:00:00 2001
From: pramilaniroshan <pramila@entgra.io>
Date: Thu, 8 Jun 2023 12:43:09 +0530
Subject: [PATCH 1/3] Remove App Manager Feature

---
 iot-core/pom.xml | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/iot-core/pom.xml b/iot-core/pom.xml
index a63a8f4..b284706 100644
--- a/iot-core/pom.xml
+++ b/iot-core/pom.xml
@@ -349,15 +349,6 @@
                                 </featureArtifactDef>
                                 <!-- End of SMS Management Features -->
 
-                                <!-- App Manager Features-->
-                                <featureArtifactDef>
-                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version}
-                                </featureArtifactDef>
-                                <!-- End of New App Manager Features-->
-
                                 <featureArtifactDef>
                                     io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
@@ -428,17 +419,6 @@
                                 </feature>
                                 <!--End of Grafana Management Features-->
 
-                                <!--App Manager Features-->
-                                <feature>
-                                    <id>io.entgra.device.mgt.core.application.mgt.api.feature.group</id>
-                                    <version>${io.entgra.device.mgt.core.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>io.entgra.device.mgt.core.application.mgt.server.feature.group</id>
-                                    <version>${io.entgra.device.mgt.core.version}</version>
-                                </feature>
-                                <!--End of App Manager Features-->
-
                                 <!--SMS Management Features-->
                                 <feature>
                                     <id>io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature.group</id>

From 3f542be0a01d28914aeee97717a9b38d31669af6 Mon Sep 17 00:00:00 2001
From: pramilaniroshan <pramila@entgra.io>
Date: Thu, 8 Jun 2023 13:02:06 +0530
Subject: [PATCH 2/3] Revert "Remove App Manager Feature"

This reverts commit 3b0728fd20b45700a2114f2c4a28a31c87916c5c.
---
 iot-core/pom.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/iot-core/pom.xml b/iot-core/pom.xml
index b284706..a63a8f4 100644
--- a/iot-core/pom.xml
+++ b/iot-core/pom.xml
@@ -349,6 +349,15 @@
                                 </featureArtifactDef>
                                 <!-- End of SMS Management Features -->
 
+                                <!-- App Manager Features-->
+                                <featureArtifactDef>
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version}
+                                </featureArtifactDef>
+                                <!-- End of New App Manager Features-->
+
                                 <featureArtifactDef>
                                     io.entgra.device.mgt.core:io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
@@ -419,6 +428,17 @@
                                 </feature>
                                 <!--End of Grafana Management Features-->
 
+                                <!--App Manager Features-->
+                                <feature>
+                                    <id>io.entgra.device.mgt.core.application.mgt.api.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>io.entgra.device.mgt.core.application.mgt.server.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
+                                </feature>
+                                <!--End of App Manager Features-->
+
                                 <!--SMS Management Features-->
                                 <feature>
                                     <id>io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature.group</id>

From b89df459784c900cc52635a3f02ee74e9d2f1031 Mon Sep 17 00:00:00 2001
From: pramilaniroshan <pramila@entgra.io>
Date: Thu, 8 Jun 2023 13:07:48 +0530
Subject: [PATCH 3/3] Remove App Manager API Feature

---
 iot-core/pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/iot-core/pom.xml b/iot-core/pom.xml
index a63a8f4..2b103ab 100644
--- a/iot-core/pom.xml
+++ b/iot-core/pom.xml
@@ -350,9 +350,6 @@
                                 <!-- End of SMS Management Features -->
 
                                 <!-- App Manager Features-->
-                                <featureArtifactDef>
-                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.api.feature:${io.entgra.device.mgt.core.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     io.entgra.device.mgt.core:io.entgra.device.mgt.core.application.mgt.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
@@ -429,10 +426,6 @@
                                 <!--End of Grafana Management Features-->
 
                                 <!--App Manager Features-->
-                                <feature>
-                                    <id>io.entgra.device.mgt.core.application.mgt.api.feature.group</id>
-                                    <version>${io.entgra.device.mgt.core.version}</version>
-                                </feature>
                                 <feature>
                                     <id>io.entgra.device.mgt.core.application.mgt.server.feature.group</id>
                                     <version>${io.entgra.device.mgt.core.version}</version>