You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2022/05/06 19:18:07 UTC
[tika] branch main updated: TIKA-3751 -- general upgrades for 2.4.1
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new dcec488a2 TIKA-3751 -- general upgrades for 2.4.1
dcec488a2 is described below
commit dcec488a289fa2621eb0fe728543ea84c1258f49
Author: tballison <ta...@apache.org>
AuthorDate: Fri May 6 15:17:58 2022 -0400
TIKA-3751 -- general upgrades for 2.4.1
---
.../pipes/opensearch/tests/TikaPipesOpenSearchTest.java | 2 +-
tika-parent/pom.xml | 6 +++---
.../org/apache/tika/parser/mp4/TikaMp4BoxHandler.java | 16 ++++++++--------
.../apache/tika/parser/mp4/boxes/TikaUserDataBox.java | 6 ++----
4 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
index 8106eb3d7..a62104b0e 100644
--- a/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
+++ b/tika-integration-tests/tika-pipes-opensearch-integration-tests/src/test/java/org/apache/tika/pipes/opensearch/tests/TikaPipesOpenSearchTest.java
@@ -28,7 +28,7 @@ import org.apache.tika.pipes.xsearch.tests.TikaPipesXSearchBase;
public class TikaPipesOpenSearchTest extends TikaPipesXSearchBase {
- private static final String DOCKER_IMAGE_NAME = "opensearchproject/opensearch:1.3.1";
+ private static final String DOCKER_IMAGE_NAME = "opensearchproject/opensearch:1.3.2";
@ClassRule
public static GenericContainer<?> OPEN_SEARCH_CONTAINER =
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 1fab1f63f..2522f9a53 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -283,11 +283,11 @@
<maven.surefire.version>3.0.0-M6</maven.surefire.version>
<maven.shade.version>3.2.4</maven.shade.version>
<!-- need above java 8 for 10.[0-1] -->
- <puppycrawl.version>9.3</puppycrawl.version>
+ <puppycrawl.version>10.2</puppycrawl.version>
<rat.version>0.13</rat.version>
<!-- dependency versions -->
- <aws.version>1.12.206</aws.version>
+ <aws.version>1.12.214</aws.version>
<asm.version>9.3</asm.version>
<boilerpipe.version>1.1.0</boilerpipe.version>
<!-- used by POI, PDFBox and Jackcess ...try to sync -->
@@ -343,7 +343,7 @@
<lombok.version>1.18.20</lombok.version>
<!-- lucene >= 9.x requires Java 11 -->
<lucene.version>8.11.1</lucene.version>
- <metadata.extractor.version>2.17.0</metadata.extractor.version>
+ <metadata.extractor.version>2.18.0</metadata.extractor.version>
<microsoft.translator.version>0.6.2</microsoft.translator.version>
<!-- 0.8.6 is built with java 11 and does not work with Java 8 -->
<mime4j.version>0.8.4</mime4j.version>
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4BoxHandler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4BoxHandler.java
index 067511029..ca399ab8b 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4BoxHandler.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4BoxHandler.java
@@ -24,7 +24,6 @@ import com.drew.lang.annotations.Nullable;
import com.drew.metadata.Metadata;
import com.drew.metadata.mp4.Mp4BoxHandler;
import com.drew.metadata.mp4.Mp4Context;
-import com.drew.metadata.mp4.boxes.Box;
import org.xml.sax.SAXException;
import org.apache.tika.parser.mp4.boxes.TikaUserDataBox;
@@ -42,30 +41,31 @@ public class TikaMp4BoxHandler extends Mp4BoxHandler {
}
@Override
- public boolean shouldAcceptBox(@NotNull Box box) {
- if (box.type.equals("udta")) {
+ public boolean shouldAcceptBox(@NotNull String box) {
+ if (box.equals("udta")) {
return true;
}
return super.shouldAcceptBox(box);
}
@Override
- public boolean shouldAcceptContainer(@NotNull Box box) {
+ public boolean shouldAcceptContainer(@NotNull String box) {
return super.shouldAcceptContainer(box);
}
@Override
- public Mp4Handler<?> processBox(@NotNull Box box, @Nullable byte[] payload, Mp4Context context)
+ public Mp4Handler<?> processBox(@NotNull String box, @Nullable byte[] payload,
+ long size, Mp4Context context)
throws IOException {
- if (box.type.equals("udta")) {
+ if (box.equals("udta")) {
return processUserData(box, payload, context);
}
- return super.processBox(box, payload, context);
+ return super.processBox(box, payload, size, context);
}
- private Mp4Handler<?> processUserData(Box box, byte[] payload, Mp4Context context) throws IOException {
+ private Mp4Handler<?> processUserData(String box, byte[] payload, Mp4Context context) throws IOException {
if (payload == null) {
return this;
}
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/boxes/TikaUserDataBox.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/boxes/TikaUserDataBox.java
index fcde0fc25..9324431b2 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/boxes/TikaUserDataBox.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/boxes/TikaUserDataBox.java
@@ -26,7 +26,6 @@ import com.drew.lang.SequentialReader;
import com.drew.lang.annotations.NotNull;
import com.drew.lang.annotations.Nullable;
import com.drew.metadata.mp4.Mp4Directory;
-import com.drew.metadata.mp4.boxes.Box;
import org.xml.sax.SAXException;
import org.apache.tika.exception.RuntimeSAXException;
@@ -36,7 +35,7 @@ import org.apache.tika.metadata.XMP;
import org.apache.tika.metadata.XMPDM;
import org.apache.tika.sax.XHTMLContentHandler;
-public class TikaUserDataBox extends Box {
+public class TikaUserDataBox {
private static final String LOCATION_CODE = "\u00A9xyz";
private static final String META = "meta";
@@ -53,9 +52,8 @@ public class TikaUserDataBox extends Box {
private boolean isQuickTime = false;
private final Metadata metadata;
private final XHTMLContentHandler xhtml;
- public TikaUserDataBox(@NotNull Box box, byte[] payload, Metadata metadata,
+ public TikaUserDataBox(@NotNull String box, byte[] payload, Metadata metadata,
XHTMLContentHandler xhtml) throws IOException, SAXException {
- super(box);
this.metadata = metadata;
this.xhtml = xhtml;
int length = payload.length;