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/05/27 13:25:56 UTC
svn commit: r1681980 - in /jackrabbit/branches/2.8: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
jackrabbit-parent/pom.xml
Author: mreutegg
Date: Wed May 27 11:25:55 2015
New Revision: 1681980
URL: http://svn.apache.org/r1681980
Log:
JCR-3871: POI Vulnerabilities
Merged revision 1674859 from trunk
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
jackrabbit/branches/2.8/jackrabbit-parent/pom.xml
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 27 11:25:55 2015
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1680757
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1625561,1634584,1667787,1674859,1680757
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java?rev=1681980&r1=1681979&r2=1681980&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java Wed May 27 11:25:55 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/branches/2.8/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-parent/pom.xml?rev=1681980&r1=1681979&r2=1681980&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-parent/pom.xml Wed May 27 11:25:55 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 -->