[#2335] Ensure module info is included in all release jars

remkop · Aug 31, 2024 · a25cfd4 · a25cfd4
1 parent b03121b
commit a25cfd4
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 27 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,41 @@
 # picocli Release Notes
 
+# <a name="4.7.7"></a> Picocli 4.7.7
+The picocli community is pleased to announce picocli 4.7.7.
+
+This release includes bugfixes and enhancements.
+
+Many thanks to the picocli community for raising these issues and providing the pull requests to address them!
+
+This is the eighty-sixth public release.
+Picocli follows [semantic versioning](https://semver.org/).
+Artifacts in this release are signed by Remko Popma (6601 E5C0 8DCC BB96).
+
+## <a name="4.7.7-toc"></a> Table of Contents
+* [New and noteworthy](#4.7.7-new)
+* [Fixed issues](#4.7.7-fixes)
+* [Deprecations](#4.7.7-deprecated)
+* [Potential breaking changes](#4.7.7-breaking-changes)
+
+## <a name="4.7.7-new"></a> New and Noteworthy
+
+
+
+
+## <a name="4.7.7-fixes"></a> Fixed issues
+
+* [#2335] Module info missing in all jars except the main picocli jar file. Thanks to [Oliver B. Fischer](https://github.com/obfischer) for raising this.
+
+
+
+## <a name="4.7.7-deprecated"></a> Deprecations
+No features were deprecated in this release.
+
+## <a name="4.7.7-breaking-changes"></a> Potential breaking changes
+This release has no breaking changes.
+
+
+
 # <a name="4.7.6"></a> Picocli 4.7.6
 The picocli community is pleased to announce picocli 4.7.6.
 

diff --git a/build.gradle b/build.gradle
@@ -23,6 +23,7 @@ buildscript {
     }
 }
 
+apply plugin: 'org.beryx.jar' // for compiling module-info on Java 8
 apply plugin: 'io.codearte.nexus-staging'
 
 if (System.getenv('MAVEN_OSS_USER')) { // on home system
@@ -61,7 +62,6 @@ pluginManager.withPlugin('biz.aQute.bnd.builder') { // if plugin applied, execut
 allprojects {
     apply plugin: 'java'
     apply plugin: 'java-library' // to avoid https://github.com/gradle/gradle/issues/1118
-    apply plugin: 'org.beryx.jar' // for compiling module-info on Java 8
 
     // https://errorprone.info/docs/installation requires Java 11+
     if (JavaVersion.current().isJava11Compatible()) {
@@ -121,32 +121,6 @@ allprojects {
     // Workaround frpm https://bugs.openjdk.org/browse/JDK-4973681
     javadoc.options.addStringOption('sourcepath', 'src/main/java')
 
-    if (!project.name in ['picocli-examples', 'picocli-annotation-processing-tests']) {
-        //sourceSets.main.java.srcDirs = ['src/main/java', 'src/main/java9']
-        compileJava {
-            inputs.property("moduleName", moduleName)
-            //    doFirst {
-            //        logger.info("Java version is " + JavaVersion.current())
-            //        if (JavaVersion.current().isJava9Compatible()) {
-            //            options.compilerArgs = [
-            //                '--module-path', classpath.asPath,
-            //            ]
-            //        }
-            //        // classpath = files()
-            //        classpath = sourceSets.main.runtimeClasspath
-            //        logger.info("options.compilerArgs is " + options.compilerArgs)
-            //        logger.info("classpath is " + classpath.files)
-            //    }
-        }
-        moduleConfig {
-            // copy module-info.class to META-INF/versions/9
-            multiReleaseVersion = 9
-            moduleInfoPath = 'src/main/java9/module-info.java'
-            version = project.version
-            neverCompileModuleInfo = true
-        }
-    }
-
     normalization {
         runtimeClasspath {
             metaInf {

diff --git a/picocli-codegen/build.gradle b/picocli-codegen/build.gradle
@@ -19,6 +19,18 @@ dependencies {
     api rootProject
 }
 
+apply plugin: 'org.beryx.jar' // for compiling module-info on Java 8
+compileJava {
+    inputs.property("moduleName", moduleName)
+}
+moduleConfig {
+    // copy module-info.class to META-INF/versions/9
+    multiReleaseVersion = 9
+    moduleInfoPath = 'src/main/java9/module-info.java'
+    version = project.version
+    neverCompileModuleInfo = true
+}
+
 //task generateGraalReflectionConfig(type: JavaExec) {
 //    mainClass = 'picocli.codegen.aot.graalvm.ReflectionConfigGenerator'
 //    classpath = sourceSets.main.runtimeClasspath

diff --git a/picocli-groovy/build.gradle b/picocli-groovy/build.gradle
@@ -8,6 +8,18 @@ description 'Picocli Groovy - easily use picocli in Groovy scripts.'
 version "$projectVersion"
 ext.moduleName = 'info.picocli.groovy'
 
+apply plugin: 'org.beryx.jar' // for compiling module-info on Java 8
+compileJava {
+    inputs.property("moduleName", moduleName)
+}
+moduleConfig {
+    // copy module-info.class to META-INF/versions/9
+    multiReleaseVersion = 9
+    moduleInfoPath = 'src/main/java9/module-info.java'
+    version = project.version
+    neverCompileModuleInfo = true
+}
+
 configurations {
     ivy
 }

diff --git a/picocli-shell-jline2/build.gradle b/picocli-shell-jline2/build.gradle
@@ -12,6 +12,18 @@ dependencies {
     api supportDependencies.jline2
 }
 
+apply plugin: 'org.beryx.jar' // for compiling module-info on Java 8
+compileJava {
+    inputs.property("moduleName", moduleName)
+}
+moduleConfig {
+    // copy module-info.class to META-INF/versions/9
+    multiReleaseVersion = 9
+    moduleInfoPath = 'src/main/java9/module-info.java'
+    version = project.version
+    neverCompileModuleInfo = true
+}
+
 jar {
     manifest {
         attributes  'Specification-Title'   : 'Picocli Shell JLine2',

diff --git a/picocli-shell-jline3/build.gradle b/picocli-shell-jline3/build.gradle
@@ -15,6 +15,18 @@ dependencies {
     api                supportDependencies.jline3
 }
 
+apply plugin: 'org.beryx.jar' // for compiling module-info on Java 8
+compileJava {
+    inputs.property("moduleName", moduleName)
+}
+moduleConfig {
+    // copy module-info.class to META-INF/versions/9
+    multiReleaseVersion = 9
+    moduleInfoPath = 'src/main/java9/module-info.java'
+    version = project.version
+    neverCompileModuleInfo = true
+}
+
 jar {
     manifest {
         attributes  'Specification-Title'   : 'Picocli Shell JLine3',

diff --git a/picocli-spring-boot-starter/build.gradle b/picocli-spring-boot-starter/build.gradle
@@ -24,6 +24,18 @@ if (useJava17) {
     targetCompatibility = 1.8
 }
 
+apply plugin: 'org.beryx.jar' // for compiling module-info on Java 8
+compileJava {
+    inputs.property("moduleName", moduleName)
+}
+moduleConfig {
+    // copy module-info.class to META-INF/versions/9
+    multiReleaseVersion = 9
+    moduleInfoPath = 'src/main/java9/module-info.java'
+    version = project.version
+    neverCompileModuleInfo = true
+}
+
 dependencies {
     api                 rootProject
     if (useJava17) {