[CALCITE-6137] Upgrade Gradle from 8.1.1 to 8.4, support jdk21

.github/workflows/main.yml

@@ -172,14 +172,14 @@ jobs:
       run: |
         ./gradlew --no-parallel --no-daemon build javadoc
 
-  linux-jdk19:
-    name: 'Linux (JDK 19)'
+  linux-jdk21:
+    name: 'Linux (JDK 21)'
     runs-on: ubuntu-latest
     steps:
-      - name: 'Set up JDK 19'
+      - name: 'Set up JDK 21'
         uses: actions/setup-java@v2
         with:
-          java-version: 19
+          java-version: 21
           distribution: 'zulu'
       - uses: actions/checkout@v3
         with:
@@ -189,16 +189,16 @@ jobs:
           ./gradlew --no-parallel --no-daemon build
 
   mac:
-    name: 'macOS (JDK 19)'
+    name: 'macOS (JDK 21)'
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 50
-    - name: 'Set up JDK 19'
+    - name: 'Set up JDK 21'
       uses: actions/setup-java@v2
       with:
-        java-version: 19
+        java-version: 21
         distribution: 'zulu'
     - name: 'Test'
       run: |

bom/build.gradle.kts

@@ -55,6 +55,8 @@ dependencies {
         apiv("com.h2database:h2")
         apiv("javax.servlet:javax.servlet-api", "servlet")
         apiv("junit:junit")
+        apiv("net.bytebuddy:byte-buddy", "bytebuddy")
+        apiv("net.bytebuddy:byte-buddy-agent", "bytebuddy")
         apiv("net.hydromatic:scott-data-hsqldb")
         apiv("org.apache.httpcomponents.client5:httpclient5")
         apiv("org.apache.httpcomponents.core5:httpcore5")

gradle.properties

@@ -56,6 +56,7 @@ spotbugs.version=3.1.11
 
 asm.version=7.1
 bouncycastle.version=1.70
+bytebuddy.version=1.14.10
 dropwizard-metrics.version=4.0.5
 # We support Guava versions as old as 14.0.1 (the version used by Hive)
 # but prefer more recent versions.

gradle/wrapper/gradle-wrapper.properties

@@ -16,8 +16,9 @@
 #
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-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" \

site/_docs/history.md

@@ -28,6 +28,41 @@ For a full list of releases, see
 Downloads are available on the
 [downloads page]({{ site.baseurl }}/downloads/avatica.html).
 
+<!--
+## <a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.25.0">1.25.0</a> / XXXX-XX-XX
+{: #v1-25-0}
+
+This release comes x months after [1.24.0](#v1-24-0),
+contains contributions from x contributors, and resolves x issues.
+
+Contributors to this release:
+x,
+y (release manager),
+z.
+
+#### Breaking Changes
+{: #breaking-1-25-0}
+
+Compatibility: This release is tested on Linux, macOS, Microsoft Windows;
+using JDK/OpenJDK versions 8, 11, 17, 21;
+other software versions as specified in `gradle.properties`.
+
+#### New features
+{: #new-features-1-25-0}
+
+#### Dependency version upgrade
+{: #dependency-1-25-0}
+
+#### Bug-fixes, API changes and minor enhancements
+{: #fixes-1-25-0}
+
+#### Build and test suite
+{: #build-1-25-0}
+
+#### Web site and documentation
+{: #site-1-25-0}
+-->
+
 ## <a href="https://github.com/apache/calcite-avatica/releases/tag/rel/avatica-1.24.0">1.24.0</a> / 2023-12-04
 {: #v1-24-0}
 

site/_docs/howto.md

@@ -31,7 +31,7 @@ Here's some miscellaneous documentation about using Avatica.
 ## Building from a source distribution
 
 Prerequisites are Java (JDK 8 or later)
-and Gradle (version 8.1.1) on your path.
+and Gradle (version 8.5) on your path.
 
 (The source distribution
 [does not include the Gradle wrapper](https://issues.apache.org/jira/browse/CALCITE-4575);