Java 25 support

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

@@ -55,7 +55,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/petclinic/pom-java25.patch

@@ -0,0 +1,55 @@
+diff --git a/pom.xml b/pom.xml
+index fb38cc3..6cb8530 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -65,6 +65,23 @@
+     <dependency>
+       <groupId>org.springframework.boot</groupId>
+       <artifactId>spring-boot-starter-webmvc</artifactId>
++      <exclusions>
++        <exclusion>
++          <groupId>org.springframework.boot</groupId>
++          <artifactId>spring-boot-starter-tomcat</artifactId>
++        </exclusion>
++      </exclusions>
++    </dependency>
++    <dependency>
++      <groupId>com.appland</groupId>
++      <artifactId>annotation</artifactId>
++      <version>LATEST</version>
++      <scope>system</scope>
++      <systemPath>${env.ANNOTATION_JAR}</systemPath>
++    </dependency>
++    <dependency>
++      <groupId>com.fasterxml.jackson.core</groupId>
++      <artifactId>jackson-databind</artifactId>
+     </dependency>
+
+     <dependency>
+@@ -407,5 +424,26 @@
+         </pluginManagement>
+       </build>
+     </profile>
++    <profile>
++      <id>tomcat</id>
++      <activation>
++        <activeByDefault>true</activeByDefault>
++      </activation>
++      <dependencies>
++        <dependency>
++          <groupId>org.springframework.boot</groupId>
++          <artifactId>spring-boot-starter-tomcat</artifactId>
++        </dependency>
++      </dependencies>
++    </profile>
++    <profile>
++      <id>jetty</id>
++      <dependencies>
++        <dependency>
++          <groupId>org.springframework.boot</groupId>
++          <artifactId>spring-boot-starter-jetty</artifactId>
++        </dependency>
++      </dependencies>
++    </profile>
+   </profiles>
+ </project>