svn commit: r1660759 - in /sling/trunk/testing/mocks/sling-mock: pom.xml src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java

[ss...@apache.org]

Author: sseifert
Date: Wed Feb 18 22:54:28 2015
New Revision: 1660759

URL: http://svn.apache.org/r1660759
Log:
SLING-848 revert updating sling api/resource resolver/jcr resource dependenciens - using sling mock in a project should not enforce using the latest version of those
keep adding of getThreadResourceResolver() method, but throw UnsupportedOperationException

Modified:
    sling/trunk/testing/mocks/sling-mock/pom.xml
    sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java

Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1660759&r1=1660758&r2=1660759&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Wed Feb 18 22:54:28 2015
@@ -81,13 +81,13 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.8.1-SNAPSHOT</version>
+            <version>2.4.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.resourceresolver</artifactId>
-            <version>1.1.15-SNAPSHOT</version>
+            <version>1.1.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.resource</artifactId>
-            <version>2.4.5-SNAPSHOT</version>
+            <version>2.3.6</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java?rev=1660759&r1=1660758&r2=1660759&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java Wed Feb 18 22:54:28 2015
@@ -29,7 +29,6 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.resource.internal.helper.jcr.JcrResourceProviderFactory;
-import org.apache.sling.jcr.resource.internal.helper.jcr.PathMapper;
 import org.apache.sling.resourceresolver.impl.CommonResourceResolverFactoryImpl;
 import org.apache.sling.resourceresolver.impl.ResourceAccessSecurityTracker;
 import org.apache.sling.resourceresolver.impl.ResourceResolverImpl;
@@ -68,7 +67,6 @@ class MockJcrResourceResolverFactory imp
 
         // setup mocked JCR environment
         bundleContext.registerService(SlingRepository.class.getName(), this.slingRepository, null);
-        bundleContext.registerService(PathMapper.class.getName(), new PathMapper(), null);
 
         // setup real sling JCR resource provider implementation for use in
         // mocked context
@@ -127,9 +125,9 @@ class MockJcrResourceResolverFactory imp
         return getResourceResolverInternal(authenticationInfo, true);
     }
 
-    @Override
+    // part of Sling API 2.8
     public ResourceResolver getThreadResourceResolver() {
-        return null;
+        throw new UnsupportedOperationException();
     }
 
 }