You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ti...@apache.org on 2024/07/05 07:45:06 UTC
(tika) branch branch_2x updated (01a9a1990 -> befb6fbf3)
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a change to branch branch_2x
in repository https://gitbox.apache.org/repos/asf/tika.git
from 01a9a1990 TIKA-4239: update aws, project info reports, kafka, jwarc, versions plugin
new 9aaae42ea TIKA-4239: introduce javacpp version; update aws, commons logging, poi
new befb6fbf3 TIKA-4239: fix javacpp version problems, exclude ffmpeg until CVEs are fixed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
tika-parent/pom.xml | 7 ++--
tika-parsers/tika-parsers-ml/tika-dl/pom.xml | 59 ++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 3 deletions(-)
(tika) 01/02: TIKA-4239: introduce javacpp version; update aws, commons logging, poi
Posted by ti...@apache.org.
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 9aaae42ea7791f8a87802981fff7b17c021a1806
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Fri Jul 5 09:44:20 2024 +0200
TIKA-4239: introduce javacpp version; update aws, commons logging, poi
---
tika-parent/pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 0d29a2609..bfc8c0e86 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -307,7 +307,7 @@
<!-- dependency versions -->
<google.cloud.version>2.40.1</google.cloud.version>
- <aws.version>1.12.753</aws.version>
+ <aws.version>1.12.756</aws.version>
<!-- WARNING: when you upgrade asm make sure that you update the
OpCode in the initializer in org.apache.tika.parser.asm.XHTMLClassVisitor
See TIKA-2992.
@@ -326,7 +326,7 @@
<commons.exec.version>1.4.0</commons.exec.version>
<commons.io.version>2.16.1</commons.io.version>
<commons.lang3.version>3.14.0</commons.lang3.version>
- <commons.logging.version>1.3.2</commons.logging.version>
+ <commons.logging.version>1.3.3</commons.logging.version>
<commons.math3.version>3.6.1</commons.math3.version>
<commons.net.version>3.11.1</commons.net.version>
<commons.fileupload.version>1.5</commons.fileupload.version>
@@ -388,7 +388,7 @@
<pax.exam.version>4.13.5</pax.exam.version>
<pdfbox.version>2.0.31</pdfbox.version>
<!-- NOTE: sync tukaani version with commons-compress in tika-parsers -->
- <poi.version>5.2.5</poi.version>
+ <poi.version>5.3.0</poi.version>
<quartz.version>2.3.2</quartz.version>
<reactor.netty.version>1.1.20</reactor.netty.version>
<rome.version>2.1.0</rome.version>
@@ -415,6 +415,7 @@
<netty.version>4.1.111.Final</netty.version>
<snappy.java.version>1.1.10.5</snappy.java.version>
<logback.version>1.5.6</logback.version>
+ <javacpp.version>1.5.10</javacpp.version>
</properties>
<dependencyManagement>
(tika) 02/02: TIKA-4239: fix javacpp version problems, exclude ffmpeg until CVEs are fixed
Posted by ti...@apache.org.
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 <ti...@apache.org>
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>