From e0d6fa0d84d6ed5cb49f4e3bb05ee4813c081c8f Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Sat, 24 Apr 2021 12:26:36 +0200
Subject: [PATCH] Better JPMS automatic module names.

---
 common/common-image/pom.xml                 |  4 ++++
 common/common-io/pom.xml                    |  4 ++++
 common/common-lang/pom.xml                  |  4 ++++
 imageio/imageio-batik/pom.xml               | 10 ++++++----
 imageio/imageio-bmp/pom.xml                 |  4 ++++
 imageio/imageio-clippath/pom.xml            |  4 ++++
 imageio/imageio-core/pom.xml                |  4 ++++
 imageio/imageio-hdr/pom.xml                 |  4 ++++
 imageio/imageio-icns/pom.xml                |  4 ++++
 imageio/imageio-iff/pom.xml                 |  4 ++++
 imageio/imageio-jpeg-jai-interop/pom.xml    |  4 ++++
 imageio/imageio-jpeg-jep262-interop/pom.xml |  4 ++++
 imageio/imageio-jpeg/pom.xml                |  4 ++++
 imageio/imageio-metadata/pom.xml            |  4 ++++
 imageio/imageio-pcx/pom.xml                 |  4 ++++
 imageio/imageio-pdf/pom.xml                 |  3 +++
 imageio/imageio-pict/pom.xml                |  4 ++++
 imageio/imageio-pnm/pom.xml                 |  3 +++
 imageio/imageio-psd/pom.xml                 |  4 ++++
 imageio/imageio-reference/pom.xml           |  4 ++++
 imageio/imageio-sgi/pom.xml                 |  4 ++++
 imageio/imageio-tga/pom.xml                 |  4 ++++
 imageio/imageio-thumbsdb/pom.xml            |  4 ++++
 imageio/imageio-tiff-jdk-interop/pom.xml    |  4 ++++
 imageio/imageio-tiff/pom.xml                |  4 ++++
 imageio/imageio-webp/pom.xml                |  6 ++++--
 imageio/imageio-xwd/pom.xml                 |  4 ++++
 pom.xml                                     | 19 ++++++++++---------
 28 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/common/common-image/pom.xml b/common/common-image/pom.xml
index 1c3f171c..aac0076f 100644
--- a/common/common-image/pom.xml
+++ b/common/common-image/pom.xml
@@ -13,6 +13,10 @@
         The TwelveMonkeys Common Image support
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.common.image</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/common/common-io/pom.xml b/common/common-io/pom.xml
index 0cf4c3e6..46a2439b 100644
--- a/common/common-io/pom.xml
+++ b/common/common-io/pom.xml
@@ -13,6 +13,10 @@
         The TwelveMonkeys Common IO support
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.common.io</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/common/common-lang/pom.xml b/common/common-lang/pom.xml
index d14568f3..a5e07d7a 100644
--- a/common/common-lang/pom.xml
+++ b/common/common-lang/pom.xml
@@ -13,4 +13,8 @@
         The TwelveMonkeys Common Language support
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.common.lang</project.jpms.module.name>
+    </properties>
+
 </project>
diff --git a/imageio/imageio-batik/pom.xml b/imageio/imageio-batik/pom.xml
index 48d90318..73817e5f 100644
--- a/imageio/imageio-batik/pom.xml
+++ b/imageio/imageio-batik/pom.xml
@@ -14,6 +14,12 @@
         See the <a href="http://xmlgraphics.apache.org/batik/">Batik Home page</a>
         for more information.]]>
     </description>
+
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.batik</project.jpms.module.name>
+        <batik.version>1.14</batik.version>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -102,8 +108,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-
-    <properties>
-        <batik.version>1.14</batik.version>
-    </properties>
 </project>
diff --git a/imageio/imageio-bmp/pom.xml b/imageio/imageio-bmp/pom.xml
index b25b97d2..37974e32 100644
--- a/imageio/imageio-bmp/pom.xml
+++ b/imageio/imageio-bmp/pom.xml
@@ -10,6 +10,10 @@
     <name>TwelveMonkeys :: ImageIO :: BMP plugin</name>
     <description>ImageIO plugin for Microsoft Device Independent Bitmap (BMP/DIB) format.</description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.bmp</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-clippath/pom.xml b/imageio/imageio-clippath/pom.xml
index b8850b1f..94373ff8 100755
--- a/imageio/imageio-clippath/pom.xml
+++ b/imageio/imageio-clippath/pom.xml
@@ -12,6 +12,10 @@
         Photoshop Clipping Path Support.
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.clippath</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-core/pom.xml b/imageio/imageio-core/pom.xml
index 90334fea..8af8e782 100644
--- a/imageio/imageio-core/pom.xml
+++ b/imageio/imageio-core/pom.xml
@@ -9,6 +9,10 @@
     <artifactId>imageio-core</artifactId>
     <name>TwelveMonkeys :: ImageIO :: Core</name>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.core</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.common</groupId>
