SLING-7889 Use bnd Maven plugins
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..8c25158
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,19 @@
+Bundle-Activator: org.apache.sling.settings.impl.Activator
+
+Bundle-DocURL: http://sling.apache.org/documentation/bundles/sling-settings-orgapacheslingsettings.html
+
+DynamicImport-Package:\
+ org.osgi.service.cm,\
+ org.apache.felix.shell
+
+Provide-Capability:\
+ osgi.service;objectClass=org.apache.sling.settings.SlingSettingsService
+
+Import-Package:\
+ org.osgi.service.cm;resolution:=optional,\
+ org.apache.felix.shell;resolution:=optional,\
+ *
+
+-removeheaders:\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index 693cb02..22ef293 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.settings</artifactId>
- <packaging>bundle</packaging>
<version>1.3.9-SNAPSHOT</version>
<name>Apache Sling Settings</name>
@@ -50,40 +49,24 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>
- http://sling.apache.org/documentation/bundles/sling-settings-orgapacheslingsettings.html
- </Bundle-DocURL>
- <Private-Package>
- org.apache.sling.settings.impl
- </Private-Package>
- <Bundle-Activator>
- org.apache.sling.settings.impl.Activator
- </Bundle-Activator>
- <DynamicImport-Package>
- org.osgi.service.cm,
- org.apache.felix.shell
- </DynamicImport-Package>
- <Import-Package>
- org.osgi.service.cm;resolution:=optional,
- org.apache.felix.shell;resolution:=optional,
- *
- </Import-Package>
- <Provide-Capability>
- osgi.service;objectClass=org.apache.sling.settings.SlingSettingsService
- </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>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
</dependency>
<dependency>
