This is an automated email from the ASF dual-hosted git repository. sseifert pushed a commit to branch feature/SLING-10045-dependency-update in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit e67b38ba2358a1414aaf397de9fedf46f7ff39e8 Author: Stefan Seifert <[email protected]> AuthorDate: Thu May 5 14:36:19 2022 +0200 SLING-10045 Update Dependencies to 2018 --- pom.xml | 18 +++++++++--------- .../testing/resourceresolver/MockResourceResolver.java | 4 ++-- .../sling/testing/resourceresolver/package-info.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index fa50bda..90d8abc 100644 --- a/pom.xml +++ b/pom.xml @@ -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> 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 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso 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 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso } @Override - public String @NotNull [] getSearchPath() { + public @NotNull String[] getSearchPath() { return this.options.getSearchPaths(); } 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 */ [email protected]("2.2") [email protected]("2.2.1") package org.apache.sling.testing.resourceresolver;