diff --git a/imageio/imageio-hdr/pom.xml b/imageio/imageio-hdr/pom.xml
index 7186f0b9..4bee2cf0 100644
--- a/imageio/imageio-hdr/pom.xml
+++ b/imageio/imageio-hdr/pom.xml
@@ -12,6 +12,10 @@
         ImageIO plugin for Radiance RGBE High Dynaimc Range format (HDR).
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.hdr</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-icns/pom.xml b/imageio/imageio-icns/pom.xml
index 02d78d93..0c0f28ea 100644
--- a/imageio/imageio-icns/pom.xml
+++ b/imageio/imageio-icns/pom.xml
@@ -10,6 +10,10 @@
     <name>TwelveMonkeys :: ImageIO :: ICNS plugin</name>
     <description>ImageIO plugin for Apple Icon Image (ICNS) format.</description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.icns</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-iff/pom.xml b/imageio/imageio-iff/pom.xml
index 514bf698..a5dfd742 100644
--- a/imageio/imageio-iff/pom.xml
+++ b/imageio/imageio-iff/pom.xml
@@ -13,6 +13,10 @@
         type ILBM and PBM format.
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.iff</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-jpeg-jai-interop/pom.xml b/imageio/imageio-jpeg-jai-interop/pom.xml
index a87cc5f5..81a69d07 100644
--- a/imageio/imageio-jpeg-jai-interop/pom.xml
+++ b/imageio/imageio-jpeg-jai-interop/pom.xml
@@ -12,6 +12,10 @@
         Test JPEG plugin and JAI TIFF plugin interoperability
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jaiinterop</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.github.jai-imageio</groupId>
diff --git a/imageio/imageio-jpeg-jep262-interop/pom.xml b/imageio/imageio-jpeg-jep262-interop/pom.xml
index 9f1d0f5b..7d26e040 100644
--- a/imageio/imageio-jpeg-jep262-interop/pom.xml
+++ b/imageio/imageio-jpeg-jep262-interop/pom.xml
@@ -12,6 +12,10 @@
         Test JPEG plugin and JEP-262 (JDK TIFF plugin) interoperability
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jep262interop</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-jpeg/pom.xml b/imageio/imageio-jpeg/pom.xml
index e5277e6c..3515d584 100644
--- a/imageio/imageio-jpeg/pom.xml
+++ b/imageio/imageio-jpeg/pom.xml
@@ -12,6 +12,10 @@
         ImageIO plugin for Joint Photographer Expert Group images (JPEG/JFIF).
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-metadata/pom.xml b/imageio/imageio-metadata/pom.xml
index ba16ec2a..64191641 100644
--- a/imageio/imageio-metadata/pom.xml
+++ b/imageio/imageio-metadata/pom.xml
@@ -12,6 +12,10 @@
         ImageIO metadata module.
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.metadata</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-pcx/pom.xml b/imageio/imageio-pcx/pom.xml
index 7dd70505..1561d9d1 100755
--- a/imageio/imageio-pcx/pom.xml
+++ b/imageio/imageio-pcx/pom.xml
@@ -12,6 +12,10 @@
         ImageIO plugin for ZSoft Paintbrush Format (PCX)
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.pcx</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-pdf/pom.xml b/imageio/imageio-pdf/pom.xml
index 25d3c20c..e53ef3f9 100644
--- a/imageio/imageio-pdf/pom.xml
+++ b/imageio/imageio-pdf/pom.xml
@@ -12,6 +12,9 @@
         ImageIO plugin for Adobe Portable Document Format (PDF).
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.pdf</project.jpms.module.name>
+    </properties>
 
     <dependencies>
         <dependency>
diff --git a/imageio/imageio-pict/pom.xml b/imageio/imageio-pict/pom.xml
index 50aeb565..75200f61 100644
--- a/imageio/imageio-pict/pom.xml
+++ b/imageio/imageio-pict/pom.xml
@@ -10,6 +10,10 @@
     <name>TwelveMonkeys :: ImageIO :: PICT plugin</name>
     <description>ImageIO plugin for Apple Mac Paint Picture (PICT) format.</description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.pict</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-pnm/pom.xml b/imageio/imageio-pnm/pom.xml
index 812f2c9f..767d7b4c 100755
--- a/imageio/imageio-pnm/pom.xml
+++ b/imageio/imageio-pnm/pom.xml
@@ -12,6 +12,9 @@
         ImageIO plugin for NetPBM Portable Any Map (PNM)
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.pnm</project.jpms.module.name>
+    </properties>
 
     <dependencies>
         <dependency>
