Remove Groovy from internal-api modules

buildSrc/src/main/kotlin/dd-trace-java.conventions.java-only.gradle.kts

@@ -0,0 +1,13 @@
+/*
+ * Temporary Java-only counterpart of `dd-trace-java.conventions.java` while modules migrate from
+ * Groovy/Spock to Java/JUnit 5. Migrated modules use this pure Java convention (no `groovy` plugin,
+ * Spock or CodeNarc), while modules not yet migrated keep using `dd-trace-java.conventions.java`.
+ * Once all modules are migrated, merge this with `dd-trace-java.conventions.java`.
+ */
+plugins {
+  id("dd-trace-java.dependency-locking")
+  java
+}
+
+apply(from = rootDir.resolve("gradle/java_no_deps.gradle"))
+apply(from = rootDir.resolve("gradle/java_test_deps.gradle"))

buildSrc/src/main/kotlin/dd-trace-java.module.internal-api.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-  id("dd-trace-java.conventions.java")
+  id("dd-trace-java.conventions.java-only")
 }

gradle/java_deps.gradle

@@ -1,15 +1,8 @@
 apply plugin: 'groovy'
 
+apply from: "$rootDir/gradle/java_test_deps.gradle"
+
 dependencies {
-  testImplementation platform(libs.junit.bom)
   testImplementation libs.bundles.spock
   testImplementation libs.bundles.groovy
-  testImplementation libs.tabletest
-
-  testImplementation libs.bundles.test.logging
-
-  // JUnit and Mockito compatible with Spock 2.4.0
-  testRuntimeOnly libs.bundles.junit5
-  testRuntimeOnly libs.bundles.junit.platform
-  testRuntimeOnly libs.mokito.core
 }

gradle/java_no_deps.gradle

@@ -13,7 +13,9 @@ apply plugin: 'dd-trace-java.test-jvm-constraints'
 apply plugin: 'dd-trace-java.conventions.forbidden-apis'
 apply plugin: 'dd-trace-java.conventions.spotbugs'
 
-apply from: "$rootDir/gradle/codenarc.gradle"
+pluginManager.withPlugin('groovy') {
+  apply from: "$rootDir/gradle/codenarc.gradle"
+}
 apply from: "$rootDir/gradle/spotless.gradle"
 apply from: "$rootDir/gradle/repositories.gradle"
 apply from: "$rootDir/gradle/test-suites.gradle"

gradle/java_test_deps.gradle

@@ -0,0 +1,9 @@
+dependencies {
+  testImplementation platform(libs.junit.bom)
+  testImplementation libs.tabletest
+  testImplementation libs.bundles.test.logging
+
+  testRuntimeOnly libs.bundles.junit5
+  testRuntimeOnly libs.bundles.junit.platform
+  testRuntimeOnly libs.mokito.core
+}

internal-api/build.gradle.kts

