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 2020/12/18 19:04:07 UTC
[tika] branch main updated: TIKA-3244 -- general upgrades
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
The following commit(s) were added to refs/heads/main by this push:
new 40001a2 TIKA-3244 -- general upgrades
40001a2 is described below
commit 40001a2709be8967a4f1b452908e9bf92b9a6196
Author: tallison <ta...@apache.org>
AuthorDate: Fri Dec 18 14:03:42 2020 -0500
TIKA-3244 -- general upgrades
---
tika-parent/pom.xml | 13 +++++---
.../tika-parser-advancedmedia-module/pom.xml | 9 +++++
.../tika-parser-nlp-module/pom.xml | 11 ++++++-
.../tika-parser-scientific-module/pom.xml | 9 +++++
tika-server/tika-server-core/pom.xml | 38 ++++++++++++++++++++++
5 files changed, 74 insertions(+), 6 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 69b52b9..494d57a 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -295,9 +295,10 @@
<dl4j.version>1.0.0-beta6</dl4j.version>
<geoapi.version>3.0.1</geoapi.version>
<gson.version>2.8.6</gson.version>
- <guava.version>30.0-jre</guava.version>
+ <guava.version>30.1-jre</guava.version>
<h2.version>1.4.200</h2.version>
<httpcomponents.version>4.5.13</httpcomponents.version>
+ <httpcore.version>4.4.14</httpcore.version>
<imageio.version>1.4.0</imageio.version>
<isoparser.version>1.9.41.4</isoparser.version>
<jackcess.version>3.5.1</jackcess.version>
@@ -311,11 +312,12 @@
<jbig2.version>3.0.3</jbig2.version>
<jdom2.version>2.0.6</jdom2.version>
<jempbox.version>1.8.16</jempbox.version>
+ <jetty.version>9.4.35.v20201120</jetty.version>
<jhighlight.version>1.0.3</jhighlight.version>
<joda.time.version>2.10.8</joda.time.version>
<json.simple.version>1.1.1</json.simple.version>
<juniversalchardet.version>1.0.3</juniversalchardet.version>
- <junrar.version>7.3.0</junrar.version>
+ <junrar.version>7.4.0</junrar.version>
<libpst.version>0.9.3</libpst.version>
<log4j.version>1.2.17</log4j.version>
<lombok.version>1.18.16</lombok.version>
@@ -332,7 +334,7 @@
<opennlp.version>1.9.3</opennlp.version>
<optimaize.version>0.6</optimaize.version>
<osgi.core.version>6.0.0</osgi.core.version>
- <parso.version>2.0.12</parso.version>
+ <parso.version>2.0.13</parso.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
<poi.version>4.1.2</poi.version>
<rome.version>1.15.0</rome.version>
@@ -344,11 +346,12 @@
<!-- NOTE: sync tukaani version with commons-compress in tika-parent-->
<tukaani.version>1.8</tukaani.version>
<twelvemonkeys.version>3.6.1</twelvemonkeys.version>
- <uima.version>3.1.0</uima.version>
+ <uima.version>3.1.1</uima.version>
+ <uimafit.version>3.1.0</uimafit.version>
<vorbis.version>0.8</vorbis.version>
<xerces.version>2.12.0</xerces.version>
<xmpcore.version>6.1.11</xmpcore.version>
- <zstd.version>1.4.5-6</zstd.version>
+ <zstd.version>1.4.7-1</zstd.version>
</properties>
<dependencyManagement>
diff --git a/tika-parsers/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml b/tika-parsers/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml
index ae993e5..fe6097e 100644
--- a/tika-parsers/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml
+++ b/tika-parsers/tika-parsers-advanced/tika-parser-advancedmedia-module/pom.xml
@@ -59,9 +59,18 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
diff --git a/tika-parsers/tika-parsers-advanced/tika-parser-nlp-module/pom.xml b/tika-parsers/tika-parsers-advanced/tika-parser-nlp-module/pom.xml
index aafc34b..822a61f 100644
--- a/tika-parsers/tika-parsers-advanced/tika-parser-nlp-module/pom.xml
+++ b/tika-parsers/tika-parsers-advanced/tika-parser-nlp-module/pom.xml
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimafit-core</artifactId>
- <version>${uima.version}</version>
+ <version>${uimafit.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -217,9 +217,18 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.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 407464c..098d001 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
@@ -107,9 +107,18 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
diff --git a/tika-server/tika-server-core/pom.xml b/tika-server/tika-server-core/pom.xml
index c06e98b..ea4cc09 100644
--- a/tika-server/tika-server-core/pom.xml
+++ b/tika-server/tika-server-core/pom.xml
@@ -103,6 +103,44 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>