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 2025/08/01 10:09:31 UTC
(tika) branch branch_3x updated (a42c4a41a -> 110d9a281)
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a change to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
from a42c4a41a TIKA-4455: update aws
new c75049df5 TIKA-4455: adjust exception, remove unneeded code
new 110d9a281 TIKA-4455: update commons compress, commons csv, google cloud
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 | 6 +++---
.../org/apache/tika/detect/zip/DefaultZipContainerDetector.java | 9 +++------
2 files changed, 6 insertions(+), 9 deletions(-)
(tika) 01/02: TIKA-4455: adjust exception, remove unneeded code
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit c75049df5d11811c823e813d95d967717c44d292
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Fri Aug 1 12:08:14 2025 +0200
TIKA-4455: adjust exception, remove unneeded code
---
.../org/apache/tika/detect/zip/DefaultZipContainerDetector.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
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 11ca45a49..1ea61d23b 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.Path;
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;
}
}
@@ -207,10 +205,9 @@ public class DefaultZipContainerDetector implements Detector {
private MediaType tryStreamingOnTikaInputStream(TikaInputStream tis, Metadata metadata) throws IOException {
BoundedInputStream boundedInputStream = new BoundedInputStream(markLimit, tis);
boundedInputStream.mark(markLimit);
- MediaType mt = null;
//try streaming detect
try {
- mt = detectStreaming(boundedInputStream, metadata, false);
+ MediaType mt = detectStreaming(boundedInputStream, metadata, false);
if (! boundedInputStream.hasHitBound()) {
return mt;
}
(tika) 02/02: TIKA-4455: update commons compress, commons csv, google cloud
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a commit to branch branch_3x
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 110d9a281af000c00c5d83b2ceafc47ca52f993c
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Fri Aug 1 12:09:19 2025 +0200
TIKA-4455: update commons compress, commons csv, google cloud
---
tika-parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 693094241..40468e026 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -309,7 +309,7 @@
<!-- dependency versions -->
<!-- change threetenbp exclusion version -->
- <google.cloud.version>2.53.3</google.cloud.version>
+ <google.cloud.version>2.54.0</google.cloud.version>
<aws.version>1.12.788</aws.version>
<aws2.version>2.32.13</aws2.version>
<!-- WARNING: when you upgrade asm make sure that you update the
@@ -335,8 +335,8 @@
<commons.cli.version>1.9.0</commons.cli.version>
<commons.codec.version>1.19.0</commons.codec.version>
<commons.collections4.version>4.5.0</commons.collections4.version>
- <commons.compress.version>1.27.1</commons.compress.version>
- <commons.csv.version>1.14.0</commons.csv.version>
+ <commons.compress.version>1.28.0</commons.compress.version>
+ <commons.csv.version>1.14.1</commons.csv.version>
<commons.exec.version>1.5.0</commons.exec.version>
<commons.fileupload.version>1.6.0</commons.fileupload.version>
<commons.io.version>2.20.0</commons.io.version>