Skip to content

Commit c146a94

Browse files
authored
Merge pull request #268 from martin-g/io-747-make-commons-io-proper-jpms-module
IO-747 Make commons-io a proper JPMS module
2 parents f1d9aa9 + 6c97a6d commit c146a94

2 files changed

Lines changed: 68 additions & 3 deletions

File tree

pom.xml

Lines changed: 65 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ file comparators, endian transformation classes, and much more.
235235
<contributor>
236236
<name>Frank W. Zammetti</name>
237237
</contributor>
238+
<contributor>
239+
<name>Martin Grigorov</name>
240+
<email>mgrigorov@apache.org</email>
241+
</contributor>
238242
</contributors>
239243

240244
<dependencyManagement>
@@ -334,13 +338,15 @@ file comparators, endian transformation classes, and much more.
334338
<commons.jacoco.version>0.8.7</commons.jacoco.version>
335339
<commons.surefire.version>3.0.0-M5</commons.surefire.version>
336340
<commons.japicmp.version>0.15.3</commons.japicmp.version>
341+
<commons.enforcer.version>3.0.0</commons.enforcer.version>
342+
<commons.moditect.version>1.0.0.RC1</commons.moditect.version>
337343
<spotbugs.plugin.version>4.3.0</spotbugs.plugin.version>
338344
<spotbugs.impl.version>4.4.1</spotbugs.impl.version>
339-
<jmh.version>1.33</jmh.version>
345+
<jmh.version>1.33</jmh.version>
340346
<japicmp.skip>false</japicmp.skip>
341347
<jacoco.skip>${env.JACOCO_SKIP}</jacoco.skip>
342348
<commons.release.isDistModule>true</commons.release.isDistModule>
343-
<commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
349+
<commons.releaseManagerName>Gary Gregory</commons.releaseManagerName>
344350
<commons.releaseManagerKey>86fdc7e2a11262cb</commons.releaseManagerKey>
345351
</properties>
346352

@@ -383,7 +389,7 @@ file comparators, endian transformation classes, and much more.
383389
<plugin>
384390
<groupId>org.apache.maven.plugins</groupId>
385391
<artifactId>maven-enforcer-plugin</artifactId>
386-
<version>3.0.0</version>
392+
<version>${commons.enforcer.version}</version>
387393
<executions>
388394
<execution>
389395
<id>enforce-maven</id>
@@ -559,7 +565,36 @@ file comparators, endian transformation classes, and much more.
559565
<properties>
560566
<!-- coverall version 4.3.0 does not work with java 9, see https://github.com/trautonen/coveralls-maven-plugin/issues/112 -->
561567
<coveralls.skip>true</coveralls.skip>
568+
<maven.compiler.release>8</maven.compiler.release>
562569
</properties>
570+
<build>
571+
<plugins>
572+
<plugin>
573+
<groupId>org.moditect</groupId>
574+
<artifactId>moditect-maven-plugin</artifactId>
575+
<version>${commons.moditect.version}</version>
576+
<executions>
577+
<execution>
578+
<id>add-module-infos</id>
579+
<phase>package</phase>
580+
<goals>
581+
<goal>add-module-info</goal>
582+
</goals>
583+
<configuration>
584+
<jvmVersion>9</jvmVersion>
585+
<outputDirectory>${project.build.directory}</outputDirectory>
586+
<overwriteExistingFiles>true</overwriteExistingFiles>
587+
<module>
588+
<moduleInfo>
589+
<name>org.apache.commons.io</name>
590+
</moduleInfo>
591+
</module>
592+
</configuration>
593+
</execution>
594+
</executions>
595+
</plugin>
596+
</plugins>
597+
</build>
563598
</profile>
564599
<profile>
565600
<id>benchmark</id>
@@ -600,5 +635,32 @@ file comparators, endian transformation classes, and much more.
600635
</plugins>
601636
</build>
602637
</profile>
638+
<profile>
639+
<id>release</id>
640+
<build>
641+
<plugins>
642+
<plugin>
643+
<groupId>org.apache.maven.plugins</groupId>
644+
<artifactId>maven-enforcer-plugin</artifactId>
645+
<version>${commons.enforcer.version}</version>
646+
<executions>
647+
<execution>
648+
<id>enforce-versions</id>
649+
<goals>
650+
<goal>enforce</goal>
651+
</goals>
652+
<configuration>
653+
<rules>
654+
<requireJavaVersion>
655+
<version>9</version>
656+
</requireJavaVersion>
657+
</rules>
658+
</configuration>
659+
</execution>
660+
</executions>
661+
</plugin>
662+
</plugins>
663+
</build>
664+
</profile>
603665
</profiles>
604666
</project>

src/changes/changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ The <action> type attribute can be add,update,fix,remove.
224224
<action dev="ggregory" type="update" due-to="Dependabot">
225225
Bump jmh.version from 1.32 to 1.33 #258.
226226
</action>
227+
<action dev="mgrigorov" type="update">
228+
IO-747 Make commons-io a JPMS module by adding module-info.class.
229+
</action>
227230
</release>
228231
<release version="2.11.0" date="2021-07-09" description="Java 8 required.">
229232
<!-- FIX -->

0 commit comments

Comments
 (0)