Merge branch 'master' into alejandro.gonzalez/RFC-1081

Author: jandro996

.claude/skills/migrate-groovy-to-java/SKILL.md

@@ -0,0 +1,20 @@
+---
+name: migrate-groovy-to-java
+description: migrate test groovy files to java
+---
+
+Migrate test Groovy files to Java using JUnit 5
+
+1. List all groovy files of the current gradle module
+2. convert groovy files to Java using Junit 5
+3. make sure the tests are still passing after migration
+4. remove groovy files
+
+When converting groovy code to java code make sure that:
+- the Java code generated is compatible with JDK 8
+- when translating Spock test, favor using `@CsvSource` with `|` delimiters
+- when using a `@MethodSource`, use the test method name, and suffix it with `_arguments`
+- when converting tuples, create light dedicated structure instead to keep the typing system
+- Instead of checking a state and throwing an exception, use JUnit asserts
+- Do not wrap checked exception and throwing a Runtime exception, prefer adding a throws clause at method declaration
+- Do not mark local variables `final`

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
   java
-  groovy
   id("com.diffplug.spotless") version "8.2.1"
   id("com.gradleup.shadow") version "8.3.9"
 }
@@ -34,8 +33,9 @@ dependencies {
   implementation(libs.javaparser.symbol.solver)
 
   testImplementation(libs.bytebuddy)
-  testImplementation(libs.bundles.groovy)
-  testImplementation(libs.bundles.spock)
+  testImplementation(libs.bundles.junit5)
+  testRuntimeOnly(libs.junit.platform.launcher)
+  testImplementation(libs.bundles.mockito)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation(libs.spotbugs.annotations)
 }