Pin spock version in lockfile instead

Author: sarahchen6

dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/build.gradle

@@ -40,13 +40,9 @@ configurations.matching({ it.name.startsWith('test') }).configureEach({
 })
 
 configurations.matching({ it.name.startsWith('latestDepTest') }).configureEach({
-  // it.resolutionStrategy.componentSelection.all { ComponentSelection selection ->
-  //   if (selection.candidate.group == 'org.spockframework' && selection.candidate.module == 'spock-core' && !selection.candidate.version.endsWith("-groovy-${spockGroovyVersion}")) {
-  //     selection.reject('Spock groovy version mismatch')
-  //   }
-  // TODO: `org.spockframework.lang.SpecInternals` was moved to `org.spockframework.runtime.SpecInternals` in the latest M7 release: https://github.com/spockframework/spock/pull/2209
-  // Pinning to 2.4-M6 until we update the instrumentation to use the new class and fall back to the old one.
-  it.resolutionStrategy {
-    force "org.spockframework:spock-core:2.4-M6-groovy-${spockGroovyVersion}"
+  it.resolutionStrategy.componentSelection.all { ComponentSelection selection ->
+    if (selection.candidate.group == 'org.spockframework' && selection.candidate.module == 'spock-core' && !selection.candidate.version.endsWith("-groovy-${spockGroovyVersion}")) {
+      selection.reject('Spock groovy version mismatch')
+    }
   }
 })

dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/gradle.lockfile

@@ -187,10 +187,10 @@ org.slf4j:slf4j-api:1.7.36=latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
 org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-bom:2.4-M7-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.spockframework:spock-bom:2.4-M6-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.spockframework:spock-core:2.0-groovy-3.0=compileClasspath
 org.spockframework:spock-core:2.2-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M7-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
+org.spockframework:spock-core:2.4-M6-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 org.testng:testng:7.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs