Skip to content

Commit e9e3cc3

Browse files
committed
TIKA-4166: add and update dependencies, reorganize; update and restore ffmpeg
1 parent 8eeb4d4 commit e9e3cc3

File tree

1 file changed

+28
-37
lines changed
  • tika-parsers/tika-parsers-ml/tika-dl

1 file changed

+28
-37
lines changed

tika-parsers/tika-parsers-ml/tika-dl/pom.xml

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,33 @@
3131
<name>Apache Tika Deep Learning (powered by DL4J)</name>
3232
<url>http://maven.apache.org</url>
3333

34+
35+
<dependencyManagement>
36+
<dependencies>
37+
<dependency>
38+
<groupId>org.bytedeco</groupId>
39+
<artifactId>openblas-platform</artifactId>
40+
<version>0.3.28-1.5.11</version>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.bytedeco</groupId>
44+
<artifactId>openblas</artifactId>
45+
<version>0.3.28-1.5.11</version>
46+
</dependency>
47+
<!-- can't update above 4.5.5-1.5.7, UnsatisfiedLinkError: no jniopencv_core in java.library.path -->
48+
<dependency>
49+
<groupId>org.bytedeco</groupId>
50+
<artifactId>opencv</artifactId>
51+
<version>4.5.5-1.5.7</version>
52+
</dependency>
53+
<dependency>
54+
<groupId>it.unimi.dsi</groupId>
55+
<artifactId>fastutil</artifactId>
56+
<version>8.1.1</version>
57+
</dependency>
58+
</dependencies>
59+
</dependencyManagement>
60+
3461
<dependencies>
3562
<dependency>
3663
<groupId>${project.groupId}</groupId>
@@ -56,21 +83,14 @@
5683
<groupId>org.bytedeco</groupId>
5784
<artifactId>javacpp-platform</artifactId>
5885
</exclusion>
59-
<exclusion>
60-
<groupId>it.unimi.dsi</groupId>
61-
<artifactId>fastutil</artifactId>
62-
</exclusion>
6386
</exclusions>
6487
</dependency>
65-
<!-- TODO restore after ffmpeg has been updated -->
66-
<!--
6788
<dependency>
6889
<groupId>org.bytedeco</groupId>
6990
<artifactId>ffmpeg</artifactId>
70-
<version>6.1.1-1.5.10</version>
91+
<version>7.1-1.5.11</version>
7192
<scope>provided</scope>
7293
</dependency>
73-
-->
7494
<dependency>
7595
<groupId>org.deeplearning4j</groupId>
7696
<artifactId>deeplearning4j-zoo</artifactId>
@@ -94,16 +114,6 @@
94114
<artifactId>deeplearning4j-nn</artifactId>
95115
<version>${dl4j.version}</version>
96116
<scope>provided</scope>
97-
<exclusions>
98-
<exclusion>
99-
<groupId>org.bytedeco</groupId>
100-
<artifactId>javacpp</artifactId>
101-
</exclusion>
102-
<exclusion>
103-
<groupId>it.unimi.dsi</groupId>
104-
<artifactId>fastutil</artifactId>
105-
</exclusion>
106-
</exclusions>
107117
</dependency>
108118
<dependency>
109119
<groupId>org.nd4j</groupId>
@@ -115,27 +125,13 @@
115125
<groupId>commons-net</groupId>
116126
<artifactId>commons-net</artifactId>
117127
</exclusion>
118-
<exclusion>
119-
<groupId>org.bytedeco</groupId>
120-
<artifactId>javacpp</artifactId>
121-
</exclusion>
122128
</exclusions>
123129
</dependency>
124130
<dependency>
125131
<groupId>org.nd4j</groupId>
126132
<artifactId>nd4j-native-platform</artifactId>
127133
<version>${dl4j.version}</version>
128134
<scope>provided</scope>
129-
<exclusions>
130-
<exclusion>
131-
<groupId>org.bytedeco</groupId>
132-
<artifactId>javacpp</artifactId>
133-
</exclusion>
134-
<exclusion>
135-
<groupId>org.bytedeco</groupId>
136-
<artifactId>javacpp-platform</artifactId>
137-
</exclusion>
138-
</exclusions>
139135
</dependency>
140136
<dependency>
141137
<groupId>org.apache.logging.log4j</groupId>
@@ -158,11 +154,6 @@
158154
<artifactId>javacpp-platform</artifactId>
159155
<version>${javacpp.version}</version>
160156
</dependency>
161-
<dependency>
162-
<groupId>it.unimi.dsi</groupId>
163-
<artifactId>fastutil</artifactId>
164-
<version>8.1.1</version>
165-
</dependency>
166157
</dependencies>
167158

168159
<build>

0 commit comments

Comments
 (0)