From 9a3a7c2913b4744caf0e27e62b760049b28c63ac Mon Sep 17 00:00:00 2001
From: pramilaniroshan <pramila@entgra.io>
Date: Thu, 8 Jun 2023 12:50:49 +0530
Subject: [PATCH 1/3] Remove App Manager Features

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

diff --git a/uem-core/pom.xml b/uem-core/pom.xml
index 3fa349f..d79e5b6 100644
--- a/uem-core/pom.xml
+++ b/uem-core/pom.xml
@@ -350,15 +350,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>
@@ -429,17 +420,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 986c41bc04270ef312a6d5f70f5d888ae51ddeda Mon Sep 17 00:00:00 2001
From: pramilaniroshan <pramila@entgra.io>
Date: Thu, 8 Jun 2023 12:55:14 +0530
Subject: [PATCH 2/3] Revert "Remove App Manager Features"

This reverts commit 9a3a7c2913b4744caf0e27e62b760049b28c63ac.
---
 uem-core/pom.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/uem-core/pom.xml b/uem-core/pom.xml
index d79e5b6..3fa349f 100644
--- a/uem-core/pom.xml
+++ b/uem-core/pom.xml
@@ -350,6 +350,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>
@@ -420,6 +429,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 abb4e1297864e5a29ac0234561e7eb98ec949c5b Mon Sep 17 00:00:00 2001
From: pramilaniroshan <pramila@entgra.io>
Date: Thu, 8 Jun 2023 12:58:55 +0530
Subject: [PATCH 3/3] Remove App Manager API Features

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

diff --git a/uem-core/pom.xml b/uem-core/pom.xml
index 3fa349f..d87d407 100644
--- a/uem-core/pom.xml
+++ b/uem-core/pom.xml
@@ -351,9 +351,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>
@@ -430,10 +427,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>