You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ap...@apache.org on 2022/06/10 14:24:43 UTC

[sling-org-apache-sling-jcr-api] branch master updated: Sling update to 47

This is an automated email from the ASF dual-hosted git repository.

apelluru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-api.git


The following commit(s) were added to refs/heads/master by this push:
     new b8f1ed1  Sling update to 47
     new c9d5f39  Merge pull request #2 from ashokmca07/master
b8f1ed1 is described below

commit b8f1ed1f3597e12e78d0c11fa2e4b2e6e47190a2
Author: Ashok Pelluru <as...@gmail.com>
AuthorDate: Mon Jun 6 20:08:09 2022 +0200

    Sling update to 47
---
 bnd.bnd |  1 +
 pom.xml | 31 +++++++++++--------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..3eb5fbe
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1 @@
+Bundle-Category: sling,jcr,jackrabbit
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3307818..5fda018 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>30</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>47</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.jcr.api</artifactId>
-    <packaging>bundle</packaging>
     <version>2.4.1-SNAPSHOT</version>
 
     <name>Apache Sling JCR API</name>
@@ -42,24 +41,13 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-api.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-api.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-jcr-api.git</url>
+        <tag>HEAD</tag>
     </scm>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Category>
-                            sling,jcr,jackrabbit
-                        </Bundle-Category>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+    <properties>
+        <sling.java.version>8</sling.java.version>
+        <project.build.outputTimestamp>1</project.build.outputTimestamp>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -69,9 +57,12 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>16.0.2</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
+        </dependency>
     </dependencies>
 
 </project>