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/01 10:21:27 UTC
[sling-org-apache-sling-caconfig-spi] branch
feature/SLING-8824-parent25 created (now 12e3deb)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a change to branch feature/SLING-8824-parent25
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git.
at 12e3deb SLING-8824 update package version because bnd-baseline-maven-plugin complains about added null-annotations (although they were already present in the last release)
This branch includes the following new commits:
new dc45986 SLING-8824 caconfig: Upgrade to parent pom 35
new 12e3deb SLING-8824 update package version because bnd-baseline-maven-plugin complains about added null-annotations (although they were already present in the last release)
The 2 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-spi] 01/02: SLING-8824 caconfig:
Upgrade to parent pom 35
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-parent25
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git
commit dc45986ded3dac76473a313780441f08413c5bb5
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Nov 1 11:19:23 2019 +0100
SLING-8824 caconfig: Upgrade to parent pom 35
---
pom.xml | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6d91c81..27e34cb 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.spi</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>1.3.5-SNAPSHOT</version>
<name>Apache Sling Context-Aware Configuration SPI</name>
<description>Apache Sling Context-Aware Configuration SPI</description>
@@ -43,15 +43,23 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <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.apache.sling</groupId>
<artifactId>org.apache.sling.caconfig.api</artifactId>
<version>1.1.0</version>
@@ -60,7 +68,6 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>16.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
[sling-org-apache-sling-caconfig-spi] 02/02: SLING-8824 update
package version because bnd-baseline-maven-plugin complains about added
null-annotations (although they were already present in the last release)
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-parent25
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-caconfig-spi.git
commit 12e3deb7cd54fa22df8f770cb2e69a91ad3afd84
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Nov 1 11:20:45 2019 +0100
SLING-8824 update package version because bnd-baseline-maven-plugin complains about added null-annotations (although they were already present in the last release)
---
src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java | 2 +-
src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java | 2 +-
src/main/java/org/apache/sling/caconfig/spi/package-info.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java b/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java
index f5f378b..aae7f84 100644
--- a/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java
+++ b/src/main/java/org/apache/sling/caconfig/resource/spi/package-info.java
@@ -19,5 +19,5 @@
/**
* SPI for applications hooking into the configuration resource infrastructure for parameterizing and customizing.
*/
-@org.osgi.annotation.versioning.Version("2.1.1")
+@org.osgi.annotation.versioning.Version("2.1.2")
package org.apache.sling.caconfig.resource.spi;
diff --git a/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java b/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java
index 63a7b59..03b88e6 100644
--- a/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java
+++ b/src/main/java/org/apache/sling/caconfig/spi/metadata/package-info.java
@@ -19,5 +19,5 @@
/**
* Defining configuration and parameter metadata for the SPI.
*/
-@org.osgi.annotation.versioning.Version("2.0.1")
+@org.osgi.annotation.versioning.Version("2.0.2")
package org.apache.sling.caconfig.spi.metadata;
diff --git a/src/main/java/org/apache/sling/caconfig/spi/package-info.java b/src/main/java/org/apache/sling/caconfig/spi/package-info.java
index a78bcd5..c636c0a 100644
--- a/src/main/java/org/apache/sling/caconfig/spi/package-info.java
+++ b/src/main/java/org/apache/sling/caconfig/spi/package-info.java
@@ -19,5 +19,5 @@
/**
* SPI for applications hooking into the configuration infrastructure for parameterizing and customizing.
*/
-@org.osgi.annotation.versioning.Version("2.1.1")
+@org.osgi.annotation.versioning.Version("2.1.2")
package org.apache.sling.caconfig.spi;