From 97417c5764a8f8b49e08cb4fc25b7ce46f2f6596 Mon Sep 17 00:00:00 2001
From: Robert Panzer <robert.panzer.pb@googlemail.com>
Date: Wed, 19 Jan 2022 18:01:59 +0100
Subject: [PATCH 1/2] Upgrade to jcommander 1.81 and gradle 7.3.3

---
 CHANGELOG.adoc                                     | 4 ++++
 asciidoctorj-distribution/build.gradle             | 4 ++--
 asciidoctorj-wildfly-integration-test/build.gradle | 8 ++++++++
 build.gradle                                       | 2 +-
 gradle/versioncheck.gradle                         | 2 +-
 gradle/wrapper/gradle-wrapper.properties           | 2 +-
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index aea60be1..bb918a27 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -15,10 +15,14 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 
 Improvement::
 
+* Upgrade to jcommander 1.81 (#1079)
+
 Bug Fixes::
 
 Build Improvement::
 
+* Upgrade to gradle 7.3.3 (#1079)
+
 Documentation::
 
 == 2.5.3 (2022-01-12)
diff --git a/asciidoctorj-distribution/build.gradle b/asciidoctorj-distribution/build.gradle
index 0dd6912b..c0263e34 100644
--- a/asciidoctorj-distribution/build.gradle
+++ b/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'
diff --git a/asciidoctorj-wildfly-integration-test/build.gradle b/asciidoctorj-wildfly-integration-test/build.gradle
index fa147aa8..03fd240a 100644
--- a/asciidoctorj-wildfly-integration-test/build.gradle
+++ b/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"
diff --git a/build.gradle b/build.gradle
index 4585703c..a83b373d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,7 +68,7 @@ ext {
   commonsioVersion = '2.11.0'
   guavaVersion = '18.0'
   hamcrestVersion = '1.3'
-  jcommanderVersion = '1.81'
+  jcommanderVersion = '1.82'
   jrubyVersion = '9.2.20.1'
   jsoupVersion = '1.14.3'
   junitVersion = '4.13.2'
diff --git a/gradle/versioncheck.gradle b/gradle/versioncheck.gradle
index 167b3e74..b233baa6 100644
--- a/gradle/versioncheck.gradle
+++ b/gradle/versioncheck.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.github.zafarkhaja:java-semver:0.9.0'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a25..2e6e5897 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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

From 3aa35f09051da33dde3d75d3db2a2c9f4dcfe11c Mon Sep 17 00:00:00 2001
From: Robert Panzer <robert.panzer.pb@googlemail.com>
Date: Wed, 19 Jan 2022 18:45:58 +0100
Subject: [PATCH 2/2] Upgrade to jruby 9.3.3.0

---
 CHANGELOG.adoc | 1 +
 build.gradle   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index bb918a27..dba97a65 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -16,6 +16,7 @@ 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::
 
diff --git a/build.gradle b/build.gradle
index a83b373d..2bf981e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,7 +69,7 @@ ext {
   guavaVersion = '18.0'
   hamcrestVersion = '1.3'
   jcommanderVersion = '1.82'
-  jrubyVersion = '9.2.20.1'
+  jrubyVersion = '9.3.3.0'
   jsoupVersion = '1.14.3'
   junitVersion = '4.13.2'
   assertjVersion = '3.19.0'