This is an automated email from the ASF dual-hosted git repository. tallison pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tika.git
commit 235d916c4ef163567db125a9f597cab3de82e0c5 Author: tallison <[email protected]> AuthorDate: Mon Aug 30 10:58:37 2021 -0400 TIKA-3488 -- exclude dependency on jdom2 in the FeedParser. See: https://github.com/hunterhacker/jdom/issues/189 --- .../tika-parser-news-module/pom.xml | 11 ++++++----- .../src/main/java/org/apache/tika/parser/feed/FeedParser.java | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/pom.xml b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/pom.xml index eadd8af..2676e6b 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/pom.xml +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/pom.xml @@ -34,11 +34,12 @@ <groupId>com.rometools</groupId> <artifactId>rome</artifactId> <version>${rome.version}</version> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom2</artifactId> - <version>${jdom2.version}</version> + <exclusions> + <exclusion> + <groupId>org.jdom</groupId> + <artifactId>jdom2</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java index 1751247..0e291b4 100644 --- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java +++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-news-module/src/main/java/org/apache/tika/parser/feed/FeedParser.java @@ -40,6 +40,7 @@ import org.apache.tika.mime.MediaType; import org.apache.tika.parser.AbstractParser; import org.apache.tika.parser.ParseContext; import org.apache.tika.sax.XHTMLContentHandler; +import org.apache.tika.utils.XMLReaderUtils; /** * Feed parser. @@ -86,7 +87,7 @@ public class FeedParser extends AbstractParser { // set the encoding? try { SyndFeed feed = - new SyndFeedInput().build(new InputSource(new CloseShieldInputStream(stream))); + new SyndFeedInput().build(XMLReaderUtils.buildDOM(new CloseShieldInputStream(stream))); String title = stripTags(feed.getTitleEx()); String description = stripTags(feed.getDescriptionEx());
