Upgrade dependencies (#1256)

CHANGELOG.adoc

@@ -40,9 +40,10 @@ Improvement::
 
 * Add command line option --failure-level to force non-zero exit code from AsciidoctorJ CLI if specified logging level is reached. (#1114)
 * Upgrade to asciidoctorj 2.0.20 (#1208)
-* Upgrade to asciidoctorj-pdf 2.3.7 (#1182)
-* Upgrade to asciidoctorj-diagram 2.2.7
-* Upgrade to JRuby 9.4.3.0 (#1234)
+* Upgrade to asciidoctorj-pdf 2.3.10 (#1256)
+* Upgrade to asciidoctorj-revealjs 5.1.0 (#1256)
+* Upgrade to asciidoctorj-diagram 2.2.14 (#1256)
+* Upgrade to JRuby 9.4.5.0 (#1256)
 * Upgrade to tilt 2.0.11 (#1109)
 * Upgrade to asciimath 2.0.4 (#1109)
 * Expose `sectnum` property in Section interface (#1121)
@@ -68,9 +69,8 @@ Bug Fixes::
 
 Build Improvement::
 
-* Upgrade build to Gradle 8.0.1 (#1141)
+* Upgrade build to Gradle 8.5 (#1256)
 * Upgrade Spring Boot test to 3.0.0 (#1134)
-* Run tests on Java 19 (#1563)
 * Fix upstream tests forcing SNAPSHOT on Asciidoctor gem installation (#1123) (@abelsromero)
 * Fix upstream build removing the explicit plugin repository (#1131)
 * Set JUnit5 as default test engine (#1186) (@abelsromero)

asciidoctorj-distribution/src/test/java/org/asciidoctor/WhenBackendIsRevealJs.java

@@ -1,9 +1,7 @@
 package org.asciidoctor;
 
 import org.asciidoctor.cli.jruby.AsciidoctorInvoker;
-import org.asciidoctor.test.AsciidoctorInstance;
 import org.asciidoctor.test.ClasspathResource;
-import org.asciidoctor.test.extension.AsciidoctorExtension;
 import org.asciidoctor.test.extension.ClasspathExtension;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -18,13 +16,9 @@
 import static java.util.stream.Collectors.toList;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith({AsciidoctorExtension.class, ClasspathExtension.class})
+@ExtendWith({ClasspathExtension.class})
 public class WhenBackendIsRevealJs {
 
-    @AsciidoctorInstance
-    private Asciidoctor asciidoctor;
-
-
     @Test
     void should_create_simple_slides(@ClasspathResource("sample.adoc") File inputFile) throws IOException {
         File outputFile = new File(inputFile.getParentFile(), "sample.html");
@@ -33,7 +27,7 @@ void should_create_simple_slides(@ClasspathResource("sample.adoc") File inputFil
         AsciidoctorInvoker.main(new String[]{
                 "-b", "revealjs",
                 "-r", "asciidoctor-diagram",
-                "-a", "revealjsdir=https://cdn.jsdelivr.net/npm/reveal.js@3.9.2",
+                "-a", "revealjsdir=https://cdn.jsdelivr.net/npm/reveal.js@4.1.2",
                 inputFile.getAbsolutePath()
         });
 
@@ -46,8 +40,8 @@ void should_create_simple_slides(@ClasspathResource("sample.adoc") File inputFil
                 .map(element -> element.attr("href"))
                 .collect(toList());
         assertThat(stylesheets)
-                .contains("https://cdn.jsdelivr.net/npm/reveal.js@3.9.2/css/reveal.css",
-                        "https://cdn.jsdelivr.net/npm/reveal.js@3.9.2/css/theme/black.css");
+                .contains("https://cdn.jsdelivr.net/npm/reveal.js@4.1.2/dist/reveal.css",
+                        "https://cdn.jsdelivr.net/npm/reveal.js@4.1.2/dist/theme/black.css");
 
         Element diagramSlide = doc.selectFirst("#diagram");
         assertThat(diagramSlide).isNotNull();

build.gradle

@@ -23,9 +23,9 @@ buildscript {
 
 // modern plugins config
 plugins {
-  id "io.sdkman.vendors" version "2.0.0"
+  id "io.sdkman.vendors" version "3.0.0"
   id "signing"
-  id "io.github.gradle-nexus.publish-plugin" version "1.1.0"
+  id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
   id 'com.github.jruby-gradle.base' version '2.0.1'
   id 'codenarc'
 }
@@ -61,21 +61,21 @@ ext {
   // jar versions
   arquillianVersion = '1.6.0.Final'
   arquillianSpockVersion = '1.0.0.CR1'
-  asciidoctorjPdfVersion = '2.3.7'
+  asciidoctorjPdfVersion = '2.3.10'
   asciidoctorjEpub3Version = '1.5.1'
-  asciidoctorjDiagramVersion = '2.2.7'
+  asciidoctorjDiagramVersion = '2.2.13'
   asciidoctorjDiagramDitaaMiniVersion = '1.0.3'
-  asciidoctorjDiagramPlantumlVersion = '1.2023.5'
-  asciidoctorjRevealJsVersion = '4.1.0'
-  commonsioVersion = '2.11.0'
+  asciidoctorjDiagramPlantumlVersion = '1.2023.12'
+  asciidoctorjRevealJsVersion = '5.1.0'
+  commonsioVersion = '2.15.1'
   guavaVersion = '18.0'
   hamcrestVersion = '1.3'
   jcommanderVersion = '1.82'
   jrubyVersion = '9.4.5.0'
-  jsoupVersion = '1.14.3'
+  jsoupVersion = '1.17.1'
   junit4Version = '4.13.2'
-  junit5Version = '5.9.2'
-  junitPioneerVersion = '2.0.1'
+  junit5Version = '5.10.1'
+  junitPioneerVersion = '2.2.0'
   assertjVersion = '3.24.2'
   nettyVersion = '4.1.58.Final'
   saxonVersion = '9.9.0-2'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \