SLING-7891 Use bnd Maven plugins
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..24d7c8e
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,16 @@
+DynamicImport-Package:\
+ org.apache.felix.inventory
+
+Provide-Capability:\
+ osgi.service;objectClass=org.apache.sling.serviceusermapping.ServiceUserMapped
+
+Import-Package:\
+ org.apache.felix.inventory;resolution:=optional,\
+ *
+
+-includeresource:\
+ @org.apache.felix.utils-*.jar!/org/apache/felix/utils/json/JSONWriter*
+
+-removeheaders:\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index 3c81cb8..1c76a71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,11 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>30</version>
+ <version>34</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.serviceusermapper</artifactId>
- <packaging>bundle</packaging>
<version>1.4.1-SNAPSHOT</version>
<name>Apache Sling Service User Mapper</name>
@@ -49,26 +48,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- org.apache.felix.inventory;resolution:=optional,
- *
- </Import-Package>
- <DynamicImport-Package>
- org.apache.felix.inventory
- </DynamicImport-Package>
- <Embed-Dependency>
- org.apache.felix.utils;inline=org/apache/felix/utils/json/JSONWriter**
- </Embed-Dependency>
- <Provide-Capability>
- osgi.service;objectClass=org.apache.sling.serviceusermapping.ServiceUserMapped
- </Provide-Capability>
- </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>
@@ -106,20 +91,38 @@
<artifactId>slf4j-api</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ </dependency>
+
+ <!-- OSGi -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</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>org.osgi</groupId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.event</artifactId>
- <version>1.3.1</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
<!-- Testing -->
<dependency>
