You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/09/05 19:44:34 UTC
svn commit: r1759350 - in /sling/trunk/bundles/jcr/oak-server: pom.xml
src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
Author: olli
Date: Mon Sep 5 19:44:34 2016
New Revision: 1759350
URL: http://svn.apache.org/viewvc?rev=1759350&view=rev
Log:
use version from project for org.apache.sling.jcr.base (2.4.1-SNAPSHOT) in ITs (SLING-5135)
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=1759350&r1=1759349&r2=1759350&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Mon Sep 5 19:44:34 2016
@@ -177,7 +177,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.base</artifactId>
- <version>2.4.0</version>
+ <version>2.4.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -189,7 +189,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>0.0.2</version>
+ <version>0.0.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- OSGi -->
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=1759350&r1=1759349&r2=1759350&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 Mon Sep 5 19:44:34 2016
@@ -43,6 +43,7 @@ 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;
@@ -153,6 +154,7 @@ public abstract class OakServerTestSuppo
}
protected Option launchpad() {
+ SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, "org.apache.sling.jcr.base");
final String slingHome = String.format("%s/sling", workingDirectory());
final String repositoryHome = String.format("%s/repository", slingHome);
final String localIndexDir = String.format("%s/index", repositoryHome);