JDK 25 seems to have added Exif thumbnail read support

Bumps org.apache.maven.scm:maven-scm-provider-gitexe from 2.1.0 to 2.2.1.

---
updated-dependencies:
- dependency-name: org.apache.maven.scm:maven-scm-provider-gitexe
  dependency-version: 2.2.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci.yml

@@ -17,13 +17,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        java: [ 11, 17, 21, 23 ]
+        java: [ 11, 17, 21, 25 ]
     runs-on: ${{ matrix.os }}
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -32,7 +32,7 @@ jobs:
       - name: Run Tests
         run: mvn --batch-mode --no-transfer-progress test
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@a83fd2b5d58d4fc702e690c1ea688d702d28d281 # v5
+        uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5
         if: ${{ !cancelled() }}
         with:
           report_paths: "**/target/surefire-reports/TEST*.xml"
@@ -48,8 +48,8 @@ jobs:
     permissions:
       checks: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'temurin'
           java-version: '8'
@@ -58,7 +58,7 @@ jobs:
       - name: Run Tests
         run: mvn --batch-mode --no-transfer-progress test
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@a83fd2b5d58d4fc702e690c1ea688d702d28d281 # v5
+        uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5
         if: ${{ !cancelled() }}
         with:
           report_paths: "**/target/surefire-reports/TEST*.xml"
@@ -73,11 +73,11 @@ jobs:
       matrix:
         kcms: [ true, false ]
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - run: |
           download_url="https://javadl.oracle.com/webapps/download/AutoDL?BundleId=245038_d3c52aa6bfa54d3ca74e617f18309292"
           wget -O $RUNNER_TEMP/java_package.tar.gz $download_url
-      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           distribution: 'jdkfile'
           jdkFile: ${{ runner.temp }}/java_package.tar.gz
@@ -92,7 +92,7 @@ jobs:
       - name: Run Tests
         run: mvn --batch-mode --no-transfer-progress test
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@a83fd2b5d58d4fc702e690c1ea688d702d28d281 # v5
+        uses: mikepenz/action-junit-report@3585e9575db828022551b4231f165eb59a0e74e3 # v5
         if: ${{ !cancelled() }}
         with:
           report_paths: "**/target/surefire-reports/TEST*.xml"
@@ -104,9 +104,9 @@ jobs:
     if: github.ref == 'refs/heads/master' # only perform on latest master
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Set up Maven Central
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with: # running setup-java again overwrites the settings.xml
           distribution: 'temurin'
           java-version: '8'

.github/workflows/codeql.yml

@@ -33,11 +33,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+      uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +51,7 @@ jobs:
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+      uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -64,6 +64,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+      uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -26,12 +26,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -57,6 +57,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
         with:
           sarif_file: results.sarif

common/pom.xml

@@ -21,7 +21,7 @@
     </modules>
 
     <properties>
-        <junit.jupiter.version>5.13.1</junit.jupiter.version>
+        <junit.jupiter.version>5.14.0</junit.jupiter.version>
     </properties>
 
     <dependencyManagement>

contrib/pom.xml

@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <junit.jupiter.version>5.13.1</junit.jupiter.version>
+        <junit.jupiter.version>5.14.0</junit.jupiter.version>
     </properties>
 
 

imageio/imageio-batik/pom.xml

@@ -63,7 +63,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.19.0</version>
+            <version>2.20.0</version>
             <scope>provided</scope>
         </dependency>
 

imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTest.java

@@ -111,6 +111,12 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         super.testReadAsRenderedImageIndexOutOfBounds();
     }
 
+    @Test
+    @Disabled("JDK 25 now supports reading Exif thumbnails, but does not report thumbnail progress")
+    public void testThumbnailProgress() throws IOException {
+        super.testThumbnailProgress();
+    }
+    
     @Test
     @Disabled("No test data with JFIF thumbnail")
     @Override

imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadata.java

