Various minor improvements to Gradle + Maven build scripts

build.gradle

@@ -288,6 +288,10 @@ task bumpReadmeVersion {
                 include(name: '**/pom.xml')
                 include(name: '**/build.gradle')
             }
+            fileset(dir: './picocli-examples/generate-man-pages/') {
+                include(name: '**/pom.xml')
+                include(name: '**/build.gradle')
+            }
             //fileset(dir: './picocli-examples/src/main/groovy/', includes: '**/*.groovy')
         }
     }

gradle/wrapper/gradle-wrapper.properties

@@ -6,4 +6,5 @@ zipStorePath=wrapper/dists
 #distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 #distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
 #distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

picocli-codegen/build.gradle

@@ -110,7 +110,7 @@ task generateManpageAsciiDoc(type: JavaExec) {
     dependsOn(classes)
     group = "Documentation"
     description = "Generate AsciiDoc manpage"
-    classpath(configurations.compile, configurations.annotationProcessor, sourceSets.main.runtimeClasspath)
+    classpath(configurations.compileClasspath, configurations.annotationProcessor, sourceSets.main.runtimeClasspath)
     main 'picocli.codegen.docgen.manpage.ManPageGenerator'
     args 'picocli.codegen.docgen.manpage.ManPageGenerator$App',
             'picocli.codegen.aot.graalvm.DynamicProxyConfigGenerator$App',

picocli-examples/annotation-processing/example-gradle-project-kotlin-graal-nativeimage/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.72'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.10'
     id 'application'
-    id "com.palantir.graal" version "0.7.1-12-g028cd78"
+    id "com.palantir.graal" version "0.7.1-20-g113a84d"
 }
 
 def mainCommandClass = "picocli.examples.kotlin.Checksum"
@@ -13,7 +13,7 @@ version '1.0-SNAPSHOT'
 sourceCompatibility = 8
 
 application{
-    mainClassName = mainCommandClass
+    mainClass.set(mainCommandClass)
 }
 
 
@@ -49,10 +49,10 @@ task uberJar(type: Jar) {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile 'org.jetbrains.kotlin:kotlin-test-junit5:1.3.72'
+    testImplementation  'org.jetbrains.kotlin:kotlin-test-junit5:1.4.10'
 
-    testImplementation "org.junit.jupiter:junit-jupiter:5.4.2"
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.4.2")
+    testImplementation "org.junit.jupiter:junit-jupiter:5.7.0"
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0")
 }
 
 
@@ -76,7 +76,7 @@ configurations {
     generateConfig
 }
 dependencies {
-    compile 'info.picocli:picocli:4.5.2'
+    implementation 'info.picocli:picocli:4.5.2'
     generateConfig 'info.picocli:picocli-codegen:4.5.2'
 }
 

picocli-examples/annotation-processing/example-gradle-project/build.gradle

@@ -14,10 +14,10 @@ repositories {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.1'
 }
 dependencies {
-    compile 'info.picocli:picocli:4.5.2'
+    implementation 'info.picocli:picocli:4.5.2'
     annotationProcessor 'info.picocli:picocli-codegen:4.5.2'
     //compileOnly 'info.picocli:picocli-codegen:4.5.2' // in pre-Gradle 4.6
 }

picocli-examples/generate-man-pages/example-gradle-project/build.gradle

@@ -8,14 +8,14 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.asciidoctor:asciidoctor-gradle-plugin:1.6.1"
+        classpath "org.asciidoctor:asciidoctor-gradle-jvm:3.2.0"
     }
 }
 
 plugins {
     id 'java'
 }
-apply plugin: 'org.asciidoctor.convert'
+apply plugin: 'org.asciidoctor.jvm.convert'
 
 
 group 'org.mycompany.myproject'
@@ -30,11 +30,11 @@ repositories {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.1'
 }
 dependencies {
-    compile "info.picocli:picocli:4.2.0"
-    annotationProcessor "info.picocli:picocli-codegen:4.2.0"
+    implementation "info.picocli:picocli:4.5.2"
+    annotationProcessor "info.picocli:picocli-codegen:4.5.2"
 }
 
 project.ext {
@@ -45,18 +45,20 @@ task generateManpageAsciiDoc(type: JavaExec) {
     dependsOn(classes)
     group = "Documentation"
     description = "Generate AsciiDoc manpage"
-    classpath(configurations.compile, configurations.annotationProcessor, sourceSets.main.runtimeClasspath)
+    classpath(configurations.compileClasspath, configurations.annotationProcessor, sourceSets.main.runtimeClasspath)
     main 'picocli.codegen.docgen.manpage.ManPageGenerator'
     args project.ext.mainClassName, "--outdir=${project.buildDir}/generated-picocli-docs", "-v", "--template-dir=src/docs/mantemplates"
 }
 
-apply plugin: 'org.asciidoctor.convert'
+apply plugin: 'org.asciidoctor.jvm.convert'
 asciidoctor {
     dependsOn(generateManpageAsciiDoc)
     sourceDir = file("${project.buildDir}/generated-picocli-docs")
     outputDir = file("${project.buildDir}/docs")
     logDocuments = true
-    backends 'manpage', 'html5'
+    outputOptions {
+        backends = ['manpage', 'html5']
+    }
 }
 assemble.dependsOn(asciidoctor)
 

picocli-examples/generate-man-pages/example-maven-project/pom.xml

@@ -14,7 +14,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.1</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -27,20 +27,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <id>jar</id>
-          </execution>
-        </executions>
+        <version>3.2.0</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.6.0</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <id>generateManPages</id>
@@ -67,7 +59,7 @@
           <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli-codegen</artifactId>
-            <version>4.2.0</version>
+            <version>4.5.2</version>
             <type>jar</type>
           </dependency>
         </dependencies>
@@ -75,7 +67,7 @@
       <plugin>
         <groupId>org.asciidoctor</groupId>
         <artifactId>asciidoctor-maven-plugin</artifactId>
-        <version>1.6.0</version>
+        <version>2.1.0</version>
         <executions>
           <execution>
             <id>output-html</id>
@@ -125,12 +117,12 @@
     <dependency>
       <groupId>info.picocli</groupId>
       <artifactId>picocli</artifactId>
-      <version>4.2.0</version>
+      <version>4.5.2</version>
     </dependency>
     <dependency>
       <groupId>info.picocli</groupId>
       <artifactId>picocli-codegen</artifactId>
-      <version>4.2.0</version>
+      <version>4.5.2</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>