You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2019/11/07 09:03:38 UTC
[sling-org-apache-sling-caconfig-impl] branch
feature/SLING-8824-parent35 created (now 25b2cd2)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/SLING-8824-parent35
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git.
at 25b2cd2 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)
This branch includes the following new commits:
new 25b2cd2 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)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-caconfig-impl] 01/01: 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)
Posted by ss...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/SLING-8824-parent35
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-impl.git
commit 25b2cd261ab6a374c5d005a5fee864ccc7ac07d6
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Thu Nov 7 09:58:58 2019 +0100
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)
---
bnd.bnd | 8 +++++
pom.xml | 34 +++++++++-------------
.../management/multiplexer/package-info.java | 2 +-
.../sling/caconfig/management/package-info.java | 2 +-
4 files changed, 24 insertions(+), 22 deletions(-)
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;