Upgrade to Gradle wrapper 9.5.0

Document that running Gradle now requires Java 17

Author: mrotteveel

.github/workflows/run-tests.yml

@@ -12,11 +12,13 @@ jobs:
           - version: 8
             javaInstall: |
               8
-              11
+              17
             buildProfile: 8
             testProfile: 8
           - version: 11
-            javaInstall: 11
+            javaInstall: |
+              11
+              17
             buildProfile: 11
             testProfile: 11
           - version: 11-test-17

build.gradle

@@ -86,6 +86,7 @@ java {
 }
 
 configurations {
+    asciidoctorExt
     if (project.testJava > 8) {
         mockitoAgent
     }
@@ -126,6 +127,8 @@ dependencies {
         }
     }
     testImplementation "org.mockito:mockito-junit-jupiter:$mockito"
+
+    asciidoctorExt 'org.firebirdsql.asciidoctor:canonical-link:1.0'
 }
 
 sourceSets {
@@ -170,14 +173,11 @@ processResources {
 //apply from: 'documentation.gradle'
 
 asciidoctorj {
-    // NOTE: Don't upgrade to v 3.0.0, as it requires Java 11
-    version = '2.5.13'
-
-    // NOTE: We can't use org.firebirdsql.asciidoctor:canonical-link:1.0 as it requires AsciidoctorJ 3.0.x and Java 17
-    docExtensions file('doc-extension.groovy')
+    version = '3.0.1'
 }
 
 tasks.named('asciidoctor', AsciidoctorTask).configure {
+    configurations 'asciidoctorExt'
     executionMode = OUT_OF_PROCESS
     attributes 'version_simple': project.'version.simple',
             'version_wo_target': "${project.'version.simple'}${project.'version.tag'}",

devdoc/build-documentation.md

@@ -4,11 +4,18 @@ NOTE: This document doesn't all aspects of the build. If you miss something,
 please contribute using a pull request, or ask on the firebird-java mailing
 list.
 
+These instructions apply to Branch_5_0 (Jaybird 5.0.x).
+
 ## Running the build
 
-The build uses Gradle wrapper, which is included in the repository. The build
-target (buildProfile) defaults to Java 11, independent of the Java version
-running Gradle.
+The build uses Gradle wrapper, which is included in the repository. The Gradle
+wrapper version itself requires Java 17 minimum. However, the build uses
+toolchains to compile and test on a specific Java version, which will also need
+to be installed. The build script intentionally does not use solutions to
+automatically download Java versions required by the selected toolchain(s).
+
+The build target (`buildProfile`) defaults to Java 11, independent of the Java
+version running Gradle.
 
 The target Java version is determined by passing `-PbuildProfile=NN`, where `NN`
 is the desired Java version. The default is `11`. Versions other than `8` or
@@ -19,15 +26,6 @@ overridden with `-PtestProfile=NN`. For historic reasons, `javaNN` is also
 accepted by both properties. Running tests with `buildProfile` set to Java 8 and
 `testProfile` to Java 11 or higher may fail due to absence of ChaCha support. 
 
-To run with a specific Java version, we suggest creating a Java-specific launch
-script. For example, for Windows create a batch file with:
-
-```
-@echo off
-set JAVA_HOME=C:\Program Files\Java\jdk1.8.0
-call gradlew.bat -PbuildProfile=8 %*
-```
-
 ### Default build
 
 By default, the `clean` and `build` task is executed with the `PURE_JAVA` GDS

doc-extension.groovy

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists