svn commit: r1811988 - in /sling/trunk/testing/mocks/sling-mock: pom.xml src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java

[sseifert]

Author: sseifert
Date: Thu Oct 12 15:56:25 2017
New Revision: 1811988

URL: http://svn.apache.org/viewvc?rev=1811988&view=rev
Log:
SLING-7196 sling-mock: Make sure SlingContext.registerAdapter can overlay 
built-in adaptions

Modified:
    sling/trunk/testing/mocks/sling-mock/pom.xml
    
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.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=1811988&r1=1811987&r2=1811988&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Thu Oct 12 15:56:25 2017
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-            <version>2.3.2</version>
+            <version>2.3.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

Modified: 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java?rev=1811988&r1=1811987&r2=1811988&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
 (original)
+++ 
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
 Thu Oct 12 15:56:25 2017
@@ -479,7 +479,8 @@ public class SlingContextImpl extends Os
                     adapterClass.getName()
                 })
                 // make sure this overlay has higher ranking than other 
adapter factories
-                .put(Constants.SERVICE_RANKING, Integer.MAX_VALUE)
+                // normally we should use Integer.MAX_VALUE for this - but due 
to SLING-7194 prefers lowest-ranking services first
+                .put(Constants.SERVICE_RANKING, Integer.MIN_VALUE)
                 .build());
     }