Tweaking Groovy setup.

Author: AlexeyKuznetsov-DD

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle

@@ -11,5 +11,7 @@ dependencies {
   api libs.jackson.databind
   api group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
   api group: 'org.xmlunit', name: 'xmlunit-core', version: '2.10.3'
+
+  compileOnly libs.bundles.spock
 }
 

dd-java-agent/testing/build.gradle

@@ -35,7 +35,6 @@ dependencies {
   api libs.bytebuddy
   api libs.bytebuddyagent
   api libs.slf4j
-  api libs.bundles.spock
   api libs.bundles.test.logging
   api libs.guava
 
@@ -50,6 +49,8 @@ dependencies {
 
   api libs.groovy
 
+  compileOnly libs.bundles.spock
+
   implementation "org.junit.platform:junit-platform-runner:${libs.versions.junit.platform.get()}"
   implementation project(':dd-java-agent:appsec')
 }

dd-smoke-tests/gradle/build.gradle

@@ -6,10 +6,28 @@ apply from: "$rootDir/gradle/java.gradle"
 description = 'Gradle Daemon Instrumentation Smoke Tests.'
 
 dependencies {
+  testImplementation 'org.codehaus.groovy:groovy-all:3.0.24'
+  testImplementation 'org.spockframework:spock-core:2.4-M6-groovy-3.0'
+  testImplementation 'org.objenesis:objenesis:3.3'
+
   testImplementation gradleTestKit()
   testImplementation project(':dd-smoke-tests:backend-mock')
   testImplementation project(':internal-api')
-  testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-test-fixtures')
+  testImplementation(project(':dd-java-agent:agent-ci-visibility:civisibility-test-fixtures')) {
+    exclude group: "org.spockframework", module: "spock-core"
+  }
+}
+
+configurations {
+  testImplementation {
+    exclude group: 'org.apache.groovy'
+  }
+}
+
+configurations.named('testImplementation') {
+  resolutionStrategy {
+    force 'org.spockframework:spock-core:2.4-M6-groovy-3.0'
+  }
 }
 
 tasks.named("test", Test) {

gradle/java_deps.gradle

@@ -1,8 +1,15 @@
 apply plugin: 'groovy'
 
 dependencies {
-  testImplementation libs.bundles.spock
-  testImplementation libs.groovy
+  if ((project.name == "gradle" && project.parent.name == "dd-smoke-tests") ||
+    (project.name == "spock-junit-5")
+    ) {
+    logger.info("Skip Groovy 4 setup for module: `:${project.parent.name}:${project.name}`")
+  } else {
+    testImplementation libs.bundles.spock
+    testImplementation libs.groovy
+  }
+
   testImplementation libs.bundles.test.logging
 
   // JUnit and Mockito compatible with Spock 2.4.0

settings.gradle.kts

@@ -167,7 +167,7 @@ include(
   ":dd-smoke-tests:custom-systemloader",
   ":dd-smoke-tests:dynamic-config",
   ":dd-smoke-tests:field-injection",
-  // ":dd-smoke-tests:gradle", TODO fix incompatibility with Groovy 4.x: gradle uses Groovy 3.
+  ":dd-smoke-tests:gradle",
   ":dd-smoke-tests:grpc-1.5",
   ":dd-smoke-tests:java9-modules",
   ":dd-smoke-tests:jersey-2",

utils/test-utils/build.gradle.kts

@@ -5,15 +5,14 @@ plugins {
 apply(from = "$rootDir/gradle/java.gradle")
 
 dependencies {
-  api(libs.groovy)
-  api(libs.bundles.spock)
-
   api(libs.bytebuddy)
   api(libs.bytebuddyagent)
 
   api(project(":components:environment"))
   api(group = "commons-fileupload", name = "commons-fileupload", version = "1.5")
 
+  compileOnly(libs.groovy)
+  compileOnly(libs.bundles.spock)
   compileOnly(libs.logback.core)
   compileOnly(libs.logback.classic)
 }