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 09:52:41 UTC
(tika) branch main updated (4af4be5be -> 4d6acfc10)
This is an automated email from the ASF dual-hosted git repository.
tilman pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
from 4af4be5be Merge pull request #1645 from apache/dependabot/maven/jakarta.xml.bind-jakarta.xml.bind-api-4.0.2
new 8b398201a TIKA-4199: revert "complete delegate class", field "in" is a dummy; remove workaround for commons-compress 1.26
new 5b259d60a TIKA-4199: adjust test results now that commons compress bug has been fixed
new 4d6acfc10 TIKA-4199: update commons-compress
The 3 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 | 50 +---------------------
.../parser/microsoft/ooxml/TruncatedOOXMLTest.java | 4 +-
3 files changed, 4 insertions(+), 54 deletions(-)
(tika) 03/03: 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 main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 4d6acfc109f842421030e05c33794bc8090caebb
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Mar 9 10:36:43 2024 +0100
TIKA-4199: update commons-compress
---
tika-parent/pom.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index c4079012c..5219a2a7a 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -326,9 +326,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>
- <!-- TODO: after 1.26.0 test whether the changes made in PR 1605 are still needed
- (PackageParser and IWorkPackageParser) -->
- <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.fileupload.version>1.5</commons.fileupload.version>
(tika) 01/03: 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 main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 8b398201a969b952bfee3166cec1395ae409071b
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Mar 9 10:34:57 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 | 50 +---------------------
1 file changed, 1 insertion(+), 49 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 2f72e5c38..ae040dbcc 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
@@ -29,7 +29,6 @@ import static org.apache.tika.detect.zip.PackageConstants.ZIP;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.nio.charset.Charset;
import java.util.Collections;
import java.util.Date;
@@ -451,7 +450,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();
@@ -520,53 +518,7 @@ public class PackageParser extends AbstractEncodingDetectorParser {
@Override
public void close() throws IOException {
file.close();
- }
-
- @Override
- public synchronized void mark(int readlimit) {
- in.mark(readlimit);
- }
-
- @Override
- public synchronized void reset() throws IOException {
- in.reset();
- }
-
- @Override
- public boolean markSupported() {
- return in.markSupported();
- }
-
- @Override
- public byte[] readAllBytes() throws IOException {
- return in.readAllBytes();
- }
-
- @Override
- public byte[] readNBytes(int len) throws IOException {
- return in.readNBytes(len);
- }
-
- @Override
- public int readNBytes(byte[] b, int off, int len) throws IOException {
- return in.readNBytes(b, off, len);
- }
-
- @Override
- public long skip(long n) throws IOException {
- return in.skip(n);
- }
-
- @Override
- public int available() throws IOException {
- return in.available();
- }
-
- @Override
- public long transferTo(OutputStream out) throws IOException {
- return in.transferTo(out);
- }
-
+ }
}
/**
(tika) 02/03: 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 main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 5b259d60a490699252ea582aaec02a3575e4f7ff
Author: Tilman Hausherr <ti...@apache.org>
AuthorDate: Sat Mar 9 10:35:53 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 9b2a854db..9046f4951 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()); // 19 before commons-compress 1.26.0, last one useless
+ assertEquals(19, metadataList.size());
Metadata m = metadataList.get(0);
assertEquals("application/x-tika-ooxml", m.get(Metadata.CONTENT_TYPE));
}
@@ -57,7 +57,7 @@ public class TruncatedOOXMLTest extends TikaTest {
System.out.println("cont: " + m.get("X-TIKA:content"));
});
- assertEquals(3, metadataList.size()); // 4 before commons-compress 1.26.0, last one useless
+ assertEquals(4, metadataList.size());
Metadata m = metadataList.get(0);
assertEquals("application/x-tika-ooxml", m.get(Metadata.CONTENT_TYPE));
}