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 2021/12/13 15:01:20 UTC
svn commit: r1895890 - in /jackrabbit/branches/2.20: ./ jackrabbit-core/pom.xml jackrabbit-jca/pom.xml jackrabbit-parent/pom.xml jackrabbit-standalone-components/pom.xml jackrabbit-webapp/pom.xml
Author: reschke
Date: Mon Dec 13 15:01:20 2021
New Revision: 1895890
URL: http://svn.apache.org/viewvc?rev=1895890&view=rev
Log:
JCR-4722: Update Tika dependency to 2.1.0 (merged r1892573 into 2.20)
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-core/pom.xml
jackrabbit/branches/2.20/jackrabbit-jca/pom.xml
jackrabbit/branches/2.20/jackrabbit-parent/pom.xml
jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml
jackrabbit/branches/2.20/jackrabbit-webapp/pom.xml
Propchange: jackrabbit/branches/2.20/
------------------------------------------------------------------------------
Merged /jackrabbit/trunk:r1892573
Modified: jackrabbit/branches/2.20/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-core/pom.xml?rev=1895890&r1=1895889&r2=1895890&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-core/pom.xml Mon Dec 13 15:01:20 2021
@@ -310,20 +310,6 @@ org.apache.jackrabbit.test.api.query.qom
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
Modified: jackrabbit/branches/2.20/jackrabbit-jca/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jca/pom.xml?rev=1895890&r1=1895889&r2=1895890&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jca/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-jca/pom.xml Mon Dec 13 15:01:20 2021
@@ -113,16 +113,6 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: jackrabbit/branches/2.20/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-parent/pom.xml?rev=1895890&r1=1895889&r2=1895890&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-parent/pom.xml Mon Dec 13 15:01:20 2021
@@ -48,7 +48,7 @@
<test.opts>${test.opts.modules} ${test.opts.coverage} ${test.opts.memory} -enableassertions</test.opts>
<oak.version>1.40.0</oak.version>
<jetty.version>9.2.30.v20200428</jetty.version>
- <tika.version>2.0.0</tika.version>
+ <tika.version>2.1.0</tika.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<slf4j.api.version>1.7.32</slf4j.api.version>
<slf4j.version>1.7.32</slf4j.version> <!-- sync with logback version -->
Modified: jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml?rev=1895890&r1=1895889&r2=1895890&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml Mon Dec 13 15:01:20 2021
@@ -87,16 +87,6 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/branches/2.20/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-webapp/pom.xml?rev=1895890&r1=1895889&r2=1895890&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-webapp/pom.xml Mon Dec 13 15:01:20 2021
@@ -52,24 +52,6 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parsers-standard-package</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>