Merge pull request #1079 from robertpanzer/gradle-7.3.3

Upgrade to jcommander 1.81 and gradle 7.3.3

CHANGELOG.adoc

@@ -15,10 +15,15 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 
 Improvement::
 
+* Upgrade to jcommander 1.81 (#1079)
+* Upgrade to JRuby 9.3.3.0 (#1079)
+
 Bug Fixes::
 
 Build Improvement::
 
+* Upgrade to gradle 7.3.3 (#1079)
+
 Documentation::
 
 == 2.5.3 (2022-01-12)

asciidoctorj-distribution/build.gradle

@@ -45,7 +45,7 @@ configurations.archives.with {
 }
 
 tasks.withType(AbstractArchiveTask) {
-  baseName rootProject.name
+  archiveBaseName.set(rootProject.name)
   classifier 'bin' // use classifier for identification in repository list
   eachFile { it.path = it.path.replaceFirst('-bin(?=/)', '') }
   //destinationDir = ...
@@ -55,7 +55,7 @@ startScripts {
   unixStartScriptGenerator.template = resources.text.fromFile('src/main/resources/customUnixStartScript.txt')
 
   applicationName = rootProject.name
-  mainClassName = 'org.asciidoctor.jruby.cli.AsciidoctorInvoker'
+  mainClass.set('org.asciidoctor.jruby.cli.AsciidoctorInvoker')
   defaultJvmOpts = [
     '-client', '-Xmn128m', '-Xms256m', '-Xmx256m', '-Djava.awt.headless=true',
     '-Xverify:none', '-XX:+TieredCompilation', '-XX:TieredStopAtLevel=1', '-XX:+DisableExplicitGC', '-Djruby.compile.mode=OFF'

asciidoctorj-wildfly-integration-test/build.gradle

@@ -49,6 +49,14 @@ compileTestJava {
     dependsOn unpackWildfly
 }
 
+javadocJar {
+    dependsOn unpackWildfly
+}
+
+sourcesJar {
+    dependsOn unpackWildfly
+}
+
 tasks.create("createModule").doLast {
     copy {
         from "src/test/resources/module.xml"

build.gradle

@@ -68,8 +68,8 @@ ext {
   commonsioVersion = '2.11.0'
   guavaVersion = '18.0'
   hamcrestVersion = '1.3'
-  jcommanderVersion = '1.81'
-  jrubyVersion = '9.2.20.1'
+  jcommanderVersion = '1.82'
+  jrubyVersion = '9.3.3.0'
   jsoupVersion = '1.14.3'
   junitVersion = '4.13.2'
   assertjVersion = '3.19.0'

gradle/versioncheck.gradle

@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.github.zafarkhaja:java-semver:0.9.0'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists