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:14 UTC
[sling-org-apache-sling-caconfig-api] branch
feature/SLING-8824-parent25 created (now 0781c4c)
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-api.git.
at 0781c4c 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 c563d53 SLING-8824 caconfig: Upgrade to parent pom 35
new 0781c4c 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-api] 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-api.git
commit 0781c4c940f3f04c6054775aa8aec53d3bb9dfc6
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Nov 1 11:20:34 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/package-info.java | 2 +-
src/main/java/org/apache/sling/caconfig/resource/package-info.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/caconfig/package-info.java b/src/main/java/org/apache/sling/caconfig/package-info.java
index e78110d..b53ea70 100644
--- a/src/main/java/org/apache/sling/caconfig/package-info.java
+++ b/src/main/java/org/apache/sling/caconfig/package-info.java
@@ -19,5 +19,5 @@
/**
* API for accessing context-aware configuration.
*/
-@org.osgi.annotation.versioning.Version("1.1.0")
+@org.osgi.annotation.versioning.Version("1.1.1")
package org.apache.sling.caconfig;
diff --git a/src/main/java/org/apache/sling/caconfig/resource/package-info.java b/src/main/java/org/apache/sling/caconfig/resource/package-info.java
index 6577b50..6b52bcc 100644
--- a/src/main/java/org/apache/sling/caconfig/resource/package-info.java
+++ b/src/main/java/org/apache/sling/caconfig/resource/package-info.java
@@ -20,5 +20,5 @@
* API for accessing context-aware configuration resources.
* This is a low-level API.
*/
-@org.osgi.annotation.versioning.Version("1.0.1")
+@org.osgi.annotation.versioning.Version("1.0.2")
package org.apache.sling.caconfig.resource;
[sling-org-apache-sling-caconfig-api] 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-api.git
commit c563d5356875a2f236a511f911ec6b9842af9423
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Fri Nov 1 11:18:21 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 763c244..3ec19b2 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.api</artifactId>
- <packaging>bundle</packaging>
+ <packaging>jar</packaging>
<version>1.2.1-SNAPSHOT</version>
<name>Apache Sling Context-Aware Configuration API</name>
<description>Apache Sling Context-Aware Configuration API</description>
@@ -43,18 +43,25 @@
<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.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>16.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>