From 4fc66ac27512dbfe0800548bb94f3f46f7fdb96d Mon Sep 17 00:00:00 2001 From: "matthew.marchus" Date: Fri, 4 Mar 2022 08:55:57 -0700 Subject: [PATCH 1/5] EAG-1246: Add FaxTIFFTagSet to supported class replacements --- .../impl/plugins/tiff/TIFFImageMetadata.java | 9 +++- .../plugins/tiff/TIFFImageMetadataTest.java | 42 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadataTest.java diff --git a/src/main/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadata.java b/src/main/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadata.java index f2d18cb..8cadb82 100644 --- a/src/main/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadata.java +++ b/src/main/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadata.java @@ -73,7 +73,13 @@ public class TIFFImageMetadata extends IIOMetadata { // package scope - + + public static final String SUN_FaxTIFFTagSetClassName = + "com.sun.media.imageio.plugins.tiff.FaxTIFFTagSet" ; + + public static final String THISJAI_FaxTIFFTagSetClassName = + "com.github.jaiimageio.plugins.tiff.FaxTIFFTagSet"; + public static final String SUN_BaselineTIFFTagSetClassName = "com.sun.media.imageio.plugins.tiff.BaselineTIFFTagSet" ; @@ -1512,6 +1518,7 @@ public static TIFFIFD parseIFD(Node node) throws IIOInvalidTreeException { if(className != null) { className = className.replace(SUN_BaselineTIFFTagSetClassName, THISJAI_BaselineTIFFTagSetClassName); + className = className.replace(SUN_FaxTIFFTagSetClassName, THISJAI_FaxTIFFTagSetClassName); } Object o = null; diff --git a/src/test/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadataTest.java b/src/test/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadataTest.java new file mode 100644 index 0000000..ffdf40b --- /dev/null +++ b/src/test/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadataTest.java @@ -0,0 +1,42 @@ +package com.github.jaiimageio.impl.plugins.tiff; + + +import com.github.jaiimageio.plugins.tiff.BaselineTIFFTagSet; +import com.github.jaiimageio.plugins.tiff.FaxTIFFTagSet; +import com.sun.org.apache.xerces.internal.dom.DocumentImpl; +import org.junit.Test; + +import com.github.jaiimageio.impl.plugins.tiff.TIFFImageMetadata; +import org.w3c.dom.*; + +import javax.imageio.metadata.IIOInvalidTreeException; + +import static junit.framework.TestCase.assertEquals; + +public class TIFFImageMetadataTest { + + @Test + public void test_parseIFD_SUN_FaxTIFFTagSetClassName() throws IIOInvalidTreeException { + Document xmlDoc = new DocumentImpl(); + Element ifd = xmlDoc.createElement("TIFFIFD"); + ifd.setAttribute("tagSets", TIFFImageMetadata.SUN_FaxTIFFTagSetClassName); + + TIFFIFD tiffIfd = TIFFImageMetadata.parseIFD(ifd); + + assertEquals(1, tiffIfd.getTagSetList().size()); + assertEquals(FaxTIFFTagSet.class.getName(), tiffIfd.getTagSetList().get(0).getClass().getName()); + } + + @Test + public void test_parseIFD_SUN_BaselineTIFFTagSetClassName() throws IIOInvalidTreeException { + Document xmlDoc = new DocumentImpl(); + Element ifd = xmlDoc.createElement("TIFFIFD"); + ifd.setAttribute("tagSets", TIFFImageMetadata.SUN_BaselineTIFFTagSetClassName); + + TIFFIFD tiffIfd = TIFFImageMetadata.parseIFD(ifd); + + assertEquals(1, tiffIfd.getTagSetList().size()); + assertEquals(BaselineTIFFTagSet.class.getName(), tiffIfd.getTagSetList().get(0).getClass().getName()); + } + +} From 43bc481ed308b3b0cd87f784b3e2aa53d20d1c13 Mon Sep 17 00:00:00 2001 From: "matthew.marchus" Date: Fri, 4 Mar 2022 09:16:30 -0700 Subject: [PATCH 2/5] EAG-1246: Add TylerTech snapshot ID for this release for our build system. Not for PR/inclusion to upstream. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28c6b7a..6f5bf16 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.jai-imageio jai-imageio-core - 1.4.1-SNAPSHOT + 1.4.1-tylertech-SNAPSHOT bundle Java Advanced Imaging Image I/O Tools API core (standalone) From 8fb788ffef41d592d4efb01a559465eb08100032 Mon Sep 17 00:00:00 2001 From: "matthew.marchus" Date: Wed, 16 Mar 2022 15:39:09 -0600 Subject: [PATCH 3/5] Revert "EAG-1246: Add TylerTech snapshot ID for this release for our build system. Not for PR/inclusion to upstream." This reverts commit 43bc481e --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6f5bf16..28c6b7a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.jai-imageio jai-imageio-core - 1.4.1-tylertech-SNAPSHOT + 1.4.1-SNAPSHOT bundle Java Advanced Imaging Image I/O Tools API core (standalone) From b9942c61782b4fbcef408ee845fc3663d25ae5ba Mon Sep 17 00:00:00 2001 From: Nils Bifano Date: Tue, 20 Sep 2022 07:36:08 -0600 Subject: [PATCH 4/5] TCM-7632 Add EXIFParentTIFFTagSet to supported class replacements --- .../impl/plugins/tiff/TIFFImageMetadata.java | 9 ++++++++- .../impl/plugins/tiff/TIFFImageMetadataTest.java | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadata.java b/src/main/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadata.java index 8cadb82..3282613 100644 --- a/src/main/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadata.java +++ b/src/main/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadata.java @@ -73,7 +73,13 @@ public class TIFFImageMetadata extends IIOMetadata { // package scope - + + public static final String SUN_EXIFParentTIFFTagSetClassName = + "com.sun.media.imageio.plugins.tiff.EXIFParentTIFFTagSet" ; + + public static final String THISJAI_EXIFParentTIFFTagSetClassName = + "com.github.jaiimageio.plugins.tiff.EXIFParentTIFFTagSet"; + public static final String SUN_FaxTIFFTagSetClassName = "com.sun.media.imageio.plugins.tiff.FaxTIFFTagSet" ; @@ -1519,6 +1525,7 @@ public static TIFFIFD parseIFD(Node node) throws IIOInvalidTreeException { if(className != null) { className = className.replace(SUN_BaselineTIFFTagSetClassName, THISJAI_BaselineTIFFTagSetClassName); className = className.replace(SUN_FaxTIFFTagSetClassName, THISJAI_FaxTIFFTagSetClassName); + className = className.replace(SUN_EXIFParentTIFFTagSetClassName, THISJAI_EXIFParentTIFFTagSetClassName); } Object o = null; diff --git a/src/test/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadataTest.java b/src/test/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadataTest.java index ffdf40b..863dbd9 100644 --- a/src/test/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadataTest.java +++ b/src/test/java/com/github/jaiimageio/impl/plugins/tiff/TIFFImageMetadataTest.java @@ -2,6 +2,7 @@ import com.github.jaiimageio.plugins.tiff.BaselineTIFFTagSet; +import com.github.jaiimageio.plugins.tiff.EXIFParentTIFFTagSet; import com.github.jaiimageio.plugins.tiff.FaxTIFFTagSet; import com.sun.org.apache.xerces.internal.dom.DocumentImpl; import org.junit.Test; @@ -14,7 +15,19 @@ import static junit.framework.TestCase.assertEquals; public class TIFFImageMetadataTest { - + + @Test + public void test_parseIFD_SUN_EXIFParentTIFFTagSetClassName() throws IIOInvalidTreeException { + Document xmlDoc = new DocumentImpl(); + Element ifd = xmlDoc.createElement("TIFFIFD"); + ifd.setAttribute("tagSets", TIFFImageMetadata.SUN_EXIFParentTIFFTagSetClassName); + + TIFFIFD tiffIfd = TIFFImageMetadata.parseIFD(ifd); + + assertEquals(1, tiffIfd.getTagSetList().size()); + assertEquals(EXIFParentTIFFTagSet.class.getName(), tiffIfd.getTagSetList().get(0).getClass().getName()); + } + @Test public void test_parseIFD_SUN_FaxTIFFTagSetClassName() throws IIOInvalidTreeException { Document xmlDoc = new DocumentImpl(); From 08fdffca719db3382ae8c94c3429c507df67a195 Mon Sep 17 00:00:00 2001 From: Joe Nunnelley <8905030+JoeNunnelley@users.noreply.github.com> Date: Tue, 27 May 2025 16:54:15 -0700 Subject: [PATCH 5/5] Enable Dependency reviewer --- .github/workflows/dependency_enforcement.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/dependency_enforcement.yml diff --git a/.github/workflows/dependency_enforcement.yml b/.github/workflows/dependency_enforcement.yml new file mode 100644 index 0000000..23c1c8d --- /dev/null +++ b/.github/workflows/dependency_enforcement.yml @@ -0,0 +1,20 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# Reach out on Teams at 'Corp DevOps / Github Community' to get help. + +name: "Dependency Review" +on: [pull_request] +permissions: + contents: read +jobs: + dependency-review: + runs-on: ubuntu-latest + steps: + - name: "Checkout Repository" + uses: actions/checkout@v4 + - name: Dependency Review + uses: actions/dependency-review-action@v4 + with: + fail-on-severity: high + fail-on-scopes: runtime, development