From a26240913d14cfb896e7ea0a84640186d3ca86c2 Mon Sep 17 00:00:00 2001
From: Jacob Lucas <jacob@idrsolutions.com>
Date: Tue, 8 Oct 2024 13:30:54 +0100
Subject: [PATCH 1/4] Update to Java 17, bump plugin versions

---
 README.md |  2 +-
 pom.xml   | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 84a8c50..d008263 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ You can then add this plugin into your pom as a dependency.
     <dependency>
         <groupId>com.idrsolutions</groupId>
         <artifactId>jdeli-imageio</artifactId>
-        <version>1.0</version>
+        <version>3.0</version>
     </dependency>
 </dependencies>
 ```
diff --git a/pom.xml b/pom.xml
index 145ec48..7c711a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.idrsolutions</groupId>
     <artifactId>jdeli-imageio${profile.identifier}</artifactId>
-    <version>2.0</version>
+    <version>3.0</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -22,34 +22,34 @@
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh-external</artifactId>
-                <version>2.12</version>
+                <version>3.5.3</version>
             </extension>
         </extensions>
         <plugins>
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.8.1</version>
+            <version>3.13.0</version>
         </plugin>
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.7</version>
+            <version>3.1.3</version>
         </plugin>
         <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>versions-maven-plugin</artifactId>
-            <version>2.16.0</version>
+            <version>2.17.1</version>
         </plugin>
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
-            <version>3.2.0</version>
+            <version>3.4.2</version>
         </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -81,15 +81,13 @@
 
     <properties>
         <finalName>${project.artifactId}</finalName>
-        <depVersion>2024.08</depVersion>
+        <depVersion>2024.10</depVersion>
         <depArtifact>jdeli</depArtifact>
 
         <!--An identifier used to change the artifactID for the daily, trial, and trial daily builds-->
         <!--suppress CheckTagEmptyBody -->
         <profile.identifier></profile.identifier>
-
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
     </properties>
 
     <profiles>

From 28e67b9a757949b357d3d0ee5af0e3de59401e2f Mon Sep 17 00:00:00 2001
From: Jacob Lucas <jacob@idrsolutions.com>
Date: Tue, 8 Oct 2024 13:31:07 +0100
Subject: [PATCH 2/4] Add java modules

---
 pom.xml                                | 23 +++++++++++++++++++++++
 src/main/java-modules/module-info.java |  5 +++++
 2 files changed, 28 insertions(+)
 create mode 100644 src/main/java-modules/module-info.java

diff --git a/pom.xml b/pom.xml
index 7c711a8..037556b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,29 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <!-- We don't want to deal with module info needing to be compiled in the context of the
+                     packages, so this plugin sorts it for us -->
+                <groupId>org.moditect</groupId>
+                <artifactId>moditect-maven-plugin</artifactId>
+                <version>1.2.2.Final</version>
+                <executions>
+                    <execution>
+                        <id>add-module-info</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>add-module-info</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <overwriteExistingFiles>true</overwriteExistingFiles>
+                    <module>
+                        <moduleInfoFile>src/main/java-modules/module-info.java</moduleInfoFile>
+                    </module>
+                </configuration>
+            </plugin>
         </plugins>
         <finalName>${finalName}-${project.version}</finalName>
     </build>
diff --git a/src/main/java-modules/module-info.java b/src/main/java-modules/module-info.java
new file mode 100644
index 0000000..44badc1
--- /dev/null
+++ b/src/main/java-modules/module-info.java
@@ -0,0 +1,5 @@
+module com.idrsolutions.jdeli_imageio_plugin {
+    requires java.desktop;
+
+    exports com.idrsolutions;
+}
\ No newline at end of file

From 72d1b71b6266939b3c4730c6edc212e222020502 Mon Sep 17 00:00:00 2001
From: Jacob Lucas <jacob@idrsolutions.com>
Date: Tue, 8 Oct 2024 13:33:00 +0100
Subject: [PATCH 3/4] Add imageio module

---
 src/main/java-modules/module-info.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java-modules/module-info.java b/src/main/java-modules/module-info.java
index 44badc1..414d8c1 100644
--- a/src/main/java-modules/module-info.java
+++ b/src/main/java-modules/module-info.java
@@ -2,4 +2,5 @@
     requires java.desktop;
 
     exports com.idrsolutions;
+    exports com.idrsolutions.imageio;
 }
\ No newline at end of file

From e06240501f4eeba6fbc464f83440b07d7c184018 Mon Sep 17 00:00:00 2001
From: Jacob Lucas <jacob@idrsolutions.com>
Date: Tue, 8 Oct 2024 14:42:55 +0100
Subject: [PATCH 4/4] Add all required exports and provides

---
 src/main/java-modules/module-info.java | 72 ++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/src/main/java-modules/module-info.java b/src/main/java-modules/module-info.java
index 414d8c1..c8c86d6 100644
--- a/src/main/java-modules/module-info.java
+++ b/src/main/java-modules/module-info.java
@@ -2,5 +2,77 @@
     requires java.desktop;
 
     exports com.idrsolutions;
+
+    exports com.idrsolutions.image;
+    exports com.idrsolutions.image.bmp;
+    exports com.idrsolutions.image.bmp.options;
+    exports com.idrsolutions.image.dicom;
+    exports com.idrsolutions.image.dicom.options;
+    exports com.idrsolutions.image.emf;
+    exports com.idrsolutions.image.emf.options;
+    exports com.idrsolutions.image.encoder;
+    exports com.idrsolutions.image.encoder.options;
+    exports com.idrsolutions.image.gif;
+    exports com.idrsolutions.image.gif.options;
+    exports com.idrsolutions.image.heic;
+    exports com.idrsolutions.image.heic.options;
+    exports com.idrsolutions.image.ico;
+    exports com.idrsolutions.image.jpeg;
+    exports com.idrsolutions.image.jpeg.options;
+    exports com.idrsolutions.image.jpeg2000;
+    exports com.idrsolutions.image.jpeg2000.options;
+    exports com.idrsolutions.image.jpeglossless;
+    exports com.idrsolutions.image.metadata;
+    exports com.idrsolutions.image.metadata.ifd;
+    exports com.idrsolutions.image.pdf;
+    exports com.idrsolutions.image.pdf.options;
+    exports com.idrsolutions.image.png;
+    exports com.idrsolutions.image.png.options;
+    exports com.idrsolutions.image.process;
+    exports com.idrsolutions.image.psd;
+    exports com.idrsolutions.image.psd.options;
+    exports com.idrsolutions.image.scale;
+    exports com.idrsolutions.image.sgi;
+    exports com.idrsolutions.image.sgi.options;
+    exports com.idrsolutions.image.tiff;
+    exports com.idrsolutions.image.tiff.options;
+    exports com.idrsolutions.image.utility;
+    exports com.idrsolutions.image.webp;
+    exports com.idrsolutions.image.webp.options;
+    exports com.idrsolutions.image.wmf;
+    exports com.idrsolutions.image.wmf.options;
+
+    exports com.idrsolutions.image.tika;
+
     exports com.idrsolutions.imageio;
+
+    exports org.jpedal.utils;
+
+    provides javax.imageio.spi.ImageReaderSpi with
+            com.idrsolutions.BMPImageReaderSpi,
+            com.idrsolutions.DICOMImageReaderSpi,
+            com.idrsolutions.EMFImageReaderSpi,
+            com.idrsolutions.GIFImageReaderSpi,
+            com.idrsolutions.HEICImageReaderSpi,
+            com.idrsolutions.JDeliImageReaderSpi,
+            com.idrsolutions.JPEG2000ImageReaderSpi,
+            com.idrsolutions.JPEGImageReaderSpi,
+            com.idrsolutions.JPEGXLImageReaderSpi,
+            com.idrsolutions.PNGImageReaderSpi,
+            com.idrsolutions.PSDImageReaderSpi,
+            com.idrsolutions.SGIImageReaderSpi,
+            com.idrsolutions.TIFFImageReaderSpi,
+            com.idrsolutions.WEBPImageReaderSpi,
+            com.idrsolutions.WMFImageReaderSpi;
+
+    provides javax.imageio.spi.ImageWriterSpi with
+            com.idrsolutions.BMPImageWriterSpi,
+            com.idrsolutions.HEICImageWriterSpi,
+            com.idrsolutions.JDeliImageWriterSpi,
+            com.idrsolutions.JPEG2000ImageWriterSpi,
+            com.idrsolutions.JPEGImageWriterSpi,
+            com.idrsolutions.PDFImageWriterSpi,
+            com.idrsolutions.PNGImageWriterSpi,
+            com.idrsolutions.TIFFImageWriterSpi,
+            com.idrsolutions.WEBPImageWriterSpi;
 }
\ No newline at end of file