@@ -289,7 +289,6 @@ dependencies {
   testImplementation(project(":utils:test-utils"))
   testImplementation(libs.bundles.junit5)
   testImplementation(libs.assertj.core)
-  testImplementation("org.junit.vintage:junit-vintage-engine:${libs.versions.junit5.get()}")
   testImplementation(libs.commons.math)
   testImplementation(libs.bundles.mockito)
   testImplementation(libs.jol.core)

internal-api/gradle.lockfile

@@ -6,27 +6,21 @@ ch.qos.logback:logback-classic:1.2.13=jmhRuntimeClasspath,testCompileClasspath,t
 ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:dd-instrument-java:0.0.6=jmhRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.6=codenarc
 com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs
 com.github.spotbugs:spotbugs:4.10.4=spotbugs
 com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
 com.google.code.findbugs:jsr305:3.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
 com.google.code.gson:gson:2.14.0=spotbugs
 com.google.errorprone:error_prone_annotations:2.48.0=spotbugs
-com.thoughtworks.qdox:qdox:1.12.1=codenarc
 commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=spotbugs
 de.thetaphi:forbiddenapis:3.11=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.leangen.geantyref:geantyref:1.3.16=jmhRuntimeClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
-junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy-agent:1.18.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 net.sf.saxon:Saxon-HE:12.10=spotbugs
-org.apache.ant:ant-antlr:1.10.14=codenarc
-org.apache.ant:ant-junit:1.10.14=codenarc
 org.apache.bcel:bcel:6.12.0=spotbugs
 org.apache.commons:commons-lang3:3.20.0=spotbugs
 org.apache.commons:commons-math3:3.2=testCompileClasspath,testRuntimeClasspath
@@ -36,20 +30,7 @@ org.apache.logging.log4j:log4j-api:2.26.1=spotbugs
 org.apache.logging.log4j:log4j-core:2.26.1=spotbugs
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
 org.assertj:assertj-core:3.27.7=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:3.0.23=codenarc
-org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
-org.codehaus.groovy:groovy-json:3.0.23=codenarc
-org.codehaus.groovy:groovy-json:3.0.25=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:3.0.23=codenarc
-org.codehaus.groovy:groovy-xml:3.0.23=codenarc
-org.codehaus.groovy:groovy:3.0.23=codenarc
-org.codehaus.groovy:groovy:3.0.25=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codenarc:CodeNarc:3.7.0=codenarc
 org.dom4j:dom4j:2.2.0=spotbugs
-org.gmetrics:GMetrics:2.1.0=codenarc
-org.hamcrest:hamcrest-core:1.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jacoco:org.jacoco.agent:0.8.15=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.15=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.15=jacocoAnt
@@ -59,13 +40,12 @@ org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testRuntimeCla
 org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
-org.junit.vintage:junit-vintage-engine:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.objenesis:objenesis:3.2=jmhRuntimeClasspath,testRuntimeClasspath
 org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 org.openjdk.jmh:jmh-generator-asm:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 org.openjdk.jmh:jmh-generator-bytecode:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
@@ -87,8 +67,6 @@ org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
 org.snakeyaml:snakeyaml-engine:2.9=jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-org.spockframework:spock-bom:2.4-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.tabletest:tabletest-junit:1.2.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.tabletest:tabletest-parser:1.2.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs

internal-api/internal-api-9/build.gradle.kts

@@ -24,12 +24,10 @@ tasks.withType<Javadoc>().configureEach {
   javadocTool = javaToolchains.javadocToolFor(java.toolchain)
 }
 
-listOf(JavaCompile::class.java, GroovyCompile::class.java).forEach { compileTaskType ->
-  tasks.withType(compileTaskType).configureEach {
-    // These implementations are selected only on Java 9+, so they can target Java 9 and restore
-    // --release after confirming no project output must be loaded during Java 8 discovery.
-    configureCompiler(JavaVersion.VERSION_1_8, "Uses Java 9+ APIs (StackWalker, ProcessHandle, Module) at Java 8 bytecode")
-  }
+tasks.withType<JavaCompile>().configureEach {
+  // These implementations are selected only on Java 9+, so they can target Java 9 and restore
+  // --release after confirming no project output must be loaded during Java 8 discovery.
+  configureCompiler(JavaVersion.VERSION_1_8, "Uses Java 9+ APIs (StackWalker, ProcessHandle, Module) at Java 8 bytecode")
 }
 
 extra["minimumBranchCoverage"] = 0.8

internal-api/internal-api-9/gradle.lockfile

@@ -13,7 +13,6 @@ com.datadoghq:dd-instrument-java:0.0.6=jmhRuntimeClasspath,runtimeClasspath,test
 com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,testRuntimeClasspath
 com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.6=codenarc
 com.github.jnr:jffi:1.3.15=jmhRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-a64asm:1.0.0=jmhRuntimeClasspath,testRuntimeClasspath
 com.github.jnr:jnr-constants:0.10.4=jmhRuntimeClasspath,testRuntimeClasspath
@@ -38,12 +37,10 @@ com.squareup.moshi:moshi:1.11.0=jmhRuntimeClasspath,testCompileClasspath,testRun
 com.squareup.okhttp3:logging-interceptor:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.squareup.okhttp3:okhttp:3.12.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.squareup.okio:okio:1.17.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=codenarc
 commons-fileupload:commons-fileupload:1.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.21.0=spotbugs
 de.thetaphi:forbiddenapis:3.11=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-io.leangen.geantyref:geantyref:1.3.16=jmhRuntimeClasspath,testRuntimeClasspath
 io.sqreen:libsqreen:17.6.0=jmhRuntimeClasspath,testRuntimeClasspath
 javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
@@ -54,29 +51,15 @@ net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
 net.java.dev.jna:jna:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
 net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 net.sf.saxon:Saxon-HE:12.10=spotbugs
-org.apache.ant:ant-antlr:1.10.14=codenarc
-org.apache.ant:ant-junit:1.10.14=codenarc
 org.apache.bcel:bcel:6.12.0=spotbugs
 org.apache.commons:commons-lang3:3.20.0=spotbugs
 org.apache.commons:commons-math3:3.6.1=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 org.apache.commons:commons-text:1.15.0=spotbugs
 org.apache.logging.log4j:log4j-api:2.26.1=spotbugs
 org.apache.logging.log4j:log4j-core:2.26.1=spotbugs
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.codehaus.groovy:groovy-ant:3.0.23=codenarc
-org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
-org.codehaus.groovy:groovy-json:3.0.23=codenarc
-org.codehaus.groovy:groovy-json:3.0.25=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:3.0.23=codenarc
-org.codehaus.groovy:groovy-xml:3.0.23=codenarc
-org.codehaus.groovy:groovy:3.0.23=codenarc
-org.codehaus.groovy:groovy:3.0.25=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.codenarc:CodeNarc:3.7.0=codenarc
 org.dom4j:dom4j:2.2.0=spotbugs
-org.gmetrics:GMetrics:2.1.0=codenarc
 org.hamcrest:hamcrest-core:1.3=jmhRuntimeClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jacoco:org.jacoco.agent:0.8.15=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.15=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.15=jacocoAnt
@@ -89,14 +72,14 @@ org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testRuntimeCla
 org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.objenesis:objenesis:3.2=jmhRuntimeClasspath,testRuntimeClasspath
 org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 org.openjdk.jmh:jmh-generator-asm:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 org.openjdk.jmh:jmh-generator-bytecode:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
@@ -121,8 +104,6 @@ org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
 org.snakeyaml:snakeyaml-engine:2.9=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-bom:2.4-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.tabletest:tabletest-junit:1.2.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.tabletest:tabletest-parser:1.2.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs

internal-api/src/test/java/datadog/trace/api/TagMapEntryTest.java

@@ -1,9 +1,9 @@
 package datadog.trace.api;
 
-import static org.junit.Assert.assertSame;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import datadog.trace.api.TagMap.Entry;

products/metrics/metrics-api/gradle.lockfile

@@ -14,7 +14,6 @@ com.google.errorprone:error_prone_annotations:2.48.0=spotbugs
 com.thoughtworks.qdox:qdox:1.12.1=codenarc
 commons-io:commons-io:2.21.0=spotbugs
 de.thetaphi:forbiddenapis:3.11=compileClasspath,jmhCompileClasspath
-io.leangen.geantyref:geantyref:1.3.16=jmhRuntimeClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.6=spotbugs
 net.bytebuddy:byte-buddy-agent:1.18.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.18.12=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -33,15 +32,12 @@ org.codehaus.groovy:groovy-ant:3.0.23=codenarc
 org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
 org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
 org.codehaus.groovy:groovy-json:3.0.23=codenarc
-org.codehaus.groovy:groovy-json:3.0.25=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codehaus.groovy:groovy-templates:3.0.23=codenarc
 org.codehaus.groovy:groovy-xml:3.0.23=codenarc
 org.codehaus.groovy:groovy:3.0.23=codenarc
-org.codehaus.groovy:groovy:3.0.25=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.codenarc:CodeNarc:3.7.0=codenarc
 org.dom4j:dom4j:2.2.0=spotbugs
 org.gmetrics:GMetrics:2.1.0=codenarc
-org.hamcrest:hamcrest:3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.jacoco:org.jacoco.agent:0.8.15=jacocoAgent,jacocoAnt
 org.jacoco:org.jacoco.ant:0.8.15=jacocoAnt
 org.jacoco:org.jacoco.core:0.8.15=jacocoAnt
@@ -51,12 +47,12 @@ org.junit.jupiter:junit-jupiter-engine:5.14.1=jmhRuntimeClasspath,testRuntimeCla
 org.junit.jupiter:junit-jupiter-params:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.objenesis:objenesis:3.2=jmhRuntimeClasspath,testRuntimeClasspath
 org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 org.openjdk.jmh:jmh-generator-asm:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
 org.openjdk.jmh:jmh-generator-bytecode:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath
@@ -77,8 +73,6 @@ org.slf4j:slf4j-api:1.7.32=jmhRuntimeClasspath,testCompileClasspath,testRuntimeC
 org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j
 org.slf4j:slf4j-api:2.0.18=spotbugs
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-groovy-3.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.tabletest:tabletest-junit:1.2.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.tabletest:tabletest-parser:1.2.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.xmlresolver:xmlresolver:5.3.3=spotbugs