svn commit: r1763026 - in /sling/trunk/bundles/jcr/oak-server: pom.xml src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

[olli]

Author: olli
Date: Sat Oct  1 18:12:14 2016
New Revision: 1763026

URL: http://svn.apache.org/viewvc?rev=1763026&view=rev
Log:
no need for org.apache.sling.jcr.base 2.4.1-SNAPSHOT right now

Modified:
    sling/trunk/bundles/jcr/oak-server/pom.xml
    
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java

Modified: sling/trunk/bundles/jcr/oak-server/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1763026&r1=1763025&r2=1763026&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Sat Oct  1 18:12:14 2016
@@ -177,7 +177,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.jcr.base</artifactId>
-      <version>2.4.1-SNAPSHOT</version>
+      <version>2.4.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>

Modified: 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1763026&r1=1763025&r2=1763026&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 (original)
+++ 
sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
 Sat Oct  1 18:12:14 2016
@@ -43,7 +43,6 @@ import static org.apache.sling.testing.p
 import static org.apache.sling.testing.paxexam.SlingOptions.scr;
 import static org.apache.sling.testing.paxexam.SlingOptions.slingJcr;
 import static org.apache.sling.testing.paxexam.SlingOptions.tikaSling;
-import static 
org.apache.sling.testing.paxexam.SlingVersionResolver.SLING_GROUP_ID;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.ops4j.pax.exam.CoreOptions.composite;
@@ -154,7 +153,6 @@ public abstract class OakServerTestSuppo
     }
 
     protected Option launchpad() {
-        SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, 
"org.apache.sling.jcr.base");
         SlingOptions.versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.jetty", "3.1.6"); // SLING-6080 – Java 7
         SlingOptions.versionResolver.setVersion("org.apache.felix", 
"org.apache.felix.http.whiteboard", "2.3.2"); // SLING-6080 – Java 7
         final String slingHome = String.format("%s/sling", workingDirectory());