You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/02/02 16:26:08 UTC
svn commit: r1822984 - in /jackrabbit/branches/2.16: ./
jackrabbit-parent/pom.xml jackrabbit-webapp/pom.xml
Author: reschke
Date: Fri Feb 2 16:26:08 2018
New Revision: 1822984
URL: http://svn.apache.org/viewvc?rev=1822984&view=rev
Log:
JCR-4215: Use Tika version 1.17 (ported to 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-parent/pom.xml
jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 2 16:26:08 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819849,1820119,1820133,1820573,1821597
+/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819849,1820119,1820133,1820573,1820675,1821597
Modified: jackrabbit/branches/2.16/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-parent/pom.xml?rev=1822984&r1=1822983&r2=1822984&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-parent/pom.xml Fri Feb 2 16:26:08 2018
@@ -48,7 +48,7 @@
<test.opts.modules>-XX:+IgnoreUnrecognizedVMOptions --add-modules=java.xml.bind</test.opts.modules>
<test.opts>${test.opts.modules} ${test.opts.coverage} ${test.opts.memory} -enableassertions</test.opts>
<jetty.version>8.2.0.v20160908</jetty.version>
- <tika.version>1.16</tika.version>
+ <tika.version>1.17</tika.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<!-- Note that we're using SLF4J API version 1.6 when compiling -->
<!-- core Oak components but more recent SLF4J and Logback versions -->
Modified: jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml?rev=1822984&r1=1822983&r2=1822984&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml Fri Feb 2 16:26:08 2018
@@ -145,6 +145,24 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j</artifactId>
+ <version>0.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.8</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>