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/07/03 07:57:05 UTC

[sling-org-apache-sling-jcr-jackrabbit-base] branch master updated: SLING-11419: Upgrade to sling 48 (#1)

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-jackrabbit-base.git


The following commit(s) were added to refs/heads/master by this push:
     new 5478680  SLING-11419: Upgrade to sling 48 (#1)
5478680 is described below

commit 5478680b1f719395dd3f78b04f3419f2b5c4c189
Author: Ashok Pelluru <37...@users.noreply.github.com>
AuthorDate: Sun Jul 3 09:57:00 2022 +0200

    SLING-11419: Upgrade to sling 48 (#1)
    
    * SLING-11419: Upgrade to sling 48
---
 pom.xml                                            | 33 +++++++---------------
 .../jackrabbit/base/config/OsgiBeanFactory.java    |  3 +-
 .../security/MultiplexingAuthorizableAction.java   |  7 +++--
 .../jcr/jackrabbit/base/security/package-info.java |  4 +--
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index 03af4c8..461dcf0 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>16</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>48</version>
         <relativePath/>
     </parent>
 
     <artifactId>org.apache.sling.jcr.jackrabbit.base</artifactId>
-    <packaging>bundle</packaging>
     <version>0.0.1-SNAPSHOT</version>
 
     <name>Apache Sling JCR Jackrabbit Base</name>
@@ -42,20 +41,15 @@
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-jcr-jackrabbit-base.git</url>
     </scm>
 
+    <properties>
+        <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
+    </properties>
+
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <configuration>
-                    <!-- Skip the check for JDK 5 API -->
-                    <skip>true</skip>
-                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -64,7 +58,6 @@
         <dependency>
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
-            <version>2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -76,18 +69,13 @@
         <!-- OSGi Libraries -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>4.2.0</version>
+            <artifactId>osgi.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>4.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>biz.aQute</groupId>
-            <artifactId>bndlib</artifactId>
-            <version>1.50.0</version>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -105,5 +93,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
 </project>
diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/base/config/OsgiBeanFactory.java b/src/main/java/org/apache/sling/jcr/jackrabbit/base/config/OsgiBeanFactory.java
index 3ec4e08..f04002e 100644
--- a/src/main/java/org/apache/sling/jcr/jackrabbit/base/config/OsgiBeanFactory.java
+++ b/src/main/java/org/apache/sling/jcr/jackrabbit/base/config/OsgiBeanFactory.java
@@ -25,6 +25,7 @@ import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -156,7 +157,7 @@ public class OsgiBeanFactory implements BeanFactory, ServiceTrackerCustomizer {
         //TODO Review the thread safety aspect
         ServiceRegistration reg = beanFactoryReg;
         if (reg == null) {
-            beanFactoryReg = bundleContext.registerService(BeanFactory.class.getName(), this, new Properties());
+            beanFactoryReg = bundleContext.registerService(BeanFactory.class.getName(), this, new Hashtable<>());
             log.info("All dependencies are satisfied. Registering the BeanFactory instance");
         }
     }
diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/base/security/MultiplexingAuthorizableAction.java b/src/main/java/org/apache/sling/jcr/jackrabbit/base/security/MultiplexingAuthorizableAction.java
index 5a2fd3d..f904bf5 100644
--- a/src/main/java/org/apache/sling/jcr/jackrabbit/base/security/MultiplexingAuthorizableAction.java
+++ b/src/main/java/org/apache/sling/jcr/jackrabbit/base/security/MultiplexingAuthorizableAction.java
@@ -21,6 +21,7 @@ package org.apache.sling.jcr.jackrabbit.base.security;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Hashtable;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -59,9 +60,9 @@ public class MultiplexingAuthorizableAction extends AbstractAuthorizableAction i
         this.tracker = new ServiceTracker(context, createFilter(context),this);
         this.tracker.open();
 
-        Properties p = new Properties();
-        p.setProperty("jackrabbit.extension","true");
-        reg = context.registerService(AuthorizableAction.class.getName(),this,p);
+        Hashtable<String, String> properties = new Hashtable<>();
+        properties.put("jackrabbit.extension","true");
+        reg = context.registerService(AuthorizableAction.class.getName(),this, properties);
     }
 
     //~----------------------------------------<AuthorizableAction>
diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/base/security/package-info.java b/src/main/java/org/apache/sling/jcr/jackrabbit/base/security/package-info.java
index 36bb8cb..39bf937 100644
--- a/src/main/java/org/apache/sling/jcr/jackrabbit/base/security/package-info.java
+++ b/src/main/java/org/apache/sling/jcr/jackrabbit/base/security/package-info.java
@@ -23,8 +23,6 @@
  * @version 1.0
  */
 @Version("1.0")
-@Export(optional = "provide:=true")
 package org.apache.sling.jcr.jackrabbit.base.security;
 
-import aQute.bnd.annotation.Export;
-import aQute.bnd.annotation.Version;
\ No newline at end of file
+import org.osgi.annotation.versioning.Version;
\ No newline at end of file