@@ -71,18 +71,16 @@ public final class TIFFImageMetadata extends AbstractMetadata {
 
     /**
      * Creates an empty TIFF metadata object.
-     *
      * Client code can update or change the metadata using the
      * {@link #setFromTree(String, Node)}
      * or {@link #mergeTree(String, Node)} methods.
      */
     public TIFFImageMetadata() {
-        this(new IFD(Collections.<Entry>emptyList()));
+        this(new IFD(Collections.emptyList()));
     }
 
     /**
      * Creates a TIFF metadata object, using the values from the given IFD.
-     *
      * Client code can update or change the metadata using the
      * {@link #setFromTree(String, Node)}
      * or {@link #mergeTree(String, Node)} methods.
@@ -95,7 +93,6 @@ public final class TIFFImageMetadata extends AbstractMetadata {
 
     /**
      * Creates a TIFF metadata object, using the values from the given entries.
-     *
      * Client code can update or change the metadata using the
      * {@link #setFromTree(String, Node)}
      * or {@link #mergeTree(String, Node)} methods.
@@ -493,10 +490,10 @@ public final class TIFFImageMetadata extends AbstractMetadata {
                 compressionTypeName.setAttribute("value", "CCITT RLE");
                 break;
             case TIFFExtension.COMPRESSION_CCITT_T4:
-                compressionTypeName.setAttribute("value", "CCITT T4");
+                compressionTypeName.setAttribute("value", "CCITT T.4");
                 break;
             case TIFFExtension.COMPRESSION_CCITT_T6:
-                compressionTypeName.setAttribute("value", "CCITT T6");
+                compressionTypeName.setAttribute("value", "CCITT T.6");
                 break;
             case TIFFExtension.COMPRESSION_LZW:
                 compressionTypeName.setAttribute("value", "LZW");
@@ -1038,7 +1035,7 @@ public final class TIFFImageMetadata extends AbstractMetadata {
         }
 
         // If we have resolution
-        if (xRes != null && yRes != null) {
+        if (xRes != null) { // yRes != null too
             // If old unit was DPI, convert values and keep DPI, otherwise use PPCM
             Entry resUnitEntry = entries.get(TIFF.TAG_RESOLUTION_UNIT);
             int resUnitValue = resUnitEntry != null && resUnitEntry.getValue() != null

imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageMetadataTest.java

@@ -188,6 +188,102 @@ public class TIFFImageMetadataTest {
         assertEquals("HP IL v1.1", ((Element) textEntry).getAttribute("value"));
     }
 
+    @Test
+    public void testMetadataStandardFormat_CCITT300dpi() throws IOException {
+        IIOMetadata metadata = createMetadata("/tiff/CCITT-G4-300dpi-StripByteCounts0.tif");
+        Node root = metadata.getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName);
+
+        // Root: "javax_imageio_1.0"
+        assertNotNull(root);
+        assertEquals(IIOMetadataFormatImpl.standardMetadataFormatName, root.getNodeName());
+        assertEquals(5, root.getChildNodes().getLength());
+
+        // "Chroma"
+        Node chroma = root.getFirstChild();
+        assertEquals("Chroma", chroma.getNodeName());
+
+        assertEquals(3, chroma.getChildNodes().getLength());
+
+        Node colorSpaceType = chroma.getFirstChild();
+        assertEquals("ColorSpaceType", colorSpaceType.getNodeName());
+        assertEquals("GRAY", ((Element) colorSpaceType).getAttribute("name"));
+
+        Node numChannels = colorSpaceType.getNextSibling();
+        assertEquals("NumChannels", numChannels.getNodeName());
+        assertEquals("1", ((Element) numChannels).getAttribute("value"));
+
+        Node blackIsZero = numChannels.getNextSibling();
+        assertEquals("BlackIsZero", blackIsZero.getNodeName());
+        assertEquals("FALSE", ((Element) blackIsZero).getAttribute("value"));
+
+        // "Compression"
+        Node compression = chroma.getNextSibling();
+        assertEquals("Compression", compression.getNodeName());
+        assertEquals(2, compression.getChildNodes().getLength());
+
+        Node compressionTypeName = compression.getFirstChild();
+        assertEquals("CompressionTypeName", compressionTypeName.getNodeName());
+        assertEquals("CCITT T.6", ((Element) compressionTypeName).getAttribute("value"));
+
+        Node lossless = compressionTypeName.getNextSibling();
+        assertEquals("Lossless", lossless.getNodeName());
+        assertEquals(0, lossless.getAttributes().getLength());
+
+        // "Data"
+        Node data = compression.getNextSibling();
+        assertEquals("Data", data.getNodeName());
+        assertEquals(4, data.getChildNodes().getLength());
+
+        Node planarConfiguration = data.getFirstChild();
+        assertEquals("PlanarConfiguration", planarConfiguration.getNodeName());
+        assertEquals("PixelInterleaved", ((Element) planarConfiguration).getAttribute("value"));
+
+        Node sampleFormat = planarConfiguration.getNextSibling();
+        assertEquals("SampleFormat", sampleFormat.getNodeName());
+        assertEquals("UnsignedIntegral", ((Element) sampleFormat).getAttribute("value"));
+
+        Node bitsPerSample = sampleFormat.getNextSibling();
+        assertEquals("BitsPerSample", bitsPerSample.getNodeName());
+        assertEquals("1", ((Element) bitsPerSample).getAttribute("value"));
+
+        Node sampleMSB = bitsPerSample.getNextSibling();
+        assertEquals("SampleMSB", sampleMSB.getNodeName());
+        assertEquals("0", ((Element) sampleMSB).getAttribute("value"));
+
+        // "Dimension"
+        Node dimension = data.getNextSibling();
+        assertEquals("Dimension", dimension.getNodeName());
+        assertEquals(4, dimension.getChildNodes().getLength());
+
+        Node pixelAspectRatio = dimension.getFirstChild();
+        assertEquals("PixelAspectRatio", pixelAspectRatio.getNodeName());
+        assertEquals("1.0", ((Element) pixelAspectRatio).getAttribute("value"));
+
+        Node imageOrientation = pixelAspectRatio.getNextSibling();
+        assertEquals("ImageOrientation", imageOrientation.getNodeName());
+        assertEquals("Normal", ((Element) imageOrientation).getAttribute("value"));
+
+        Node horizontalPixelSize = imageOrientation.getNextSibling();
+        assertEquals("HorizontalPixelSize", horizontalPixelSize.getNodeName());
+        assertEquals("0.08466666666666667", ((Element) horizontalPixelSize).getAttribute("value"));
+
+        Node verticalPixelSize = horizontalPixelSize.getNextSibling();
+        assertEquals("VerticalPixelSize", verticalPixelSize.getNodeName());
+        assertEquals("0.08466666666666667", ((Element) verticalPixelSize).getAttribute("value"));
+
+        // "Document"
+        Node document = dimension.getNextSibling();
+        assertEquals("Document", document.getNodeName());
+        assertEquals(1, document.getChildNodes().getLength());
+
+        Node formatVersion = document.getFirstChild();
+        assertEquals("FormatVersion", formatVersion.getNodeName());
+        assertEquals("6.0", ((Element) formatVersion).getAttribute("value"));
+
+        // No more elements
+        assertNull(document.getNextSibling());
+    }
+
     @Test
     public void testMetadataNativeFormat() throws IOException {
         IIOMetadata metadata = createMetadata("/tiff/quad-lzw.tif");

imageio/pom.xml

@@ -61,7 +61,7 @@
     </modules>
 
     <properties>
-        <junit.jupiter.version>5.13.1</junit.jupiter.version>
+        <junit.jupiter.version>5.14.0</junit.jupiter.version>
     </properties>
 
     <dependencies>

pom.xml

@@ -98,7 +98,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.7</version>
+                        <version>3.2.8</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -112,7 +112,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.11.2</version>
+                        <version>3.12.0</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -250,7 +250,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.14.0</version>
+                    <version>3.14.1</version>
                     <inherited>true</inherited>
                     <configuration>
                         <source>8</source>
@@ -265,7 +265,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.5.3</version>
+                    <version>3.5.4</version>
                     <configuration>
                         <systemProperties>
                             <property>
@@ -288,7 +288,7 @@
                         <dependency>
                             <groupId>org.apache.maven.scm</groupId>
                             <artifactId>maven-scm-provider-gitexe</artifactId>
-                            <version>2.1.0</version>
+                            <version>2.2.1</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -300,7 +300,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>3.5.3</version>
+                    <version>3.5.4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
@@ -310,7 +310,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.26.0</version>
+                    <version>3.27.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

servlet/pom.xml

@@ -15,7 +15,7 @@
     </description>
 
     <properties>
-        <junit.jupiter.version>5.13.1</junit.jupiter.version>
+        <junit.jupiter.version>5.14.0</junit.jupiter.version>
     </properties>
 
     <dependencies>
@@ -82,7 +82,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <id>jakarta</id>