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/06/19 18:52:55 UTC

[tika] 01/01: TIKA-3119 -- try to upgrade dl4j to 1.0.0-beta7

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch TIKA-3119
in repository https://gitbox.apache.org/repos/asf/tika.git

commit 233a72d45de515a7ecb5988802559690cd91f57a
Author: tallison <ta...@apache.org>
AuthorDate: Fri Jun 19 14:52:42 2020 -0400

    TIKA-3119 -- try to upgrade dl4j to 1.0.0-beta7
---
 tika-dl/pom.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/tika-dl/pom.xml b/tika-dl/pom.xml
index f59b26d..269a94a 100644
--- a/tika-dl/pom.xml
+++ b/tika-dl/pom.xml
@@ -36,7 +36,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <dl4j.version>1.0.0-beta6</dl4j.version>
+    <dl4j.version>1.0.0-beta7</dl4j.version>
     <twelvemonkeys.version>3.5</twelvemonkeys.version>
   </properties>
 
@@ -126,6 +126,16 @@
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>javacpp</artifactId>
+      <version>1.5.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>javacv</artifactId>
+      <version>1.5.3</version>
+    </dependency>
+    <dependency>
       <groupId>org.deeplearning4j</groupId>
       <artifactId>deeplearning4j-nn</artifactId>
       <version>${dl4j.version}</version>
@@ -170,6 +180,14 @@
           <groupId>net.java.dev.jna</groupId>
           <artifactId>jna</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.google.code.gson</groupId>
+          <artifactId>gson</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>it.unimi.dsi</groupId>
+          <artifactId>fastutil</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -277,9 +295,18 @@
           <groupId>commons-lang</groupId>
           <artifactId>commons-lang</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>it.unimi.dsi</groupId>
+          <artifactId>fastutil</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
+      <groupId>it.unimi.dsi</groupId>
+      <artifactId>fastutil</artifactId>
+      <version>8.1.1</version>
+    </dependency>
+    <dependency>
       <groupId>org.objenesis</groupId>
       <artifactId>objenesis</artifactId>
       <version>3.1</version>
@@ -313,13 +340,42 @@
           <artifactId>nd4j-api</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.nd4j</groupId>
+          <artifactId>nd4j-native</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>org.bytedeco</groupId>
           <artifactId>javacpp</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.bytedeco</groupId>
+          <artifactId>openblas-platform</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.nd4j</groupId>
+      <artifactId>nd4j-native</artifactId>
+      <version>${dl4j.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bytedeco</groupId>
+          <artifactId>openblas</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>openblas</artifactId>
+      <version>0.3.9-1.5.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>openblas-platform</artifactId>
+      <version>0.3.9-1.5.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.nd4j</groupId>
       <artifactId>jackson</artifactId>
       <version>${dl4j.version}</version>
       <exclusions>
@@ -351,7 +407,7 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.10.5</version>
+      <version>2.10.6</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>