commit fb86437f9a5f583b70dcb65146650ea85981bc94
author Ashok Pelluru <37666786+ashokmca07@users.noreply.github.com> Mon Jun 27 08:22:54 2022 +0200
committer GitHub <noreply@github.com> Mon Jun 27 08:22:54 2022 +0200
tree 89094100234158b22b8febd995d10384ea9a68b1
parent deb61fdcbcc0fd1089d5951cf54dfabb763cf5f8

SLING-11409: Upgrade to sling 48 (#2)

* SLING-11409: Upgrade to sling 48
* SLING-11409: fix dependencies scope

bnd.bnd

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..2bad25d
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+-includeresource:\
+    @org.apache.felix.utils-*.jar!/org/apache/felix/utils/json/JSONWriter.class
\ No newline at end of file

pom.xml

diff --git a/pom.xml b/pom.xml
index 4f78d33..87737b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>32</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>48</version>
     </parent>
 
     <artifactId>org.apache.sling.tooling.support.install</artifactId>
     <version>1.0.7-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Sling Tooling Support Install</name>
 
@@ -36,25 +35,8 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-tooling-support-install.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-tooling-support-install.git</url>
-      <tag>HEAD</tag>
-  </scm>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Embed-Dependency>
-                                org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter.class
-                        </Embed-Dependency>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+        <tag>HEAD</tag>
+    </scm>
     
     <dependencies>
         <dependency>
@@ -64,10 +46,17 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>