You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by le...@apache.org on 2016/01/04 18:57:19 UTC
svn commit: r1722935 - in /tika/trunk: CHANGES.txt tika-bundle/pom.xml
tika-parsers/pom.xml
tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java
Author: lewismc
Date: Mon Jan 4 17:57:19 2016
New Revision: 1722935
URL: http://svn.apache.org/viewvc?rev=1722935&view=rev
Log:
TIKA-1820 Upgrade rome to 1.5.1 && TIKA-1516 Downgrade Rome dependency to 0.9 to avoid nasty NPE
Modified:
tika/trunk/CHANGES.txt
tika/trunk/tika-bundle/pom.xml
tika/trunk/tika-parsers/pom.xml
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java
Modified: tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1722935&r1=1722934&r2=1722935&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Mon Jan 4 17:57:19 2016
@@ -1,5 +1,8 @@
Release 1.12 - Current Development
+ * Upgrade rome to 1.5.1 && Downgrade Rome dependency to 0.9 to avoid
+ nasty NPE (TIKA-1820, TIKA-1516)
+
* The NamedEntityParser was enhanced to generate text content
in addition to metadata (TIKA-1815, TIKA-1816).
Modified: tika/trunk/tika-bundle/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1722935&r1=1722934&r2=1722935&view=diff
==============================================================================
--- tika/trunk/tika-bundle/pom.xml (original)
+++ tika/trunk/tika-bundle/pom.xml Mon Jan 4 17:57:19 2016
@@ -131,14 +131,14 @@
poi,poi-scratchpad,poi-ooxml,poi-ooxml-schemas,
xmlbeans,
jackcess,
- commons-lang,
+ commons-lang,
tagsoup,
asm,
juniversalchardet,
vorbis-java-core, vorbis-java-tika,
isoparser, aspectjrt,
metadata-extractor, xmpcore, json-simple,
- boilerpipe, rome, opennlp-tools, opennlp-maxent,
+ boilerpipe, rome, rome-utils, opennlp-tools, opennlp-maxent,
geoapi, sis-metadata, sis-netcdf, sis-utility,
sis-storage, apache-mime4j-core, apache-mime4j-dom,
jsr-275, jhighlight, java-libpst, jwnl,
@@ -185,7 +185,7 @@
javax.xml.stream;version="[1.0,2)";resolution:=optional,
javax.xml.stream.events;version="[1.0,2)";resolution:=optional,
javax.xml.stream.util;version="[1.0,2)";resolution:=optional,
- javax.ws.rs.core;resolution:=optional,
+ javax.ws.rs.core;resolution:=optional,
net.sf.ehcache;resolution:=optional,
nu.xom;resolution:=optional,
opendap.dap.http;resolution:=optional,
@@ -194,8 +194,8 @@
opennlp.maxent;resolution:=optional,
opennlp.tools.namefind;resolution:=optional,
net.didion.jwnl;resolution:=optional,
- org.apache.cxf.jaxrs.client;resolution:=optional,
- org.apache.cxf.jaxrs.ext.multipart;resolution:=optional,
+ org.apache.cxf.jaxrs.client;resolution:=optional,
+ org.apache.cxf.jaxrs.ext.multipart;resolution:=optional,
org.apache.commons.exec;resolution:=optional,
org.apache.commons.io;resolution:=optional,
org.apache.commons.httpclient;resolution:=optional,
@@ -246,9 +246,11 @@
org.jdom.output;resolution:=optional,
org.jdom2;resolution:=optional,
org.jdom2.input;resolution:=optional,
+ org.jdom2.input.sax;resolution:=optional,
org.jdom2.output;resolution:=optional,
+ org.jdom2.filter;resolution:=optional,
org.json.simple;resolution:=optional,
- org.json;resolution:=optional,
+ org.json;resolution:=optional,
org.openxmlformats.schemas.officeDocument.x2006.math;resolution:=optional,
org.openxmlformats.schemas.schemaLibrary.x2006.main;resolution:=optional,
org.osgi.framework;resolution:=optional,
@@ -295,7 +297,7 @@
ucar.unidata.io;resolution:=optional,
ucar.unidata.util;resolution:=optional,
com.jmatio.io;resolution:=optional,
- com.google.gson;resolution:=optional,
+ com.google.gson;resolution:=optional,
visad;resolution:=optional,
visad.data;resolution:=optional,
visad.data.vis5d;resolution:=optional,
@@ -331,7 +333,7 @@
com.google.common.base;resolution:=optional,
com.google.common.math;resolution:=optional,
org.apache.http;resolution:=optional,
- org.apache.http.client.utils;resolution:=optional,
+ org.apache.http.client.utils;resolution:=optional,
org.joda.time;resolution:=optional,
org.joda.time.chrono;resolution:=optional,
org.joda.time.field;resolution:=optional,
Modified: tika/trunk/tika-parsers/pom.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/pom.xml?rev=1722935&r1=1722934&r2=1722935&view=diff
==============================================================================
--- tika/trunk/tika-parsers/pom.xml (original)
+++ tika/trunk/tika-parsers/pom.xml Mon Jan 4 17:57:19 2016
@@ -196,9 +196,9 @@
<version>1.1.0</version>
</dependency>
<dependency>
- <groupId>rome</groupId>
+ <groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
- <version>1.0</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>org.gagravarr</groupId>
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java?rev=1722935&r1=1722934&r2=1722935&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/feed/FeedParser.java Mon Jan 4 17:57:19 2016
@@ -35,11 +35,11 @@ import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedInput;
+import com.rometools.rome.feed.synd.SyndContent;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedInput;
/**
* Feed parser.