You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/08/30 15:06:34 UTC
[tika] branch main updated (9d29536 -> 4c1c675)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git.
from 9d29536 [maven-release-plugin] prepare for next development iteration
new 92fcf1c TIKA-3003 -- exclude jsoup and ehcache from tika-parser-scientific-module
new 235d916 TIKA-3488 -- exclude dependency on jdom2 in the FeedParser. See: https://github.com/hunterhacker/jdom/issues/189
new 4c1c675 TIKA-3488 -- exclude dependency on jdom2 in the FeedParser. See: https://github.com/hunterhacker/jdom/issues/189
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tika-bundles/tika-bundle-standard/pom.xml | 4 ----
tika-parent/pom.xml | 6 ------
.../tika-parser-scientific-module/pom.xml | 12 ++++++++++++
.../tika-parser-news-module/pom.xml | 11 ++++++-----
.../main/java/org/apache/tika/parser/feed/FeedParser.java | 3 ++-
5 files changed, 20 insertions(+), 16 deletions(-)
[tika] 01/03: TIKA-3003 -- exclude jsoup and ehcache from
tika-parser-scientific-module
Posted by ta...@apache.org.
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 92fcf1c6e68bb1b001f02b09a733abecd9fe9b72
Author: tallison <ta...@apache.org>
AuthorDate: Mon Aug 30 10:48:49 2021 -0400
TIKA-3003 -- exclude jsoup and ehcache from tika-parser-scientific-module
---
tika-bundles/tika-bundle-standard/pom.xml | 3 ---
tika-parent/pom.xml | 6 ------
.../tika-parser-scientific-module/pom.xml | 12 ++++++++++++
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml
index b09da70..e4d55d7 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -354,9 +354,6 @@
jj2000.j2k.util;resolution:=optional,
jj2000.j2k.wavelet.synthesis;resolution:=optional,
org.itadaki.bzip2;resolution:=optional,
- org.jsoup;resolution:=optional,
- org.jsoup.nodes;resolution:=optional,
- org.jsoup.select;resolution:=optional,
thredds.featurecollection;resolution:=optional,
com.beust.jcommander;resolution:=optional,
com.google.common.base;resolution:=optional,
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 8f9f4ad..e83d7ff 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -326,7 +326,6 @@
<jna.version>5.8.0</jna.version>
<joda.time.version>2.10.10</joda.time.version>
<json.simple.version>1.1.1</json.simple.version>
- <jsoup.version>1.14.2</jsoup.version>
<junit4.version>4.13.2</junit4.version>
<junit5.version>5.8.0-M1</junit5.version>
<juniversalchardet.version>1.0.3</juniversalchardet.version>
@@ -550,11 +549,6 @@
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- <version>${jsoup.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
diff --git a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
index c935115..fa955ef 100644
--- a/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
+++ b/tika-parsers/tika-parsers-extended/tika-parser-scientific-module/pom.xml
@@ -60,11 +60,23 @@
<groupId>edu.ucar</groupId>
<artifactId>netcdf4</artifactId>
<version>${netcdf-java.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>edu.ucar</groupId>
<artifactId>grib</artifactId>
<version>${netcdf-java.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- TIKA-3095: Required for grib -->
<dependency>
[tika] 02/03: TIKA-3488 -- exclude dependency on jdom2 in the
FeedParser. See: https://github.com/hunterhacker/jdom/issues/189
Posted by ta...@apache.org.
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 <ta...@apache.org>
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());
[tika] 03/03: TIKA-3488 -- exclude dependency on jdom2 in the
FeedParser. See: https://github.com/hunterhacker/jdom/issues/189
Posted by ta...@apache.org.
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 4c1c675565026585ade55268255de077af055d52
Author: tallison <ta...@apache.org>
AuthorDate: Mon Aug 30 11:06:15 2021 -0400
TIKA-3488 -- exclude dependency on jdom2 in the FeedParser. See: https://github.com/hunterhacker/jdom/issues/189
---
tika-bundles/tika-bundle-standard/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/tika-bundles/tika-bundle-standard/pom.xml b/tika-bundles/tika-bundle-standard/pom.xml
index e4d55d7..0ec97bf 100644
--- a/tika-bundles/tika-bundle-standard/pom.xml
+++ b/tika-bundles/tika-bundle-standard/pom.xml
@@ -180,7 +180,6 @@
boilerpipe|
rome|
rome-utils|
- jdom2|
sentiment-analysis-parser|
opennlp-tools|
geoapi|