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/02/24 18:32:45 UTC
[tika] branch master updated: TIKA-3056 -- general upgrades for the
1.24 release.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/master by this push:
new ff73831 TIKA-3056 -- general upgrades for the 1.24 release.
ff73831 is described below
commit ff7383143bb0100f18c486c979b682470276a8ba
Author: tallison <ta...@apache.org>
AuthorDate: Mon Feb 24 13:32:28 2020 -0500
TIKA-3056 -- general upgrades for the 1.24 release.
---
tika-dl/pom.xml | 10 +++++-----
tika-eval/pom.xml | 6 ++++++
tika-example/pom.xml | 4 ++++
tika-nlp/pom.xml | 2 +-
tika-parent/pom.xml | 17 ++++++++---------
tika-parsers/pom.xml | 46 +++++++++++++++++++++++++++++++++++++---------
tika-translate/pom.xml | 4 ++--
7 files changed, 63 insertions(+), 26 deletions(-)
diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml
index 98a400c..f59b26d 100644
--- a/tika-dl/pom.xml
+++ b/tika-dl/pom.xml
@@ -36,8 +36,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dl4j.version>1.0.0-beta5</dl4j.version>
- <twelvemonkeys.version>3.4.2</twelvemonkeys.version>
+ <dl4j.version>1.0.0-beta6</dl4j.version>
+ <twelvemonkeys.version>3.5</twelvemonkeys.version>
</properties>
<dependencies>
@@ -282,7 +282,7 @@
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>org.nd4j</groupId>
@@ -341,7 +341,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.8</version>
+ <version>1.18.12</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -351,7 +351,7 @@
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
- <version>2.10.3</version>
+ <version>2.10.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/tika-eval/pom.xml b/tika-eval/pom.xml
index 6015602..bed93d0 100644
--- a/tika-eval/pom.xml
+++ b/tika-eval/pom.xml
@@ -115,6 +115,12 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
diff --git a/tika-example/pom.xml b/tika-example/pom.xml
index a2b2628..b797cc9 100644
--- a/tika-example/pom.xml
+++ b/tika-example/pom.xml
@@ -118,6 +118,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/tika-nlp/pom.xml b/tika-nlp/pom.xml
index 0d2c88b..208ace1 100644
--- a/tika-nlp/pom.xml
+++ b/tika-nlp/pom.xml
@@ -190,7 +190,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${jackson.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 9b2815c..9f51c63 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -269,7 +269,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13-rc-1</version>
+ <version>4.13</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -335,24 +335,23 @@
<rat.version>0.13</rat.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
<poi.version>4.1.2</poi.version>
- <commons.compress.version>1.19</commons.compress.version>
+ <commons.compress.version>1.20</commons.compress.version>
<commons.io.version>2.6</commons.io.version>
<commons.lang3.version>3.9</commons.lang3.version>
<gson.version>2.8.6</gson.version>
- <guava.version>28.1-jre</guava.version>
+ <guava.version>28.2-jre</guava.version>
<osgi.core.version>6.0.0</osgi.core.version>
- <cxf.version>3.3.4</cxf.version>
+ <cxf.version>3.3.5</cxf.version>
<slf4j.version>1.7.28</slf4j.version>
- <jackson.version>2.10.1</jackson.version>
- <jackson.databind.version>2.10.1</jackson.databind.version>
+ <jackson.version>2.10.2</jackson.version>
<!-- when this is next upgraded, see if we can get rid of
javax.activation dependency in tika-server -->
<jaxb.version>2.3.2</jaxb.version>
<cli.version>1.4</cli.version>
- <lucene.version>8.3.0</lucene.version>
- <mockito.version>3.1.0</mockito.version>
- <opennlp.version>1.9.1</opennlp.version>
+ <lucene.version>8.4.1</lucene.version>
+ <mockito.version>3.3.0</mockito.version>
+ <opennlp.version>1.9.2</opennlp.version>
</properties>
<build>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 3a1a6c3..463e60f 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -36,6 +36,10 @@
<properties>
<!-- NOTE: sync codec version with POI -->
+ <!-- 1.14 changed base64 decoding to "strict" which caused a failure
+ in XML2003ParserTest#testBasicWord see:
+ https://issues.apache.org/jira/browse/CODEC-263?focusedCommentId=17043716&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-17043716
+ -->
<codec.version>1.13</codec.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parent-->
<tukaani.version>1.8</tukaani.version>
@@ -51,7 +55,7 @@
<!-- used by POI, PDFBox and Jackcess ...try to sync -->
<bouncycastle.version>1.64</bouncycastle.version>
<commonsexec.version>1.3</commonsexec.version>
- <httpcomponents.version>4.5.10</httpcomponents.version>
+ <httpcomponents.version>4.5.11</httpcomponents.version>
</properties>
<!-- Note: as of the 1.23 release, we're waiting for external changes or fixes
@@ -178,7 +182,7 @@
<dependency>
<groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId>
- <version>1.4.4-3</version>
+ <version>1.4.4-7</version>
<scope>provided</scope>
</dependency>
@@ -260,6 +264,10 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -306,7 +314,7 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>7.2</version>
+ <version>7.3.1</version>
</dependency>
<dependency>
<groupId>com.googlecode.mp4parser</groupId>
@@ -408,7 +416,7 @@
<dependency>
<groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId>
- <version>3.28.0</version>
+ <version>3.30.1</version>
<scope>provided</scope>
</dependency>
@@ -543,6 +551,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- TIKA-3052 -->
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>1.78</version>
+ </dependency>
<!--TIKA 2672 include a later version of jna as a direct dependency to resolve dependency convergence with tika-dl's
deeplearning4j-nn:1.0.0-SNAPSHOT -->
<dependency>
@@ -556,12 +570,12 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.12.1</version>
+ <version>1.12.2</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>3.11.0</version>
+ <version>3.11.4</version>
</dependency>
<dependency>
<groupId>edu.ucar</groupId>
@@ -600,6 +614,10 @@
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!--needs to be bumped for xml vulnerability -->
@@ -607,13 +625,23 @@
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.3.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.mchange</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.mchange</groupId>
+ <artifactId>mchange-commons-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- needs to be excluded and version bumped
to avoid billion laughs vuln -->
<dependency>
<groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
- <version>0.9.5.4</version>
+ <version>0.9.5.5</version>
</dependency>
<dependency>
<groupId>edu.ucar</groupId>
@@ -664,7 +692,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.7</version>
+ <version>1.8</version>
</dependency>
<dependency>
@@ -866,7 +894,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${jackson.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index 7056602..723e346 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
+ <version>2.10.2.1</version>
<exclusions>
<!-- exclude because, as of 2.9.5, jaxrs-json-provider
is bringing in 2.9.0 of core's annotations
@@ -102,7 +102,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
+ <version>${jackson.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>