From 414979f36b521d7ea2d13676384516b612cc40eb Mon Sep 17 00:00:00 2001
From: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
Date: Fri, 3 Sep 2021 11:35:51 +0300
Subject: [PATCH 1/3] IO-747 Make commons-io a proper JPMS module

---
 pom.xml                 | 38 ++++++++++++++++++++++++++++++++++++++
 src/changes/changes.xml |  3 +++
 2 files changed, 41 insertions(+)

diff --git a/pom.xml b/pom.xml
index b7df7de93d6..67b7ac11a41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,6 +235,10 @@ file comparators, endian transformation classes, and much more.
     <contributor>
       <name>Frank W. Zammetti</name>
     </contributor>
+    <contributor>
+      <name>Martin Grigorov</name>
+      <email>mgrigorov@apache.org</email>
+    </contributor>
   </contributors>
 
   <dependencyManagement>
@@ -342,6 +346,8 @@ file comparators, endian transformation classes, and much more.
     <commons.release.isDistModule>true</commons.release.isDistModule>
     <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>    
     <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
+    <moditect-maven-plugin.version>1.0.0.RC1</moditect-maven-plugin.version>
+    <moditect.skip>true</moditect.skip>
   </properties>
 
   <build>
@@ -483,6 +489,30 @@ file comparators, endian transformation classes, and much more.
         <groupId>com.github.siom79.japicmp</groupId>
         <artifactId>japicmp-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>${moditect-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <jvmVersion>9</jvmVersion>
+              <outputDirectory>${project.build.directory}</outputDirectory>
+              <overwriteExistingFiles>true</overwriteExistingFiles>
+              <module>
+                <moduleInfo>
+                  <name>commons.io</name>
+                </moduleInfo>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -600,5 +630,13 @@ file comparators, endian transformation classes, and much more.
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>release</id>
+      <properties>
+        <!-- Enable Moditect for releases. This requires JDK 9+ for the build -->
+        <moditect.skip>false</moditect.skip>
+        <maven.compiler.release>8</maven.compiler.release>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2f285a1ccd3..d2a449fa98b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -203,6 +203,9 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="update" due-to="Dependabot">
         Bump jmh.version from 1.32 to 1.33 #258.
       </action>
+      <action dev="mgrigorov" type="update">
+        IO-747 Make commons-io a JPMS module by adding module-info.class.
+      </action>
     </release>
     <release version="2.11.0" date="2021-07-09" description="Java 8 required.">
       <!-- FIX -->

From 7854f800f471ba4752052ead4ea02f0d73c786ec Mon Sep 17 00:00:00 2001
From: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
Date: Mon, 13 Sep 2021 09:16:21 +0300
Subject: [PATCH 2/3] IO-747 Change the name of the JPMS module

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67b7ac11a41..32702b721fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -506,7 +506,7 @@ file comparators, endian transformation classes, and much more.
               <overwriteExistingFiles>true</overwriteExistingFiles>
               <module>
                 <moduleInfo>
-                  <name>commons.io</name>
+                  <name>org.apache.commons.io</name>
                 </moduleInfo>
               </module>
             </configuration>

From 6c97a6d2621009426156a17ffdf248ec74d630bf Mon Sep 17 00:00:00 2001
From: Martin Tzvetanov Grigorov <mgrigorov@apache.org>
Date: Tue, 14 Sep 2021 09:47:26 +0300
Subject: [PATCH 3/3] IO-747 Enable moditect plugin when building with Java 9+

Enforce that Java 9+ is being used for releases

Suggested-by: Jochen Wiedmann at https://github.com/apache/commons-io/pull/268/files#r707160987
---
 pom.xml | 92 ++++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 34 deletions(-)

diff --git a/pom.xml b/pom.xml
index 32702b721fd..15bb0578cbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -338,16 +338,16 @@ file comparators, endian transformation classes, and much more.
     <commons.jacoco.version>0.8.7</commons.jacoco.version>
     <commons.surefire.version>3.0.0-M5</commons.surefire.version>
     <commons.japicmp.version>0.15.3</commons.japicmp.version>
+    <commons.enforcer.version>3.0.0</commons.enforcer.version>
+    <commons.moditect.version>1.0.0.RC1</commons.moditect.version>
     <spotbugs.plugin.version>4.3.0</spotbugs.plugin.version>
     <spotbugs.impl.version>4.4.1</spotbugs.impl.version>
-    <jmh.version>1.33</jmh.version>    
+    <jmh.version>1.33</jmh.version>
     <japicmp.skip>false</japicmp.skip>
     <jacoco.skip>${env.JACOCO_SKIP}</jacoco.skip>
     <commons.release.isDistModule>true</commons.release.isDistModule>
-    <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>    
+    <commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
     <commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
-    <moditect-maven-plugin.version>1.0.0.RC1</moditect-maven-plugin.version>
-    <moditect.skip>true</moditect.skip>
   </properties>
 
   <build>
@@ -389,7 +389,7 @@ file comparators, endian transformation classes, and much more.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${commons.enforcer.version}</version>
         <executions>
           <execution>
             <id>enforce-maven</id>
@@ -489,30 +489,6 @@ file comparators, endian transformation classes, and much more.
         <groupId>com.github.siom79.japicmp</groupId>
         <artifactId>japicmp-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.moditect</groupId>
-        <artifactId>moditect-maven-plugin</artifactId>
-        <version>${moditect-maven-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>add-module-infos</id>
-            <phase>package</phase>
-            <goals>
-              <goal>add-module-info</goal>
-            </goals>
-            <configuration>
-              <jvmVersion>9</jvmVersion>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-              <overwriteExistingFiles>true</overwriteExistingFiles>
-              <module>
-                <moduleInfo>
-                  <name>org.apache.commons.io</name>
-                </moduleInfo>
-              </module>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -589,7 +565,36 @@ file comparators, endian transformation classes, and much more.
       <properties>
         <!-- coverall version 4.3.0 does not work with java 9, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
         <coveralls.skip>true</coveralls.skip>
+        <maven.compiler.release>8</maven.compiler.release>
       </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.moditect</groupId>
+            <artifactId>moditect-maven-plugin</artifactId>
+            <version>${commons.moditect.version}</version>
+            <executions>
+              <execution>
+                <id>add-module-infos</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>add-module-info</goal>
+                </goals>
+                <configuration>
+                  <jvmVersion>9</jvmVersion>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                  <overwriteExistingFiles>true</overwriteExistingFiles>
+                  <module>
+                    <moduleInfo>
+                      <name>org.apache.commons.io</name>
+                    </moduleInfo>
+                  </module>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
     <profile>
       <id>benchmark</id>
@@ -632,11 +637,30 @@ file comparators, endian transformation classes, and much more.
     </profile>
     <profile>
       <id>release</id>
-      <properties>
-        <!-- Enable Moditect for releases. This requires JDK 9+ for the build -->
-        <moditect.skip>false</moditect.skip>
-        <maven.compiler.release>8</maven.compiler.release>
-      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>${commons.enforcer.version}</version>
+            <executions>
+              <execution>
+                <id>enforce-versions</id>
+                <goals>
+                  <goal>enforce</goal>
+                </goals>
+                <configuration>
+                  <rules>
+                   <requireJavaVersion>
+                      <version>9</version>
+                    </requireJavaVersion>
+                  </rules>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
   </profiles>
 </project>