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 2018/12/14 17:46:26 UTC
[tika] 01/02: TIKA-2775 -- upgrade guava
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
commit 7ffd19492909b4dbfddcc96e3921e078c537faef
Author: TALLISON <ta...@apache.org>
AuthorDate: Fri Dec 14 12:36:02 2018 -0500
TIKA-2775 -- upgrade guava
---
tika-bundle/pom.xml | 4 ++++
tika-dl/pom.xml | 2 +-
tika-langdetect/pom.xml | 2 +-
tika-nlp/pom.xml | 4 ++++
tika-parsers/pom.xml | 13 +++++++++++++
5 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml
index 2833400..bc3227e 100644
--- a/tika-bundle/pom.xml
+++ b/tika-bundle/pom.xml
@@ -238,6 +238,9 @@
com.adobe.xmp.properties;resolution:=optional,
com.github.luben.zstd;resolution:=optional,
com.github.openjson;resolution:=optional,
+ com.google.common.util.concurrent.internal;resolution:=optional,
+ com.google.errorprone.annotations;resolution:=optional,
+ com.google.errorprone.annotations.concurrent;resolution:=optional,
com.google.protobuf;resolution:=optional,
com.ibm.icu.text;resolution:=optional,
com.parso;resolution:=optional,
@@ -327,6 +330,7 @@
org.bouncycastle.operator.bc;resolution:=optional,
org.bouncycastle.tsp;resolution:=optional,
org.brotli.dec;resolution:=optional,
+ org.checkerframework.checker.nullness.qual;resolution:=optional,
org.cyberneko.html.xercesbridge;resolution:=optional,
org.etsi.uri.x01903.v14;resolution:=optional,
org.ibex.nestedvm;resolution:=optional,
diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml
index a7c350f..dfd7055 100644
--- a/tika-dl/pom.xml
+++ b/tika-dl/pom.xml
@@ -308,7 +308,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>20.0</version>
+ <version>27.0.1-jre</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
diff --git a/tika-langdetect/pom.xml b/tika-langdetect/pom.xml
index 17e0233..39546f3 100644
--- a/tika-langdetect/pom.xml
+++ b/tika-langdetect/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>17.0</version>
+ <version>27.0.1-jre</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/tika-nlp/pom.xml b/tika-nlp/pom.xml
index 8b97180..f3a36ae 100644
--- a/tika-nlp/pom.xml
+++ b/tika-nlp/pom.xml
@@ -53,6 +53,10 @@
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</exclusion>
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 248aea9..c33dad6 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -485,9 +485,18 @@
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>27.0.1-jre</version>
+ </dependency>
+ <dependency>
<groupId>edu.ucar</groupId>
<artifactId>grib</artifactId>
<version>${netcdf-java.version}</version>
@@ -542,6 +551,10 @@
<groupId>org.jdom</groupId>
<artifactId>jdom2</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>