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
The following commit(s) were added to refs/heads/branch_2x by this push:
new 42387e417 TIKA-4456: update commons-compress, commons-lang3, netty,
reactor-netty; exclude jackrabbitt and commons-lang; adjust exception to
commons-compress update
42387e417 is described below
commit 42387e4179061e1b85d94f656aa0ded626858be2
Author: Tilman Hausherr <[email protected]>
AuthorDate: Sat Aug 2 13:26:31 2025 +0200
TIKA-4456: update commons-compress, commons-lang3, netty, reactor-netty;
exclude jackrabbitt and commons-lang; adjust exception to commons-compress
update
---
tika-parent/pom.xml | 26 ++++++++++++++++++----
.../detect/zip/DefaultZipContainerDetector.java | 6 ++---
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index cb8126cb6..d59391dc9 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -324,11 +324,11 @@
<commons.cli.version>1.9.0</commons.cli.version>
<commons.codec.version>1.18.0</commons.codec.version>
<commons.collections4.version>4.5.0</commons.collections4.version>
- <commons.compress.version>1.27.1</commons.compress.version>
+ <commons.compress.version>1.28.0</commons.compress.version>
<commons.csv.version>1.14.0</commons.csv.version>
<commons.exec.version>1.4.0</commons.exec.version>
<commons.io.version>2.19.0</commons.io.version>
- <commons.lang3.version>3.17.0</commons.lang3.version>
+ <commons.lang3.version>3.18.0</commons.lang3.version>
<commons.logging.version>1.3.5</commons.logging.version>
<commons.math3.version>3.6.1</commons.math3.version>
<commons.net.version>3.11.1</commons.net.version>
@@ -382,7 +382,7 @@
<!-- mockito >= 5 requires jdk11 -->
<mockito.version>4.11.0</mockito.version>
<netcdf-java.version>4.5.5</netcdf-java.version>
- <netty.version>4.2.2.Final</netty.version>
+ <netty.version>4.2.3.Final</netty.version>
<oak.jackrabbit.version>1.82.0</oak.jackrabbit.version>
<openjson.version>1.0.13</openjson.version>
<!-- 2.0.0 doesn't compile with jdk8 -->
@@ -399,7 +399,7 @@
<!-- 2.5.0 needs jakarta.xml.bind 4.0.2 in tika-parser-scientific-module
-->
<quartz.version>2.3.2</quartz.version>
<reactor.core.version>3.7.7</reactor.core.version>
- <reactor.netty.version>1.2.7</reactor.netty.version>
+ <reactor.netty.version>1.3.0-M5</reactor.netty.version>
<rome.version>2.1.0</rome.version>
<scm.version>2.1.0</scm.version>
<sis.version>1.3</sis.version>
@@ -1114,6 +1114,24 @@
<version>3.2.0</version>
<configuration>
<excludeCoordinates>
+ <!-- can't update jackrabbitt. However this is only used in
examples,
+ users should update stuff anyway before using such code in
production. -->
+ <coordinate>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>2.21.22</version>
+ </coordinate>
+ <coordinate>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi-commons</artifactId>
+ <version>2.21.22</version>
+ </coordinate>
+ <!-- because of solr -->
+ <coordinate>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </coordinate>
<!-- the link from ossindex "divide by zero" points to fixes that
were made in 2.18.0 -->
<exclude>
<groupId>com.drewnoakes</groupId>
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java
index 9adfe9ba0..582775809 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-zip-commons/src/main/java/org/apache/tika/detect/zip/DefaultZipContainerDetector.java
@@ -24,13 +24,11 @@ import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
import
org.apache.commons.compress.archivers.zip.UnsupportedZipFeatureException;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipFile;
-import org.apache.commons.compress.compressors.CompressorException;
import org.apache.commons.compress.compressors.CompressorStreamFactory;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.CloseShieldInputStream;
@@ -124,7 +122,7 @@ public class DefaultZipContainerDetector implements
Detector {
String name = ArchiveStreamFactory.detect(
UnsynchronizedByteArrayInputStream.builder().setByteArray(prefix).setLength(length).get());
return PackageConstants.getMediaType(name);
- } catch (IOException | ArchiveException e) {
+ } catch (IOException e) {
return MediaType.OCTET_STREAM;
}
}
@@ -135,7 +133,7 @@ public class DefaultZipContainerDetector implements
Detector {
CompressorStreamFactory.detect(
UnsynchronizedByteArrayInputStream.builder().setByteArray(prefix).setLength(length).get());
return CompressorConstants.getMediaType(type);
- } catch (IOException | CompressorException e) {
+ } catch (IOException e) {
return MediaType.OCTET_STREAM;
}
}
