From 0706153ff9e30ab86a4c97c570d3b709292c6105 Mon Sep 17 00:00:00 2001
From: Tilman Hausherr <tilman@apache.org>
Date: Tue, 26 Nov 2024 11:13:46 +0100
Subject: [PATCH] TIKA-4327: add and update dependencies, reorganize; update
 and restore ffmpeg

---
 tika-parsers/tika-parsers-ml/tika-dl/pom.xml | 65 +++++++++-----------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
index d9ae3b8f4f..31b4cfb51f 100644
--- a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
+++ b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
@@ -31,6 +31,33 @@
   <name>Apache Tika Deep Learning (powered by DL4J)</name>
   <url>http://maven.apache.org</url>
 
+
+  <dependencyManagement>
+      <dependencies>
+          <dependency>
+              <groupId>org.bytedeco</groupId>
+              <artifactId>openblas-platform</artifactId>
+              <version>0.3.28-1.5.11</version>
+          </dependency>
+          <dependency>
+              <groupId>org.bytedeco</groupId>
+              <artifactId>openblas</artifactId>
+              <version>0.3.28-1.5.11</version>
+          </dependency>
+          <!-- can't update above 4.5.5-1.5.7, UnsatisfiedLinkError: no jniopencv_core in java.library.path -->
+          <dependency>
+              <groupId>org.bytedeco</groupId>
+              <artifactId>opencv</artifactId>
+              <version>4.5.5-1.5.7</version>
+          </dependency>
+          <dependency>
+              <groupId>it.unimi.dsi</groupId>
+              <artifactId>fastutil</artifactId>
+              <version>8.1.1</version>
+          </dependency>
+      </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -56,21 +83,14 @@
           <groupId>org.bytedeco</groupId>
           <artifactId>javacpp-platform</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>it.unimi.dsi</groupId>
-          <artifactId>fastutil</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
-    <!-- TODO restore after ffmpeg has been updated -->
-    <!--
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>ffmpeg</artifactId>
-      <version>6.1.1-1.5.10</version>
+      <version>7.1-1.5.11</version>
       <scope>provided</scope>
     </dependency>
-    -->
     <dependency>
       <groupId>org.deeplearning4j</groupId>
       <artifactId>deeplearning4j-zoo</artifactId>
@@ -94,16 +114,6 @@
       <artifactId>deeplearning4j-nn</artifactId>
       <version>${dl4j.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bytedeco</groupId>
-          <artifactId>javacpp</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>it.unimi.dsi</groupId>
-          <artifactId>fastutil</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.nd4j</groupId>
@@ -115,10 +125,6 @@
           <groupId>commons-net</groupId>
           <artifactId>commons-net</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.bytedeco</groupId>
-          <artifactId>javacpp</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -126,16 +132,6 @@
       <artifactId>nd4j-native-platform</artifactId>
       <version>${dl4j.version}</version>
       <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bytedeco</groupId>
-          <artifactId>javacpp</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bytedeco</groupId>
-          <artifactId>javacpp-platform</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -158,11 +154,6 @@
       <artifactId>javacpp-platform</artifactId>
       <version>${javacpp.version}</version>
     </dependency>
-    <dependency>
-      <groupId>it.unimi.dsi</groupId>
-      <artifactId>fastutil</artifactId>
-      <version>8.1.1</version>
-    </dependency>
   </dependencies>
 
   <build>