feat: Add support for Java 25

 - Update GitHub Actions workflow to include Java 25 in the test matrix.
 - Upgrade Byte Buddy to 1.18.4 to support newer bytecode versions.
 - Introduce conditional patching for the Spring Petclinic test fixture,
  adding a specific patch for Java 25 compatibility.
 - Update JDBC and Spring Boot test modules to support Jakarta EE
  namespaces (Spring Boot 3.x) when running on newer Java versions.
 - Refactor test infrastructure to handle Gradle 9+ and newer JDKs,
  including Gretty and Gradle wrapper version adjustments.
 - Improve thread ID detection in Petclinic tests to account for
  differentiation in thread numbering between JDK versions.
 - Clean up hardcoded Java toolchains in classloading tests to allow
  running tests on the current environment's JDK.

Author: dividedmind

.github/workflows/build-and-test.yml

@@ -56,7 +56,7 @@ jobs:
           --health-retries 5
     strategy:
       matrix:
-        java: ['21', '17', '11', '8']
+        java: ['25', '21', '17', '11', '8']
     runs-on: ubuntu-latest
     name: Run test suite with Java ${{ matrix.java }}
     needs: build-and-check

agent/bin/test_projects

@@ -87,7 +87,23 @@ else
   install_petclinic "land-of-apps/spring-petclinic" old-java-support
 fi
 
-patch -N -p1 -d build/fixtures/spring-petclinic < test/petclinic/pom.patch
+# Select the appropriate patch file based on Java version
+if is_java 25; then
+  PATCH_FILE="test/petclinic/pom-java25.patch"
+else
+  PATCH_FILE="test/petclinic/pom.patch"
+fi
+
+# Apply patch, but only ignore if already applied (not other failures)
+if ! patch -N -p1 -d build/fixtures/spring-petclinic < "$PATCH_FILE" 2>&1 | tee /tmp/patch_output.txt; then
+  if grep -q "Reversed (or previously applied) patch detected" /tmp/patch_output.txt; then
+    echo "Patch already applied, continuing..."
+  else
+    echo "ERROR: Patch failed to apply!"
+    cat /tmp/patch_output.txt
+    exit 1
+  fi
+fi
 
 
 install_scala_test_app

agent/build.gradle

@@ -52,7 +52,7 @@ dependencies {
   implementation 'com.alibaba:fastjson:1.2.83'
   implementation "org.javassist:javassist:${javassistVersion}"
   implementation 'org.reflections:reflections:0.10.2'
-  implementation 'net.bytebuddy:byte-buddy:1.14.10'
+  implementation 'net.bytebuddy:byte-buddy:1.18.4'
   implementation 'org.apache.commons:commons-lang3:3.20.0'
   implementation 'commons-io:commons-io:2.15.1'
   implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.1'

agent/test/classloading/app/build.gradle

@@ -35,14 +35,6 @@ dependencies {
     implementation files(appmapJar)
 }
 
-// Apply a specific Java toolchain to ease working on different environments.
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-}
-
-
 application {
     // Define the main class for the application.
     mainClass = 'com.appland.appmap.test.fixture.Runner'

agent/test/classloading/lib/build.gradle

@@ -18,10 +18,3 @@ repositories {
 
 dependencies {
 }
-
-// Apply a specific Java toolchain to ease working on different environments.
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-}

agent/test/classloading/settings.gradle

@@ -1,16 +1,2 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/8.1.1/userguide/multi_project_builds.html
- */
-
-plugins {
-    // Apply the foojay-resolver plugin to allow automatic download of JDKs
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
-}
-
 rootProject.name = 'classloading'
 include 'app', 'lib'

agent/test/gretty-tomcat/build.gradle

@@ -1,6 +1,16 @@
+buildscript {
+  ext {
+    if (GradleVersion.current() >= GradleVersion.version('9.0')) {
+      grettyVersion = '5.0.1'
+    } else {
+      grettyVersion = '4.1.6'
+    }
+  }
+}
+
 plugins {
   id 'war'
-  id 'org.gretty' version '4.1.6'
+  id 'org.gretty' version "${grettyVersion}"
 }
 
 repositories {

agent/test/helper.bash

@@ -151,7 +151,13 @@ find_annotation_jar() {
 export ANNOTATION_JAR="$(find_annotation_jar)"
 
 # absolute gradle wrapper path (in the same directory as this file)
-GRADLE_WRAPPER="$TOP_LEVEL/agent/test/gradlew"
+if is_java 25; then
+  # use 9.1 for newer java
+  GRADLE_WRAPPER="$TOP_LEVEL/gradlew"
+else
+  # this is 8.5 for older javas
+  GRADLE_WRAPPER="$TOP_LEVEL/agent/test/gradlew"
+fi
 
 # Shared gradle wrapper function
 gradlew() {

agent/test/http_client/httpclient/build.gradle

@@ -32,14 +32,16 @@ dependencies {
 }
 
 application {
-  // mainClass = 'http_client.HttpClientTest'
-  mainClassName = project.hasProperty("mainClass") ? project.getProperty("mainClass") : "NULL"
+  if (properties.containsKey("mainClass")) {
+    mainClass = project.hasProperty("mainClass") ? project.getProperty("mainClass") : "NULL"
+  } else {
+    mainClassName = project.hasProperty("mainClass") ? project.getProperty("mainClass") : "NULL"
+  }
   applicationDefaultJvmArgs = [
     System.env.JAVA_OUTPUT_OPTIONS,
     "-javaagent:${appmapJar}",
     "-Djava.util.logging.config.file=${System.env.JUL_CONFIG}",
     //"-Dappmap.debug=true",
     //"-Dappmap.debug.file=../../build/log/httpclient-appmap.log"
   ]
-
 }

agent/test/http_client/setup_suite.bash

@@ -8,13 +8,6 @@ setup_suite() {
   export FIXTURE_DIR="build/fixtures/spring-petclinic"
   _shared_setup
   start_petclinic >&3
-
-  if is_java 17; then
-    SPRING_BOOT_VERSION="3.2.2"
-  else
-    SPRING_BOOT_VERSION="2.7.18"
-  fi
-  export SPRING_BOOT_VERSION
 }
 
 teardown_suite() {