commit 019d6fd6fbf66775ffe3cc9aa27d970713018c4b
author Oliver Lietz <olli@apache.org> Wed Jun 02 21:37:59 2021 +0200
committer Oliver Lietz <olli@apache.org> Wed Jun 02 21:37:59 2021 +0200
tree 03bc813426510d8ec446c48392b1fad3d5ccdf38
parent 5b7f9ed67dc6d109bf05c15ac925011d41557e70

SLING-10453 Update to Sling Bundle Parent 41

bnd.bnd

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..5ad716a
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,7 @@
+ScriptEngine-Name: ${project.name}
+
+ScriptEngine-Version: ${project.version}
+
+-removeheaders:\
+  Include-Resource,\
+  Private-Package

pom.xml

diff --git a/pom.xml b/pom.xml
index 140b6dd..dcb6b33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,14 +23,13 @@
 
   <parent>
     <groupId>org.apache.sling</groupId>
-    <artifactId>sling</artifactId>
-    <version>30</version>
+    <artifactId>sling-bundle-parent</artifactId>
+    <version>41</version>
     <relativePath />
   </parent>
 
   <artifactId>org.apache.sling.scripting.java</artifactId>
   <version>2.1.7-SNAPSHOT</version>
-  <packaging>bundle</packaging>
 
   <name>Apache Sling Scripting Java</name>
   <description>Support for scripting Java</description>
@@ -45,17 +44,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
-            <ScriptEngine-Version>${project.version}</ScriptEngine-Version>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
@@ -69,12 +57,35 @@
   </build>
 
   <dependencies>
+    <!-- javax -->
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- OSGi -->
     <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>org.osgi</groupId>
+      <artifactId>org.osgi.service.metatype.annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <!-- Apache Sling -->
+    <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.api</artifactId>
       <version>2.11.0</version>
@@ -104,20 +115,11 @@
       <version>1.2.0</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-    </dependency>
+    <!-- logging -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-      <version>1</version>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 
 </project>