commit 184e3fb9c91fdaefe51bad631be0301e60b1f33d
author Stefan Seifert <stefanseifert@users.noreply.github.com> Thu May 05 14:36:19 2022 +0200
committer Stefan Seifert <stefanseifert@users.noreply.github.com> Thu May 05 17:32:24 2022 +0200
tree b2265e9a6045664ec9be336d7c3d296538ce6c78
parent ad75adc10a061e50e427db998d9f8e5866a7f1ad

SLING-11295 Update Dependencies to 2020

pom.xml

diff --git a/pom.xml b/pom.xml
index fa50bda..5d9fe22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling-bundle-parent</artifactId>
-        <version>46</version>
+        <version>47</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
-    <version>1.2.7-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
 
     <name>Apache Sling Testing Resource Resolver Mock</name>
     <description>
@@ -122,13 +122,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.7.0</version>
+            <version>4.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.6</version>
+            <version>3.9</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -138,22 +138,22 @@
             <dependency>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>org.apache.sling.api</artifactId>
-                <version>2.21.0</version>
+                <version>2.22.0</version>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.service.event</artifactId>
-                <version>1.3.1</version>
+                <version>1.4.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.jackrabbit</groupId>
                 <artifactId>jackrabbit-jcr-commons</artifactId>
-                <version>2.16.0</version>
+                <version>2.20.1</version>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
@@ -163,7 +163,7 @@
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.util.function</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -179,12 +179,12 @@
                     <dependency>
                         <groupId>org.apache.sling</groupId>
                         <artifactId>org.apache.sling.api</artifactId>
-                        <version>2.24.0</version>
+                        <version>2.25.0</version>
                     </dependency>
                     <dependency>
                         <groupId>org.apache.jackrabbit</groupId>
                         <artifactId>jackrabbit-jcr-commons</artifactId>
-                        <version>2.19.3</version>
+                        <version>2.21.9</version>
                     </dependency>
                 </dependencies>
             </dependencyManagement>

src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java

diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
index 3b105f6..8cb5d1d 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
@@ -64,7 +64,7 @@
     private final MockResourceResolverFactory factory;
 
     private final Map<String,Object> attributes;
-    
+
     private Map<String,Object> propertyMap;
 
     private final List<MockFindResourcesHandler> findResourcesHandlers = new ArrayList<>();
@@ -220,7 +220,7 @@
     }
 
     @Override
-    public String @NotNull [] getSearchPath() {
+    public @NotNull String[] getSearchPath() {
         return this.options.getSearchPaths();
     }
 

src/main/java/org/apache/sling/testing/resourceresolver/package-info.java

diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/package-info.java b/src/main/java/org/apache/sling/testing/resourceresolver/package-info.java
index 70071bd..e5b6cf9 100644
--- a/src/main/java/org/apache/sling/testing/resourceresolver/package-info.java
+++ b/src/main/java/org/apache/sling/testing/resourceresolver/package-info.java
@@ -19,5 +19,5 @@
 /**
  * Apache Sling Testing Resource Resolver Mock
  */
-@org.osgi.annotation.versioning.Version("2.2")
+@org.osgi.annotation.versioning.Version("2.2.1")
 package org.apache.sling.testing.resourceresolver;