commit 98c09913e6decd6e06c9d6a9714be4780f612912
author Carsten Ziegeler <cziegeler@apache.org> Wed Jan 15 07:03:40 2020 +0100
committer Carsten Ziegeler <cziegeler@apache.org> Wed Jan 15 07:03:40 2020 +0100
tree 3fa054ed9771f98383c5a22eb219efd4b944d974
parent f8d2112c601a54fec3dd7ea096fe02d27a72b92b

Update to parent pom 35

bnd.bnd

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..f9055a5
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,6 @@
+Import-Package:\
+  javax.servlet;javax.servlet.http;version="[2.6,4)",\
+  javax.servlet.descriptor;version="[2.6,4)",\
+  org.osgi.service.useradmin;resolution:=optional,\
+  *
+

pom.xml

diff --git a/pom.xml b/pom.xml
index 9e02ccb..1e0133c 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>34</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>35</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.engine</artifactId>
-    <packaging>bundle</packaging>
     <version>2.6.23-SNAPSHOT</version>
 
     <name>Apache Sling Engine Implementation</name>
@@ -40,7 +39,7 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-engine.git</url>
-      <tag>HEAD</tag>
+        <tag>HEAD</tag>
   </scm>
 
     <properties>
@@ -51,20 +50,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>4.1.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>
-                            javax.servlet;javax.servlet.http;version="[2.6,4)",
-                            javax.servlet.descriptor;version="[2.6,4)",
-                            org.osgi.service.useradmin;resolution:=optional,
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-baseline-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -115,7 +106,6 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.component</artifactId>
-            <version>1.3.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -209,8 +199,20 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
-            <version>5.0.0</version>
+            <artifactId>org.osgi.service.event</artifactId>
+            <version>1.4.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.log</artifactId>
+            <version>1.3.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+            <version>1.5.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>