diff --git a/imageio/imageio-psd/pom.xml b/imageio/imageio-psd/pom.xml
index fcbed963..8d5af8f6 100644
--- a/imageio/imageio-psd/pom.xml
+++ b/imageio/imageio-psd/pom.xml
@@ -12,6 +12,10 @@
         ImageIO plugin for Adobe Photoshop Document (PSD).
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.psd</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-reference/pom.xml b/imageio/imageio-reference/pom.xml
index df36dafa..a24fe33f 100644
--- a/imageio/imageio-reference/pom.xml
+++ b/imageio/imageio-reference/pom.xml
@@ -12,6 +12,10 @@
         Test cases for the JRE provided ImageReader implementations for reference.
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.reference</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-sgi/pom.xml b/imageio/imageio-sgi/pom.xml
index f893f6c1..c3d34894 100755
--- a/imageio/imageio-sgi/pom.xml
+++ b/imageio/imageio-sgi/pom.xml
@@ -12,6 +12,10 @@
         ImageIO plugin for Silicon Graphics Image Format (SGI)
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.sgi</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-tga/pom.xml b/imageio/imageio-tga/pom.xml
index ce441446..16cd4be4 100755
--- a/imageio/imageio-tga/pom.xml
+++ b/imageio/imageio-tga/pom.xml
@@ -12,6 +12,10 @@
         ImageIO plugin for Truevision TGA Image Format (TGA)
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.tga</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-thumbsdb/pom.xml b/imageio/imageio-thumbsdb/pom.xml
index f7f10156..3e501bf7 100644
--- a/imageio/imageio-thumbsdb/pom.xml
+++ b/imageio/imageio-thumbsdb/pom.xml
@@ -12,6 +12,10 @@
         ImageIO plugin for Windows Thumbs DB (Thumbs.db) format.
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.thumbsdb</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-tiff-jdk-interop/pom.xml b/imageio/imageio-tiff-jdk-interop/pom.xml
index 6eb42888..cc65c44e 100644
--- a/imageio/imageio-tiff-jdk-interop/pom.xml
+++ b/imageio/imageio-tiff-jdk-interop/pom.xml
@@ -12,6 +12,10 @@
         Test TIFF plugin and JDK JPEG plugin interoperability
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jdkinterop</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-tiff/pom.xml b/imageio/imageio-tiff/pom.xml
index a1ec6282..2dd08b34 100644
--- a/imageio/imageio-tiff/pom.xml
+++ b/imageio/imageio-tiff/pom.xml
@@ -12,6 +12,10 @@
       ImageIO plugin for Aldus/Adobe Tagged Image File Format (TIFF).
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.tiff</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-webp/pom.xml b/imageio/imageio-webp/pom.xml
index 673448b8..905c135c 100644
--- a/imageio/imageio-webp/pom.xml
+++ b/imageio/imageio-webp/pom.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>com.twelvemonkeys.imageio</groupId>
         <artifactId>imageio</artifactId>
         <version>3.7-SNAPSHOT</version>
     </parent>
-
     <artifactId>imageio-webp</artifactId>
     <name>TwelveMonkeys :: ImageIO :: WebP plugin</name>
     <description>
       ImageIO plugin for Google WebP File Format (WebP).
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.webp</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-xwd/pom.xml b/imageio/imageio-xwd/pom.xml
index 6c903b1b..0ab489be 100755
--- a/imageio/imageio-xwd/pom.xml
+++ b/imageio/imageio-xwd/pom.xml
@@ -12,6 +12,10 @@
         ImageIO plugin for X11 Window Dump Format (XWD)
     </description>
 
+    <properties>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.xwd</project.jpms.module.name>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/pom.xml b/pom.xml
index 197bb7fb..a13da97d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.jpms.module.name>com.twelvemonkeys.${project.artifactId}</project.jpms.module.name>
     </properties>
 
     <build>
@@ -106,7 +107,7 @@
                             <Implementation-Vendor>TwelveMonkeys</Implementation-Vendor>
                             <Implementation-Version>${project.version}</Implementation-Version>
                             <Implementation-URL>${project.url}</Implementation-URL>
-                            <Automatic-Module-Name>twelvemonkeys-${project.artifactId}</Automatic-Module-Name>
+                            <Automatic-Module-Name>${project.jpms.module.name}</Automatic-Module-Name>
                         </manifestEntries>
                     </archive>
                 </configuration>
@@ -134,7 +135,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>3.2.0</version>
                     <configuration>
                         <encoding>UTF-8</encoding>
                     </configuration>
@@ -142,7 +143,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>3.2.0</version>
                     <inherited>true</inherited>
                     <executions>
                         <execution>
@@ -157,17 +158,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.3</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.3</version>
+                    <version>3.8.1</version>
                     <inherited>true</inherited>
                     <configuration>
                         <source>1.7</source>
@@ -183,7 +184,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.18.1</version>
+                    <version>3.0.0-M5</version>
                     <configuration>
                         <systemProperties>
                             <property>
@@ -197,12 +198,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.2</version>
+                    <version>3.0.0-M4</version>
                     <dependencies>
                       <dependency>
                         <groupId>org.apache.maven.scm</groupId>
                         <artifactId>maven-scm-provider-gitexe</artifactId>
-                        <version>1.9</version>
+                        <version>1.11.2</version>
                       </dependency>
                     </dependencies>
                 </plugin>