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 2015/07/13 12:00:16 UTC
svn commit: r1690617 - in /sling/trunk:
bundles/extensions/event/src/test/java/org/apache/sling/event/it/
bundles/jcr/it-jackrabbit-oak/
bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/
launchpad/builder/src/main/provisio...
Author: olli
Date: Mon Jul 13 10:00:16 2015
New Revision: 1690617
URL: http://svn.apache.org/r1690617
Log:
SLING-4645 Update Tika to 1.9
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
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/launchpad/builder/src/main/provisioning/sling.txt
sling/trunk/tooling/support/provisioning-model/src/test/resources/main.txt
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1690617&r1=1690616&r2=1690617&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Mon Jul 13 10:00:16 2015
@@ -118,8 +118,8 @@ public abstract class AbstractJobHandlin
mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.concurrent", "1.3.4_1"),
mavenBundle("org.apache.geronimo.bundles", "commons-httpclient", "3.1_1"),
- mavenBundle("org.apache.tika", "tika-core", "1.2"),
- mavenBundle("org.apache.tika", "tika-bundle", "1.2"),
+ mavenBundle("org.apache.tika", "tika-core", "1.9"),
+ mavenBundle("org.apache.tika", "tika-bundle", "1.9"),
mavenBundle("org.apache.felix", "org.apache.felix.http.servlet-api", "1.0.0"),
mavenBundle("org.apache.felix", "org.apache.felix.http.api", "2.3.0"),
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=1690617&r1=1690616&r2=1690617&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml (original)
+++ sling/trunk/bundles/jcr/it-jackrabbit-oak/pom.xml Mon Jul 13 10:00:16 2015
@@ -205,7 +205,7 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
- <version>1.6</version>
+ <version>1.9</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=1690617&r1=1690616&r2=1690617&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 Mon Jul 13 10:00:16 2015
@@ -182,8 +182,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.6"));
- opt.add(mavenBundle("org.apache.tika", "tika-bundle", "1.6"));
+ opt.add(mavenBundle("org.apache.tika", "tika-core", "1.9"));
+ opt.add(mavenBundle("org.apache.tika", "tika-bundle", "1.9"));
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/launchpad/builder/src/main/provisioning/sling.txt
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1690617&r1=1690616&r2=1690617&view=diff
==============================================================================
--- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original)
+++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Jul 13 10:00:16 2015
@@ -99,8 +99,8 @@
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.scr/1.8.2
org.apache.felix/org.apache.felix.metatype/1.0.12
- org.apache.tika/tika-core/1.2
- org.apache.tika/tika-bundle/1.2
+ org.apache.tika/tika-core/1.9
+ org.apache.tika/tika-bundle/1.9
[artifacts startLevel=15]
commons-io/commons-io/2.4
Modified: sling/trunk/tooling/support/provisioning-model/src/test/resources/main.txt
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/test/resources/main.txt?rev=1690617&r1=1690616&r2=1690617&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/test/resources/main.txt (original)
+++ sling/trunk/tooling/support/provisioning-model/src/test/resources/main.txt Mon Jul 13 10:00:16 2015
@@ -96,8 +96,8 @@
[artifacts startLevel=10]
org.apache.felix/org.apache.felix.scr/1.8.2/jar
org.apache.felix/org.apache.felix.metatype/1.0.10/jar
- org.apache.tika/tika-core/1.2/jar
- org.apache.tika/tika-bundle/1.2/jar
+ org.apache.tika/tika-core/1.9/jar
+ org.apache.tika/tika-bundle/1.9/jar
[artifacts startLevel=15]
org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0/jar