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 14:29:56 UTC
svn commit: r1895885 - in /jackrabbit/branches/2.20: ./ jackrabbit-core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ jackrabbit-jca/ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ jackrabbit-parent/ jack...
Author: reschke
Date: Mon Dec 13 14:29:56 2021
New Revision: 1895885
URL: http://svn.apache.org/viewvc?rev=1895885&view=rev
Log:
JCR-4712: Update Tika dependency to 2.0.0 (merged r1892407 into 2.20)
Modified:
jackrabbit/branches/2.20/ (props changed)
jackrabbit/branches/2.20/jackrabbit-core/pom.xml
jackrabbit/branches/2.20/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java
jackrabbit/branches/2.20/jackrabbit-jca/pom.xml
jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java
jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java
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:r1892407
Modified: jackrabbit/branches/2.20/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-core/pom.xml?rev=1895885&r1=1895884&r2=1895885&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-core/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-core/pom.xml Mon Dec 13 14:29:56 2021
@@ -308,24 +308,24 @@ org.apache.jackrabbit.test.api.query.qom
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-standard-package</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </exclusion>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
Modified: jackrabbit/branches/2.20/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java?rev=1895885&r1=1895884&r2=1895885&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LazyTextExtractorField.java Mon Dec 13 14:29:56 2021
@@ -27,6 +27,7 @@ import org.apache.lucene.document.Abstra
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field.TermVector;
+import org.apache.tika.exception.WriteLimitReachedException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
@@ -187,7 +188,7 @@ public class LazyTextExtractorField exte
// not being present. This is equivalent to disabling
// selected media types in configuration, so we can simply
// ignore these errors.
- if (!writeOutContentHandler.isWriteLimitReached(e)) {
+ if (!WriteLimitReachedException.isWriteLimitReached(e)) {
log.debug("Failed to extract text from a binary property."
+ " This is a fairly common case, and nothing to"
+ " worry about. The stack trace is included to"
@@ -198,7 +199,7 @@ public class LazyTextExtractorField exte
} catch (Throwable t) {
// Capture and report any other full text extraction problems.
// The special STOP exception is used for normal termination.
- if (!writeOutContentHandler.isWriteLimitReached(t)) {
+ if (!WriteLimitReachedException.isWriteLimitReached(t)) {
log.debug("Failed to extract text from a binary property."
+ " This is a fairly common case, and nothing to"
+ " worry about. The stack trace is included to"
Modified: jackrabbit/branches/2.20/jackrabbit-jca/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jca/pom.xml?rev=1895885&r1=1895884&r2=1895885&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jca/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-jca/pom.xml Mon Dec 13 14:29:56 2021
@@ -112,7 +112,7 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-standard-package</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Modified: jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java?rev=1895885&r1=1895884&r2=1895885&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/DefaultHandler.java Mon Dec 13 14:29:56 2021
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.webdav.prop
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.PropEntry;
import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -642,7 +643,7 @@ public class DefaultHandler implements I
protected String detect(String name) {
try {
Metadata metadata = new Metadata();
- metadata.set(Metadata.RESOURCE_NAME_KEY, name);
+ metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, name);
if (ioManager != null && ioManager.getDetector() != null) {
return ioManager.getDetector().detect(null, metadata).toString();
} else {
Modified: jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java?rev=1895885&r1=1895884&r2=1895885&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java (original)
+++ jackrabbit/branches/2.20/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/ImportContextImpl.java Mon Dec 13 14:29:56 2021
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.server.io;
import org.apache.jackrabbit.webdav.io.InputContext;
import org.apache.tika.detect.Detector;
import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.TikaCoreProperties;
import org.apache.tika.mime.MediaType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +80,7 @@ public class ImportContextImpl implement
metadata.set(Metadata.CONTENT_TYPE, inputCtx.getContentType());
}
if (systemId != null) {
- metadata.set(Metadata.RESOURCE_NAME_KEY, systemId);
+ metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, systemId);
}
if (stream != null && !stream.markSupported()) {
stream = new BufferedInputStream(stream);
Modified: jackrabbit/branches/2.20/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.20/jackrabbit-parent/pom.xml?rev=1895885&r1=1895884&r2=1895885&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-parent/pom.xml Mon Dec 13 14:29:56 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>1.27</tika.version>
+ <tika.version>2.0.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 -->
@@ -506,7 +506,7 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-standard-package</artifactId>
<version>${tika.version}</version>
<exclusions>
<!-- Exclude the NetCDF and the related commons-httpclient -->
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=1895885&r1=1895884&r2=1895885&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-standalone-components/pom.xml Mon Dec 13 14:29:56 2021
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-standard-package</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</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=1895885&r1=1895884&r2=1895885&view=diff
==============================================================================
--- jackrabbit/branches/2.20/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.20/jackrabbit-webapp/pom.xml Mon Dec 13 14:29:56 2021
@@ -51,16 +51,20 @@
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
- <artifactId>tika-parsers</artifactId>
+ <artifactId>tika-parsers-standard-package</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- </exclusion>
+ </exclusion>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </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>