SLING-8824 caconfig: Upgrade to parent pom 35
update package version because bnd-baseline-maven-plugin complains about changes in annotations (due to switch from Java 7 to Java 8 with parent update)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..4c198f6
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,8 @@
+# WebConsole support is optional
+# Support XSS API 1.x and 2.x - we use only classes from the API with same signature in both versions
+# Remove those package imports because embedded and relocated via shade plugin (see below)
+Import-Package: \
+ org.apache.felix.webconsole;resolution:=optional,\
+ org.apache.sling.xss;version="[1.0.0,3)",\
+ !org.apache.sling.commons.osgi,\
+ *
diff --git a/pom.xml b/pom.xml
index 0520a24..099e3d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.caconfig.impl</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>1.5.1-SNAPSHOT</version>
<name>Apache Sling Context-Aware Configuration Implementation</name>
<description>Apache Sling Context-Aware Configuration Implementation</description>
@@ -43,22 +43,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- <!-- WebConsole support is optional -->
- org.apache.felix.webconsole;resolution:=optional,
- <!-- Support XSS API 1.x and 2.x - we use only classes from the API with same signature in both versions -->
- org.apache.sling.xss;version="[1.0.0,3)",
- <!-- Remove those package imports because embedded and relocated via shade plugin (see below) -->
- !org.apache.sling.commons.osgi,
- *
- </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>
@@ -109,6 +99,11 @@
</build>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Artifact is shaded and inlined -->
<dependency>
<groupId>org.apache.sling</groupId>
@@ -131,7 +126,6 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>16.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/caconfig/management/multiplexer/package-info.java b/src/main/java/org/apache/sling/caconfig/management/multiplexer/package-info.java
index 3edde37..a634a61 100644
--- a/src/main/java/org/apache/sling/caconfig/management/multiplexer/package-info.java
+++ b/src/main/java/org/apache/sling/caconfig/management/multiplexer/package-info.java
@@ -19,5 +19,5 @@
/**
* Multiplexer services provide aggregated access to all implementations of the related SPI interface.
*/
-@org.osgi.annotation.versioning.Version("1.1.1")
+@org.osgi.annotation.versioning.Version("1.1.2")
package org.apache.sling.caconfig.management.multiplexer;
diff --git a/src/main/java/org/apache/sling/caconfig/management/package-info.java b/src/main/java/org/apache/sling/caconfig/management/package-info.java
index d3fff42..0228222 100644
--- a/src/main/java/org/apache/sling/caconfig/management/package-info.java
+++ b/src/main/java/org/apache/sling/caconfig/management/package-info.java
@@ -21,5 +21,5 @@
* This API is only indented for advanced use cases like writing a configuration editor,
* not for "normal" applications just reading configuration.
*/
-@org.osgi.annotation.versioning.Version("2.2.1")
+@org.osgi.annotation.versioning.Version("2.2.2")
package org.apache.sling.caconfig.management;
