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/08/08 13:10:52 UTC
[tika] branch master updated: TIKA-2672 -- more exclusions needed
because of version conflicts
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 6cc5373 TIKA-2672 -- more exclusions needed because of version conflicts
6cc5373 is described below
commit 6cc53734e73b5d1b0af790d220e0227aba69eaf6
Author: TALLISON <ta...@apache.org>
AuthorDate: Wed Aug 8 09:10:34 2018 -0400
TIKA-2672 -- more exclusions needed because of version conflicts
---
tika-dl/pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml
index fba8110..d7d5992 100644
--- a/tika-dl/pom.xml
+++ b/tika-dl/pom.xml
@@ -212,6 +212,10 @@
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.nd4j</groupId>
<artifactId>nd4j-api</artifactId>
</exclusion>
@@ -230,11 +234,20 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
<groupId>org.nd4j</groupId>
<artifactId>nd4j-api</artifactId>
<version>${dl4j.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>