SLING-7575 upgrade to newest bundle-maven-plugin, include some common
instructions for that plugin in the configuration
diff --git a/pom.xml b/pom.xml
index 66433d1..74bee59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,12 +135,12 @@
</goals>
<configuration>
<rules>
- <!-- Require Java 7 or higher for building (as bnd since version 3.0 is built with Java 7) -->
+ <!-- Require Java 8 or higher for building (as bnd since version 4.0 only supports Java 8, https://github.com/bndtools/bnd/wiki/Changes-in-4.0.0) -->
<requireJavaVersion>
<message>
- Apache Sling must be compiled with Java 7 or higher
+ Apache Sling must be compiled with Java 8 or higher
</message>
- <version>1.7.0</version>
+ <version>1.8.0</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.3.9</version>
@@ -370,12 +370,36 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <version>3.5.0</version>
+ <version>4.0.0</version>
<executions>
<execution>
<goals>
<goal>bnd-process</goal>
</goals>
+ <configuration>
+ <bnd><![CDATA[
+Bundle-Category: sling
+
+Bundle-Description: ${project.description}
+
+Bundle-DocURL: https://sling.apache.org
+
+Bundle-License: Apache License, Version 2.0
+
+Bundle-Vendor: The Apache Software Foundation
+
+# export all versioned packages by default
+# overwrite with "${removeall;${packages;VERSIONED};${packages;CONDITIONAL}}" in your project,
+# in case you have conditional packages (compare with https://github.com/bndtools/bnd/issues/2131)
+# this currently cannot be done globally, as bnd 4.0 doesn't support empty package groups in macro
+# removeall (https://groups.google.com/d/msg/bndtools-users/d8K2FTzJdeQ/JeVbVvncAAAJ)
+-exportcontents: ${packages;VERSIONED}
+
+# overwrite timestamp format used as qualifier for snapshots to make the resolution higher (i.e. make them differ for each build),
+# compare with https://www.mail-archive.com/dev@sling.apache.org/msg76177.html
+-snapshot: ${tstamp;yyyyMMddHHmmssSSS}
+ ]]></bnd>
+ </configuration>
</execution>
</executions>
</plugin>
