Merge 518ca0b into d82131c

apache · Sep 13, 2021 · ba9bffd · ba9bffd
2 parents d82131c + 518ca0b
commit ba9bffd
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git 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>org.apache.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
@@ -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 -->