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/06/15 15:30:53 UTC
[tika] branch master updated: TIKA-2660 -- enable building with
Java 10 -- revert tika-dl until full fix is available.
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 04758e5 TIKA-2660 -- enable building with Java 10 -- revert tika-dl until full fix is available.
04758e5 is described below
commit 04758e54f8d1731d4ad7f73c6acfb30bb9663fa5
Author: tballison <ta...@mitre.org>
AuthorDate: Fri Jun 15 11:30:41 2018 -0400
TIKA-2660 -- enable building with Java 10 -- revert tika-dl until full
fix is available.
---
tika-dl/pom.xml | 236 +++-----------------------------------------------------
1 file changed, 9 insertions(+), 227 deletions(-)
diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml
index eea0685..ab5a164 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-beta</dl4j.version>
- <dl4j.model.version>0.9.1</dl4j.model.version>
+ <dl4j.version>0.8.0</dl4j.version>
+ <dl4j.model.version>0.8.0-2</dl4j.model.version>
</properties>
<dependencies>
@@ -51,18 +51,9 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.9.9</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -71,7 +62,7 @@
<groupId>org.deeplearning4j</groupId>
<artifactId>deeplearning4j-keras</artifactId>
<version>${dl4j.model.version}</version>
- <!-- exclude the first because of non-ASF friendly "do no evil" license.
+ <!-- exclude this because of non-ASF friendly "do no evil" license.
Because this relies on tika-parsers, that should have ted-dunning's drop-in
-->
<exclusions>
@@ -84,34 +75,10 @@
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>jackson</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.deeplearning4j</groupId>
<artifactId>deeplearning4j-modelimport</artifactId>
</exclusion>
<exclusion>
- <groupId>org.deeplearning4j</groupId>
- <artifactId>deeplearning4j-core</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
@@ -140,19 +107,6 @@
<artifactId>deeplearning4j-keras</artifactId>
</exclusion>
<exclusion>
- <groupId>org.deeplearning4j</groupId>
- <artifactId>deeplearning4j-nn</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>jackson</artifactId>
- </exclusion>
-
- <exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
</exclusion>
@@ -160,71 +114,14 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bytedeco.javacpp-presets</groupId>
- <artifactId>hdf5-platform</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.deeplearning4j</groupId>
- <artifactId>deeplearning4j-nn</artifactId>
- <version>${dl4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>jackson</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>1.16.20</version>
- </dependency>
- <dependency>
<groupId>org.datavec</groupId>
<artifactId>datavec-data-image</artifactId>
<version>${dl4j.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </exclusion>
- <exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
@@ -233,27 +130,6 @@
<artifactId>javacpp</artifactId>
</exclusion>
<exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>jackson</artifactId>
- </exclusion>
-
- <exclusion>
- <groupId>org.bytedeco</groupId>
- <artifactId>javacv</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</exclusion>
@@ -265,96 +141,6 @@
<groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bytedeco.javacpp-presets</groupId>
- <artifactId>opencv-platform</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bytedeco</groupId>
- <artifactId>javacv</artifactId>
- <version>1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.bytedeco.javacpp-presets</groupId>
- <artifactId>opencv</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.bytedeco</groupId>
- <artifactId>javacpp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bytedeco.javacpp-presets</groupId>
- <artifactId>opencv-platform</artifactId>
- <version>3.4.1-1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.bytedeco.javacpp-presets</groupId>
- <artifactId>opencv</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.bytedeco.javacpp-presets</groupId>
- <artifactId>opencv</artifactId>
- <version>3.4.1-1.4.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.bytedeco</groupId>
- <artifactId>javacpp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-common</artifactId>
- <version>1.0.0-beta</version>
- <exclusions>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>jackson</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-jackson</artifactId>
- <version>1.0.0-beta</version>
- <exclusions>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-api</artifactId>
- <version>1.0.0-beta</version>
- <exclusions>
- <exclusion>
- <groupId>org.objenesis</groupId>
- <artifactId>objenesis</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -366,21 +152,17 @@
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-native</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.nd4j</groupId>
- <artifactId>nd4j-native</artifactId>
- <version>${dl4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
- <version>1.4.1</version>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons.compress.version}</version>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
tallison@apache.org.