Upgrade to Gradle 8.4

Also upgrade asciidoctor-gradle-plugin to 4.0.0-alpha-1 and AsciiDoctor to 2.5.10

build-properties.gradle

@@ -24,22 +24,16 @@ ext.YEAR = buildTime.format("yyyy")
 if (findProperty('buildProfile') == 'java17') {
     println 'Build profile: Java 17'
     ext.'maven.jdkversion' = 'java17'
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
     ext.'specification.version' = '4.3'
 } else if (findProperty('buildProfile') == 'java8') {
     println 'Build profile: Java 8'
     ext.buildProfile = 'java8'
     ext.'maven.jdkversion' = 'java8'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
     ext.'specification.version' = '4.2'
 } else {
     // Default to Java 11
     println 'Build profile: Java 11'
     ext.'maven.jdkversion' = 'java11'
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
     ext.'specification.version' = '4.3'
 }
 

build.gradle

@@ -20,7 +20,7 @@ plugins {
     id 'nu.studer.credentials' version '3.0'
     id 'maven-publish'
     id 'signing'
-    id 'org.asciidoctor.jvm.convert' version '3.3.2'
+    id 'org.asciidoctor.jvm.convert' version '4.0.0-alpha.1'
 }
 
 defaultTasks 'clean', 'build'
@@ -29,13 +29,12 @@ apply from: 'build-properties.gradle'
 
 group = 'org.firebirdsql.jdbc'
 version = project.'version.maven'
-archivesBaseName = project.mavenName
 
 allprojects {
-    tasks.withType(JavaCompile) {
+    tasks.withType(JavaCompile).configureEach {
         options.encoding = 'UTF-8'
     }
-    tasks.withType(Test) {
+    tasks.withType(Test).configureEach {
         systemProperty 'file.encoding', 'UTF-8'
     }
 }
@@ -44,7 +43,19 @@ repositories {
     mavenCentral()
 }
 
+base {
+    archivesName = project.mavenName
+}
+
 java {
+    def javaVersion = JavaVersion.VERSION_11
+    if (project.'maven.jdkversion' == 'java17') {
+        javaVersion = JavaVersion.VERSION_17
+    } else if (project.'maven.jdkversion' == 'java8') {
+        javaVersion = JavaVersion.VERSION_1_8
+    }
+    sourceCompatibility = javaVersion
+    targetCompatibility = javaVersion
     withJavadocJar()
     withSourcesJar()
     registerFeature('native') {
@@ -122,16 +133,24 @@ processResources {
 //apply from: 'documentation.gradle'
 
 asciidoctorj {
-    version = '2.5.7'
-    attributes 'revnumber': null,
-            'version_simple': project.'version.simple',
+    version = '2.5.10'
+}
+
+tasks.named('asciidoctor', AsciidoctorTask).configure {
+    attributes 'version_simple': project.'version.simple',
             'version_wo_target': "${project.'version.simple'}${project.'version.tag'}",
             'version_tag': project.'version.tag',
             'version_example': "${project.'version.simple'}.java11${project.'version.tag'}",
             'stylesdir': file('src/docs/theme/jaybird-html'),
             'stylesheet': 'firebird.css',
             'docinfo': 'shared',
             'docinfodir': file('src/docs/theme/jaybird-html/docinfo')
+
+    if (JavaVersion.current().isJava9Compatible()) {
+        forkOptions {
+            jvmArgs "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", "--add-opens", "java.base/java.io=ALL-UNNAMED"
+        }
+    }
 }
 
 task dist(type: Zip) {

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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"'
+# 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
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# 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.
+
+# 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, 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" \