From 6a01466ebb2e4879dd4aefe0afa2d386dae938ea Mon Sep 17 00:00:00 2001 From: Harald Kuhr Date: Fri, 17 Sep 2021 20:32:25 +0200 Subject: [PATCH] #628: Stabilized build + better dependency scopes and module names in interop modules (cherry picked from commit 1c59057c30c1e875557a2b3772ba270b7a7e6f48) --- imageio/imageio-jpeg-jai-interop/pom.xml | 5 ++-- imageio/imageio-jpeg-jep262-interop/pom.xml | 2 +- imageio/imageio-tiff-jai-interop/pom.xml | 3 ++- ...FFImageMetadataJAInteroperabilityTest.java | 27 +++++++++---------- imageio/imageio-tiff-jdk-interop/pom.xml | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/imageio/imageio-jpeg-jai-interop/pom.xml b/imageio/imageio-jpeg-jai-interop/pom.xml index a2ae9c33..65a880dd 100644 --- a/imageio/imageio-jpeg-jai-interop/pom.xml +++ b/imageio/imageio-jpeg-jai-interop/pom.xml @@ -13,7 +13,7 @@ - com.twelvemonkeys.imageio.jaiinterop + com.twelvemonkeys.imageio.jpeg.jaiinterop @@ -32,7 +32,8 @@ com.github.jai-imageio jai-imageio-core - 1.3.0 + 1.4.0 + test com.twelvemonkeys.imageio diff --git a/imageio/imageio-jpeg-jep262-interop/pom.xml b/imageio/imageio-jpeg-jep262-interop/pom.xml index 3d1bdced..af802d4b 100644 --- a/imageio/imageio-jpeg-jep262-interop/pom.xml +++ b/imageio/imageio-jpeg-jep262-interop/pom.xml @@ -13,7 +13,7 @@ - com.twelvemonkeys.imageio.jep262interop + com.twelvemonkeys.imageio.jpeg.jep262interop diff --git a/imageio/imageio-tiff-jai-interop/pom.xml b/imageio/imageio-tiff-jai-interop/pom.xml index 29037ff9..4ed523e7 100644 --- a/imageio/imageio-tiff-jai-interop/pom.xml +++ b/imageio/imageio-tiff-jai-interop/pom.xml @@ -13,7 +13,7 @@ - com.twelvemonkeys.imageio.jaiinterop + com.twelvemonkeys.imageio.tiff.jaiinterop @@ -33,6 +33,7 @@ com.github.jai-imageio jai-imageio-core 1.4.0 + test com.twelvemonkeys.imageio diff --git a/imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java b/imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java index 31cdce2c..b3daac92 100644 --- a/imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java +++ b/imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java @@ -30,12 +30,12 @@ package com.twelvemonkeys.imageio.plugins.tiff.jaiinterop; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import com.twelvemonkeys.imageio.metadata.tiff.Rational; +import com.twelvemonkeys.imageio.metadata.tiff.TIFF; +import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry; +import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata; -import java.awt.image.BufferedImage; -import java.util.Arrays; -import java.util.Iterator; +import org.junit.Test; import javax.imageio.ImageIO; import javax.imageio.ImageTypeSpecifier; @@ -43,13 +43,12 @@ import javax.imageio.ImageWriter; import javax.imageio.metadata.IIOMetadata; import javax.imageio.metadata.IIOMetadataFormatImpl; import javax.imageio.metadata.IIOMetadataNode; +import java.awt.image.BufferedImage; +import java.util.Arrays; +import java.util.Iterator; -import org.junit.Test; - -import com.twelvemonkeys.imageio.metadata.tiff.Rational; -import com.twelvemonkeys.imageio.metadata.tiff.TIFF; -import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry; -import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * Tests our TIFFImageMetadata works with JAI TIFFImageWriter. @@ -61,10 +60,10 @@ import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata; public class TIFFImageMetadataJAInteroperabilityTest { private static final String JAI_TIFF_PROVIDER_CLASS_NAME = "com.github.jaiimageio.impl.plugins.tiff.TIFFImageWriterSpi"; - private ImageWriter getJAIImageWriter() { + private ImageWriter createImageWriter() { Iterator writers = ImageIO.getImageWritersByFormatName("TIFF"); - if (writers.hasNext()) { + while (writers.hasNext()) { ImageWriter writer = writers.next(); if (JAI_TIFF_PROVIDER_CLASS_NAME.equals(writer.getOriginatingProvider().getClass().getName())) { @@ -84,7 +83,7 @@ public class TIFFImageMetadataJAInteroperabilityTest { new TIFFEntry(TIFF.TAG_Y_RESOLUTION, new Rational(200)))); ImageTypeSpecifier type = ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY); - ImageWriter writer = getJAIImageWriter(); + ImageWriter writer = createImageWriter(); IIOMetadata converted = writer.convertImageMetadata(ourMetadata, type, null); assertNotNull(converted); diff --git a/imageio/imageio-tiff-jdk-interop/pom.xml b/imageio/imageio-tiff-jdk-interop/pom.xml index c652cfc9..1d0bff29 100644 --- a/imageio/imageio-tiff-jdk-interop/pom.xml +++ b/imageio/imageio-tiff-jdk-interop/pom.xml @@ -13,7 +13,7 @@ - com.twelvemonkeys.imageio.jdkinterop + com.twelvemonkeys.imageio.tiff.jdkinterop