This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
The following commit(s) were added to refs/heads/master by this push:
new 53b029a SLING-8978 sling-mock: Update Dependencies to 2017 suppress
deprecation warnings for JCR PathMapper service
53b029a is described below
commit 53b029af8ddc25e51a7feff61568ebf350d613b4
Author: sseifert <[email protected]>
AuthorDate: Thu Jan 9 17:02:15 2020 +0100
SLING-8978 sling-mock: Update Dependencies to 2017
suppress deprecation warnings for JCR PathMapper service
---
core/pom.xml | 26 +++++++++++++---------
.../sling/ResourceResolverFactoryInitializer.java | 18 +++++++++++++--
junit4/pom.xml | 6 ++---
junit5/pom.xml | 6 ++---
parent/pom.xml | 4 ++--
pom.xml | 2 +-
relocate/pom.xml | 2 +-
7 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 8972ac3..64bcd1f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -80,56 +80,56 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.api</artifactId>
- <version>1.2.2</version>
+ <version>1.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.models.impl</artifactId>
- <version>1.2.2</version>
+ <version>1.3.8</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.11.0</version>
+ <version>2.16.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resourceresolver</artifactId>
- <version>1.4.8</version>
+ <version>1.5.22</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.api</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.7.4</version>
+ <version>2.9.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.api</artifactId>
- <version>2.1.8</version>
+ <version>2.1.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.core</artifactId>
- <version>2.0.36</version>
+ <version>2.0.44</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.mime</artifactId>
- <version>2.1.8</version>
+ <version>2.1.10</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -186,6 +186,12 @@
<version>2.11.3</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-jcr</artifactId>
+ <version>1.6.1</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git
a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
index 2ede7ab..b1d7ea5 100644
---
a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
+++
b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.testing.mock.sling;
+import java.lang.reflect.Field;
+import java.lang.reflect.Proxy;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -40,6 +42,7 @@ import org.jetbrains.annotations.Nullable;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.event.EventAdmin;
+import org.slf4j.Logger;
/**
* Initializes Sling Resource Resolver factories with JCR-resource mapping.
@@ -90,10 +93,21 @@ class ResourceResolverFactoryInitializer {
if (bundleContext.getServiceReference(DynamicClassLoaderManager.class)
== null) {
bundleContext.registerService(DynamicClassLoaderManager.class, new
MockDynamicClassLoaderManager(), null);
}
-
+
try {
Class pathMapperClass =
Class.forName("org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper");
- registerServiceIfNotPresent(bundleContext, pathMapperClass,
pathMapperClass.newInstance());
+ Object pathMapper = pathMapperClass.newInstance();
+ // eliminate logger in class to suppress deprecation warnings
+ try {
+ Field pathMapperLoggerField =
pathMapperClass.getDeclaredField("log");
+ pathMapperLoggerField.setAccessible(true);
+ pathMapperLoggerField.set(pathMapper,
Proxy.newProxyInstance(Logger.class.getClassLoader(),
+ new Class[] { Logger.class },
+ (proxy, method, methodArgs) -> { return null; }));
+ } catch (Exception ex) {
+ // ignore
+ }
+ registerServiceIfNotPresent(bundleContext, pathMapperClass,
pathMapper);
}
catch (ClassNotFoundException | InstantiationException |
IllegalAccessException ex) {
// ignore - service was removed in org.apache.sling.jcr.resource
3.0.0
diff --git a/junit4/pom.xml b/junit4/pom.xml
index eddef41..08a2d15 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -48,13 +48,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/junit5/pom.xml b/junit5/pom.xml
index a7f7762..11d06ed 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -48,13 +48,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.core</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index d7eb0c8..a94998b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Sling Testing Sling Mock Parent</name>
@@ -40,7 +40,7 @@
<jcr-mock.version>1.4.4</jcr-mock.version>
<resourceresolver-mock.version>1.1.24</resourceresolver-mock.version>
<logging-mock.version>2.0.0</logging-mock.version>
- <servlet-helpers.version>1.3.1-SNAPSHOT</servlet-helpers.version>
+ <servlet-helpers.version>1.3.0</servlet-helpers.version>
<resourcebuilder.version>1.0.4</resourcebuilder.version>
</properties>
diff --git a/pom.xml b/pom.xml
index 3ced862..b84daab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
diff --git a/relocate/pom.xml b/relocate/pom.xml
index 62573cb..419ab9c 100644
--- a/relocate/pom.xml
+++ b/relocate/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock.parent</artifactId>
- <version>2.3.19-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
