Skip to content

Commit

Permalink
TIKA-4327: add and update dependencies, reorganize; update and restor…
Browse files Browse the repository at this point in the history 
…e ffmpeg
  • Loading branch information
@THausherr
THausherr committed Nov 26, 2024
1 parent 7e4d127 commit 0706153
Showing 1 changed file with 28 additions and 37 deletions.
65 changes: 28 additions & 37 deletions tika-parsers/tika-parsers-ml/tika-dl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -115,27 +125,13 @@
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</exclusion>
<exclusion>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.nd4j</groupId>
<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>
Expand All @@ -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>
Expand Down

0 comments on commit 0706153

Please sign in to comment.