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
The following commit(s) were added to refs/heads/branch_3x by this push:
new 84dd437646 [TIKA-4695] set TZ because of metadata-extractor change in
update (#2753)
84dd437646 is described below
commit 84dd4376467acdfe033083be5903ad3d10cd12e0
Author: Tilman Hausherr <[email protected]>
AuthorDate: Thu Apr 9 14:47:00 2026 +0200
[TIKA-4695] set TZ because of metadata-extractor change in update (#2753)
* [TIKA-4695] set TZ because of metadata-extractor change
Add setup and teardown methods for timezone management in JpegParserTest.
* Update metadata.extractor.version to 2.20.0
* Update
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
Co-authored-by: Copilot <[email protected]>
* Add isolation to JpegParserTest class
* Add Isolated import to JpegParserTest
* Update
tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
Co-authored-by: Copilot <[email protected]>
* Add resource locking to JpegParserTest
---------
Co-authored-by: Copilot <[email protected]>
---
tika-parent/pom.xml | 2 +-
.../org/apache/tika/parser/image/JpegParserTest.java | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
index 0578b14275..37a6cdadc7 100644
--- a/tika-parent/pom.xml
+++ b/tika-parent/pom.xml
@@ -401,7 +401,7 @@
<lucene.version>9.12.3</lucene.version>
<maven.plugin.annotations.version>3.15.2</maven.plugin.annotations.version>
<mchange.version>0.4.0</mchange.version>
- <metadata.extractor.version>2.19.0</metadata.extractor.version>
+ <metadata.extractor.version>2.20.0</metadata.extractor.version>
<microsoft.translator.version>0.6.2</microsoft.translator.version>
<mime4j.version>0.8.13</mime4j.version>
<mockito.version>5.23.0</mockito.version>
diff --git
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
index 9775b9464d..cda2ebf552 100644
---
a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
+++
b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-image-module/src/test/java/org/apache/tika/parser/image/JpegParserTest.java
@@ -26,7 +26,12 @@ import java.util.Arrays;
import java.util.List;
import java.util.TimeZone;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import org.xml.sax.helpers.DefaultHandler;
import org.apache.tika.metadata.Geographic;
@@ -37,10 +42,25 @@ import org.apache.tika.metadata.XMPMM;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
+@Isolated
+@ResourceLock(Resources.TIME_ZONE)
public class JpegParserTest {
static TimeZone CURR_TIME_ZONE = TimeZone.getDefault();
private final Parser parser = new JpegParser();
+ private static TimeZone originalTimeZone;
+
+ @BeforeAll
+ static void init() {
+ // metadata-extractor 2.20.0 started making these parsed dates depend
on the JVM default time zone;
+ // force GMT so the assertions remain deterministic across environments
+ originalTimeZone = TimeZone.getDefault();
+ TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+ }
+ @AfterAll
+ static void tearDown() {
+ TimeZone.setDefault(originalTimeZone);
+ }
@Test
public void testJPEG() throws Exception {
