This is an automated email from the ASF dual-hosted git repository. tilman pushed a commit to branch branch_2x in repository https://gitbox.apache.org/repos/asf/tika.git
commit befb6fbf3bec3060bcb6209755903df4e68f6d45 Author: Tilman Hausherr <[email protected]> AuthorDate: Fri Jul 5 09:44:54 2024 +0200 TIKA-4239: fix javacpp version problems, exclude ffmpeg until CVEs are fixed --- tika-parsers/tika-parsers-ml/tika-dl/pom.xml | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml index 66f8ebcf7..4aa7453c6 100644 --- a/tika-parsers/tika-parsers-ml/tika-dl/pom.xml +++ b/tika-parsers/tika-parsers-ml/tika-dl/pom.xml @@ -43,6 +43,20 @@ <artifactId>datavec-data-image</artifactId> <version>${dl4j.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>ffmpeg</artifactId> + </exclusion> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</artifactId> + </exclusion> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp-platform</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.deeplearning4j</groupId> @@ -55,12 +69,33 @@ <artifactId>deeplearning4j-modelimport</artifactId> <version>${dl4j.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</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> + <scope>provided</scope> + </dependency> + --> <dependency> <groupId>org.deeplearning4j</groupId> <artifactId>deeplearning4j-nn</artifactId> <version>${dl4j.version}</version> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nd4j</groupId> @@ -72,6 +107,10 @@ <groupId>commons-net</groupId> <artifactId>commons-net</artifactId> </exclusion> + <exclusion> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -79,6 +118,16 @@ <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> @@ -91,6 +140,16 @@ <version>${commons.net.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp</artifactId> + <version>${javacpp.version}</version> + </dependency> + <dependency> + <groupId>org.bytedeco</groupId> + <artifactId>javacpp-platform</artifactId> + <version>${javacpp.version}</version> + </dependency> </dependencies> <build>
