You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2015/04/20 16:13:06 UTC
svn commit: r1674859 - in /jackrabbit/trunk:
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
jackrabbit-parent/pom.xml
Author: mreutegg
Date: Mon Apr 20 14:13:06 2015
New Revision: 1674859
URL: http://svn.apache.org/r1674859
Log:
JCR-3871: POI Vulnerabilities
Update Apache Tika to 1.7 (depends on POI 3.11)
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
jackrabbit/trunk/jackrabbit-parent/pom.xml
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java?rev=1674859&r1=1674858&r2=1674859&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java Mon Apr 20 14:13:06 2015
@@ -47,6 +47,7 @@ import org.apache.lucene.document.Fielda
import org.apache.lucene.index.FieldInfo;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
+import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -931,7 +932,7 @@ public class NodeIndexer {
*/
protected boolean isSupportedMediaType(final String type) {
if (supportedMediaTypes == null) {
- supportedMediaTypes = parser.getSupportedTypes(null);
+ supportedMediaTypes = parser.getSupportedTypes(new ParseContext());
}
return supportedMediaTypes.contains(MediaType.parse(type));
}
Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1674859&r1=1674858&r2=1674859&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Mon Apr 20 14:13:06 2015
@@ -44,7 +44,7 @@
<properties>
<jetty.version>6.1.22</jetty.version>
- <tika.version>1.3</tika.version>
+ <tika.version>1.7</tika.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<clirr.baseline.version>2.2.0</clirr.baseline.version>
<!-- Note that we're using SLF4J API version 1.6 when compiling -->