Author: olli
Date: Tue Nov 17 13:38:56 2015
New Revision: 1714780
URL: http://svn.apache.org/viewvc?rev=1714780&view=rev
Log:
add properties for Jackrabbit’s and Tika’s versions (same as for Oak’s version)
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml?rev=1714780&r1=1714779&r2=1714780&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Tue Nov 17 13:38:56 2015
@@ -46,7 +46,9 @@
<!-- Include -Dtest.scale=N to use larger data sets in some tests -->
<pax.vm.options></pax.vm.options>
- <!--
+ <tika.version>1.9</tika.version>
+ <jackrabbit.version>2.11.2</jackrabbit.version>
+ <!--
WARNING make sure oak.version and sling.oak.server.version
are in sync with bundles/jcr/oak-server
-->
@@ -68,6 +70,8 @@
<configuration>
<argLine>-Xmx1024m -XX:MaxPermSize=368m</argLine>
<systemPropertyVariables>
+ <tika.version>${tika.version}</tika.version>
+
<jackrabbit.version>${jackrabbit.version}</jackrabbit.version>
<oak.version>${oak.version}</oak.version>
</systemPropertyVariables>
</configuration>
@@ -97,6 +101,14 @@
<value>${http.port}</value>
</property>
<property>
+ <name>tika.version</name>
+ <value>${tika.version}</value>
+ </property>
+ <property>
+ <name>jackrabbit.version</name>
+ <value>${jackrabbit.version}</value>
+ </property>
+ <property>
<name>oak.version</name>
<value>${oak.version}</value>
</property>
@@ -207,7 +219,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.9</version>
+ <version>${tika.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -285,7 +297,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
- <version>2.11.2</version>
+ <version>${jackrabbit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java?rev=1714780&r1=1714779&r2=1714780&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
(original)
+++
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/CommonTests.java
Tue Nov 17 13:38:56 2015
@@ -137,6 +137,7 @@ public abstract class CommonTests {
}
public Collection<Option> commonOptions() {
+ final String tikaVersion = System.getProperty("tika.version",
"NO_TIKA_VERSION??");
final String localRepo = System.getProperty("maven.repo.local", "");
final String paxVmOptions = System.getProperty("pax.vm.options", "");
final boolean webconsole =
"true".equals(System.getProperty("webconsole.active", "false"));
@@ -182,8 +183,8 @@ public abstract class CommonTests {
opt.add(mavenBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.concurrent", "1.3.4_1"));
opt.add(mavenBundle("org.apache.geronimo.bundles",
"commons-httpclient", "3.1_1"));
- opt.add(mavenBundle("org.apache.tika", "tika-core", "1.10"));
- opt.add(mavenBundle("org.apache.tika", "tika-bundle", "1.10"));
+ opt.add(mavenBundle("org.apache.tika", "tika-core", tikaVersion));
+ opt.add(mavenBundle("org.apache.tika", "tika-bundle", tikaVersion));
opt.add(mavenBundle("org.apache.felix", "org.apache.felix.http.jetty",
"2.2.2"));
opt.add(mavenBundle("org.apache.felix", "org.apache.felix.eventadmin",
"1.3.2"));
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java?rev=1714780&r1=1714779&r2=1714780&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
(original)
+++
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
Tue Nov 17 13:38:56 2015
@@ -37,15 +37,16 @@ public class JackrabbitRepositoryIT exte
@org.ops4j.pax.exam.Configuration
public Option[] config() {
+ final String jackrabbitVersion =
System.getProperty("jackrabbit.version", "NO_JACKRABBIT_VERSION??");
final List<Option> opt = new LinkedList<Option>();
opt.addAll(commonOptions());
- opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-api",
"2.11.2"));
- opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-commons",
"2.11.2"));
- opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-spi",
"2.11.2"));
- opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-spi-commons",
"2.11.2"));
- opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-rmi",
"2.11.2"));
+ opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-api",
jackrabbitVersion));
+ opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-commons",
jackrabbitVersion));
+ opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-spi",
jackrabbitVersion));
+ opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-spi-commons",
jackrabbitVersion));
+ opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-rmi",
jackrabbitVersion));
opt.add(mavenBundle("org.apache.derby", "derby", "10.12.1.1"));
opt.add(mavenBundle("org.apache.sling",
"org.apache.sling.jcr.jackrabbit.server", "2.3.1-SNAPSHOT"));
Modified:
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java?rev=1714780&r1=1714779&r2=1714780&view=diff
==============================================================================
---
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
(original)
+++
sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/OakRepositoryIT.java
Tue Nov 17 13:38:56 2015
@@ -49,6 +49,7 @@ public class OakRepositoryIT extends Com
@org.ops4j.pax.exam.Configuration
public Option[] config() {
+ final String jackrabbitVersion =
System.getProperty("jackrabbit.version", "NO_JACKRABBIT_VERSION??");
final String oakVersion = System.getProperty("oak.version",
"NO_OAK_VERSION??");
final String slingOakServerVersion =
System.getProperty("sling.oak.server.version", "NO_OAK_SERVER_VERSION??");
@@ -58,9 +59,9 @@ public class OakRepositoryIT extends Com
// Oak
opt.add(mavenBundle("org.apache.sling",
"org.apache.sling.jcr.oak.server", slingOakServerVersion));
opt.add(mavenBundle("com.google.guava", "guava", "15.0"));
- opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-api",
"2.11.2"));
- opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-commons",
"2.11.2"));
- opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-rmi",
"2.11.2"));
+ opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-api",
jackrabbitVersion));
+ opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-commons",
jackrabbitVersion));
+ opt.add(mavenBundle("org.apache.jackrabbit", "jackrabbit-jcr-rmi",
jackrabbitVersion));
opt.add(mavenBundle("org.apache.jackrabbit", "oak-core", oakVersion));
// embedded for now opt.add(mavenBundle("org.apache.jackrabbit",
"oak-jcr", oakVersion));
opt.add(mavenBundle("org.apache.jackrabbit", "oak-commons",
oakVersion));
