This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-cache-api.git
The following commit(s) were added to refs/heads/master by this push:
new 26cbca5 Fix build issues and update to sling 47 (#1)
26cbca5 is described below
commit 26cbca53c3060e97a6d7ea2cbbabe4f025aa57b0
Author: Ashok Pelluru <[email protected]>
AuthorDate: Thu Mar 31 13:15:04 2022 +0200
Fix build issues and update to sling 47 (#1)
---
README.md | 2 +-
pom.xml | 34 ++++++++++------------
.../sling/commons/cache/api/package-info.java | 3 +-
3 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
index f036370..e969bc6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
[](https://sling.apache.org)
- [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-commons-cache-api/job/master/) [](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-commons-cache-api) 
[...]
+ [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-commons-cache-api/job/master/) [](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-or
[...]
# Apache Sling Commons Cache API
diff --git a/pom.xml b/pom.xml
index 1abe6e5..d04907f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,48 +22,46 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>16</version>
- <relativePath/>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>47</version>
+ <relativePath />
</parent>
<artifactId>org.apache.sling.commons.cache.api</artifactId>
<version>0.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Commons Cache API</name>
<description>
- This bundle porvides a Cache API for Sling applications to use.
+ This bundle provides a Cache API for Sling applications to use.
</description>
+ <properties>
+ <sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
+ </properties>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-cache-api.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-cache-api.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-commons-cache-api.git</url>
+ <tag>HEAD</tag>
</scm>
-
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.6</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
- <!-- used for package-info annotations -->
+ <!-- OSGi Dependencies -->
<dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- <version>1.50.0</version>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/sling/commons/cache/api/package-info.java
b/src/main/java/org/apache/sling/commons/cache/api/package-info.java
index e853d9c..4678dc9 100644
--- a/src/main/java/org/apache/sling/commons/cache/api/package-info.java
+++ b/src/main/java/org/apache/sling/commons/cache/api/package-info.java
@@ -20,5 +20,4 @@
@Version("1.0")
package org.apache.sling.commons.cache.api;
-import aQute.bnd.annotation.Version;
-
+import org.osgi.annotation.versioning.Version;
\ No newline at end of file