You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/12/22 08:38:55 UTC
svn commit: r1775590 - in /sling/trunk/bundles/jcr/oak-server: pom.xml
src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java
Author: cziegeler
Date: Thu Dec 22 08:38:55 2016
New Revision: 1775590
URL: http://svn.apache.org/viewvc?rev=1775590&view=rev
Log:
Use released jcr base and jcr resource
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=1775590&r1=1775589&r2=1775590&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/oak-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/oak-server/pom.xml Thu Dec 22 08:38:55 2016
@@ -43,8 +43,8 @@
</scm>
<properties>
- <jackrabbit.version>2.13.1</jackrabbit.version>
- <oak.version>1.5.7</oak.version>
+ <jackrabbit.version>2.13.5</jackrabbit.version>
+ <oak.version>1.5.15</oak.version>
<org.ops4j.pax.exam.version>4.9.1</org.ops4j.pax.exam.version>
</properties>
@@ -177,7 +177,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.base</artifactId>
- <version>2.4.3-SNAPSHOT</version>
+ <version>3.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -267,11 +267,10 @@
<scope>provided</scope>
</dependency>
- <!-- temporary SNAPSHOTs for OakServerTestSupport -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.8.3-SNAPSHOT</version>
+ <version>2.9.0</version>
<scope>test</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=1775590&r1=1775589&r2=1775590&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 Thu Dec 22 08:38:55 2016
@@ -18,7 +18,18 @@
*/
package org.apache.sling.jcr.oak.server.it;
-import java.util.ArrayList;
+import static org.apache.sling.testing.paxexam.SlingOptions.jackrabbitSling;
+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.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
+import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
+
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -42,20 +53,6 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.util.PathUtils;
import org.osgi.framework.BundleContext;
-import static java.util.Arrays.asList;
-import static org.apache.sling.testing.paxexam.SlingOptions.jackrabbitSling;
-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.slingJcrRepoinit;
-import static org.apache.sling.testing.paxexam.SlingOptions.tikaSling;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
-import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
-
public abstract class OakServerTestSupport extends TestSupport {
@Inject
@@ -169,6 +166,18 @@ public abstract class OakServerTestSuppo
SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.jcr.resource");
SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.resourceresolver");
SlingOptions.versionResolver.setVersionFromProject("org.apache.sling", "org.apache.sling.api");
+ SlingOptions.versionResolver.setVersionFromProject("org.apache.jackrabbit", "oak-core");
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "oak-commons", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "oak-core"));
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "oak-blob", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "oak-core"));
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "oak-jcr", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "oak-core"));
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "oak-segment", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "oak-core"));
+ SlingOptions.versionResolver.setVersionFromProject("org.apache.jackrabbit", "jackrabbit-api");
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "jackrabbit-data", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "jackrabbit-api"));
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "jackrabbit-jcr-commons", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "jackrabbit-api"));
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "jackrabbit-jcr-rmi", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "jackrabbit-api"));
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "jackrabbit-spi", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "jackrabbit-api"));
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "jackrabbit-spi-commons", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "jackrabbit-api"));
+ SlingOptions.versionResolver.setVersion("org.apache.jackrabbit", "jackrabbit-webdav", SlingOptions.versionResolver.getVersion("org.apache.jackrabbit", "jackrabbit-api"));
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 repoinit = String.format("raw:file:%s/src/test/resources/repoinit.txt", PathUtils.getBaseDir());