From d0a8478f23687751135199bc5b041ae941abea52 Mon Sep 17 00:00:00 2001
From: Pahansith <pahansith@entgra.io>
Date: Wed, 9 Oct 2024 18:26:56 +0530
Subject: [PATCH] pom improvements

---
 .../pom.xml                                               | 2 +-
 .../io.entgra.device.mgt.core.apimgt.annotations/pom.xml  | 8 ++++----
 .../pom.xml                                               | 4 ++--
 pom.xml                                                   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml
index 8410ece597..050a54a796 100644
--- a/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml
@@ -83,7 +83,7 @@
                         <Import-Package>
                             com.google.common.cache;version="[32.1,33)";resolution:=optional,
                             com.google.gson;version="[2.9,3)",
-                            io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception;version="${io.entgra.device.mgt.core.version.range}",
+                            io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common.exception;version="${io.entgra.device.mgt.core.version.range}";resolution:=optional,
                             io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.bean,
                             io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config,
                             io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core.config.xml.bean,
diff --git a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml
index 3daadf4b6f..ccfa696280 100644
--- a/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml
+++ b/components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml
@@ -55,8 +55,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -72,9 +72,9 @@
                         <Export-Package>
                             io.entgra.device.mgt.core.apimgt.annotations.*
                         </Export-Package>
-                        <Embed-Dependency>
+                        <!--<Embed-Dependency>
                             scribe;scope=compile|runtime;inline=false;
-                        </Embed-Dependency>
+                        </Embed-Dependency>-->
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml
index 902aa5a801..345957f7c3 100644
--- a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml
+++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml
@@ -130,9 +130,9 @@
                                 <bundleDef>
                                     io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.webapp.publisher:${io.entgra.device.mgt.core.version}
                                 </bundleDef>
-                                <bundleDef>
+                                <!--<bundleDef>
                                     io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.application.extension:${io.entgra.device.mgt.core.version}
-                                </bundleDef>
+                                </bundleDef>-->
                                 <bundleDef>
                                     io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.annotations:${io.entgra.device.mgt.core.version}
                                 </bundleDef>
diff --git a/pom.xml b/pom.xml
index a2dc0aed74..d95b709eee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2000,7 +2000,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>5.1.9</version>
+                    <version>3.2.0</version>
                     <extensions>true</extensions>
                     <configuration>
                         <obrRepository>NONE</obrRepository>
@@ -2093,7 +2093,7 @@
         <testng.version>7.4.0</testng.version>
         <carbon.kernel.version>4.8.1</carbon.kernel.version>
         <carbon.kernel.version.range>[4.8.0, 5.0.0)</carbon.kernel.version.range>
-        <carbon.p2.plugin.version>5.2.74</carbon.p2.plugin.version>
+        <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>
 
         <!-- Axis2 -->
         <axis2.osgi.version.range>[1.6.1, 1.7.0)</axis2.osgi.version.range>