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/03/09 10:51:16 UTC
(tika) branch branch_2x updated (de11837f1 -> 75a255001)
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 de11837f1 TIKA-4162: update aws
new 323f76217 TIKA-4199: adjust test results now that commons compress bug has been fixed
new d5bd8e199 TIKA-4199: revert "complete delegate class", field "in" is a dummy; remove workaround for commons-compress 1.26
new 4a0b20de6 TIKA-4199: update commons-compress
new 75a255001 TIKA-4162: update aws
The 4 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 | 4 ++--
.../org/apache/tika/parser/pkg/PackageParser.java | 23 ----------------------
.../parser/microsoft/ooxml/TruncatedOOXMLTest.java | 4 ++--
3 files changed, 4 insertions(+), 27 deletions(-)
(tika) 03/04: TIKA-4199: update commons-compress
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 4a0b20de60826afced4a9db649a0e126bec819f7
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Mar 9 11:40:15 2024 +0100
TIKA-4199: update commons-compress
---
tika-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 04bbd39d0..af81136c5 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -321,7 +321,7 @@
<commons.cli.version>1.6.0</commons.cli.version>
<commons.codec.version>1.16.1</commons.codec.version>
<commons.collections4.version>4.4</commons.collections4.version>
- <commons.compress.version>1.26.0</commons.compress.version>
+ <commons.compress.version>1.26.1</commons.compress.version>
<commons.csv.version>1.10.0</commons.csv.version>
<commons.exec.version>1.4.0</commons.exec.version>
<commons.io.version>2.15.1</commons.io.version>
(tika) 01/04: TIKA-4199: adjust test results now that commons compress bug has been 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 323f762179df0670051244d8c860fd93ae86a1a9
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Mar 9 11:39:29 2024 +0100
TIKA-4199: adjust test results now that commons compress bug has been fixed
---
.../org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
index c718bb8ff..60662b8ea 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/src/test/java/org/apache/tika/parser/microsoft/ooxml/TruncatedOOXMLTest.java
@@ -38,7 +38,7 @@ public class TruncatedOOXMLTest extends TikaTest {
//this tests that there's a backoff to the pkg parser
List<Metadata> metadataList =
getRecursiveMetadata(truncate("testWORD_various.docx", 13138), true);
- assertEquals(18, metadataList.size());
+ assertEquals(19, metadataList.size());
Metadata m = metadataList.get(0);
assertEquals("application/x-tika-ooxml", m.get(Metadata.CONTENT_TYPE));
}
@@ -48,7 +48,7 @@ public class TruncatedOOXMLTest extends TikaTest {
//this is really truncated
List<Metadata> metadataList =
getRecursiveMetadata(truncate("testWORD_various.docx", 774), true);
- assertEquals(3, metadataList.size());
+ assertEquals(4, metadataList.size());
Metadata m = metadataList.get(0);
assertEquals("application/x-tika-ooxml", m.get(Metadata.CONTENT_TYPE));
}
(tika) 02/04: TIKA-4199: revert "complete delegate class", field "in" is a dummy; remove workaround for commons-compress 1.26
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 d5bd8e199efdbe392a0fdf8dd6c3f9d9d113e3c0
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Mar 9 11:39:53 2024 +0100
TIKA-4199: revert "complete delegate class", field "in" is a dummy; remove workaround for commons-compress 1.26
---
.../org/apache/tika/parser/pkg/PackageParser.java | 23 ----------------------
1 file changed, 23 deletions(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
index e469744b7..86bfbaa88 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
@@ -449,7 +449,6 @@ public class PackageParser extends AbstractEncodingDetectorParser {
TemporaryResources tmp = new TemporaryResources();
try {
TikaInputStream tis = TikaInputStream.get(archive, tmp, entrydata);
- tis.getPath(); // fixes troubles with commons-compress 1.26.0
extractor.parseEmbedded(tis, xhtml, entrydata, true);
} finally {
tmp.dispose();
@@ -519,28 +518,6 @@ public class PackageParser extends AbstractEncodingDetectorParser {
public void close() throws IOException {
file.close();
}
-
- @Override
- public long skip(long n) throws IOException {
- return in.skip(n);
- }
-
- @Override
- public int available() throws IOException {
- return in.available();
- }
-
- @Override
- public synchronized void mark(int readlimit) {
- in.mark(readlimit);
- }
-
- @Override
- public boolean markSupported() {
- return in.markSupported();
- }
-
-
}
/**
(tika) 04/04: TIKA-4162: update aws
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 75a2550016b050b50b8b0c307d07c4db556bd24e
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Mar 9 11:41:41 2024 +0100
TIKA-4162: update aws
---
tika-parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index af81136c5..9091c51b0 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -307,7 +307,7 @@
<!-- dependency versions -->
<google.cloud.version>2.35.0</google.cloud.version>
- <aws.version>1.12.675</aws.version>
+ <aws.version>1.12.676</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.