Skip to content

Remove Groovy from internal-api modules #13152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 6 commits into from
Nov 5, 2026
Merged

Remove Groovy from internal-api modules #13152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8b0b35
Remove Groovy from internal-api modules
AlexeyKuznetsov-DD Nov 1, 2026
973fb78
Make Java-only conventions the default
AlexeyKuznetsov-DD Nov 2, 2026
967edc3
Use TableTest for ThreadUtils tests
AlexeyKuznetsov-DD Nov 2, 2026
14f88ce
Fixed review comments.
AlexeyKuznetsov-DD Nov 4, 2026
8535cf3
Applied PR review.
AlexeyKuznetsov-DD Nov 5, 2026
230fa38
Merge branch 'master' into alexeyk/internal-api-remove-groovy
AlexeyKuznetsov-DD Nov 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions buildSrc/src/main/kotlin/dd-trace-java.conventions.java.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
plugins {
id("dd-trace-java.dependency-locking")
// Expose Java accessors while the convention still delegates to script plugins.
java
}

apply(from = rootDir.resolve("gradle/java_deps.gradle"))
apply(from = rootDir.resolve("gradle/java_no_deps.gradle"))

val libs = versionCatalogs.named("libs")
dependencies {
testImplementation(platform(libs.findLibrary("junit-bom").get()))
testImplementation(libs.findLibrary("tabletest").get())
testImplementation(libs.findBundle("test-logging").get())

testRuntimeOnly(libs.findBundle("junit5").get())
testRuntimeOnly(libs.findBundle("junit-platform").get())
testRuntimeOnly(libs.findLibrary("mokito-core").get())
}
15 changes: 15 additions & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.conventions.testing.groovy.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* Adds Groovy/Spock test support and CodeNarc. Apply alongside `dd-trace-java.conventions.java`,
* which provides the GroovyCompile configuration for projects with the `groovy` plugin.
*/
plugins {
groovy
}

apply(from = rootDir.resolve("gradle/codenarc.gradle"))

val libs = versionCatalogs.named("libs")
dependencies {
testImplementation(libs.findBundle("spock").get())
testImplementation(libs.findBundle("groovy").get())
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.annotation-processor.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.bootstrap-component.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.distributable.api.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}

apply(from = rootDir.resolve("gradle/publish.gradle"))
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.instrumentation.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import datadog.gradle.plugin.instrument.BuildTimeInstrumentationExtension

plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
id("dd-trace-java.conventions.forbidden-apis")
}

Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.internal-library.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.platform-component.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.product-library.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.product-subsystem.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.smoke-test.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/dd-trace-java.module.testing-support.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id("dd-trace-java.conventions.java")
id("dd-trace-java.conventions.testing.groovy")
}
1 change: 1 addition & 0 deletions dd-java-agent/benchmark-integration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'dd-trace-java.conventions.java'
id 'dd-trace-java.conventions.testing.groovy'
}

description = 'Integration Level Agent benchmarks.'
1 change: 1 addition & 0 deletions dd-java-agent/benchmark-integration/jetty-perftest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'com.gradleup.shadow'
id 'dd-trace-java.conventions.java'
id 'dd-trace-java.conventions.testing.groovy'
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/benchmark-integration/play-perftest/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'com.gradleup.shadow'
id 'dd-trace-java.conventions.java'
id 'dd-trace-java.conventions.testing.groovy'
id 'org.gradle.playframework'
}

Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/benchmark/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'dd-trace-java.jmh-conventions'
id 'dd-trace-java.conventions.java'
id 'dd-trace-java.conventions.testing.groovy'
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import java.util.jar.JarFile
plugins {
id 'com.gradleup.shadow'
id 'dd-trace-java.conventions.java'
id 'dd-trace-java.conventions.testing.groovy'
}

description = 'dd-java-agent'
Expand Down
4 changes: 2 additions & 2 deletions ...va/datadog/trace/instrumentation/akkahttp/appsec/UnmarshallerHelpersBlockFailureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
/**
* Covers the {@code UnmarshallerHelpers.tryBlock() -> AppSecContext.reportBlockFailure()} path.
* Hand-written test doubles are used because Mockito is only on this module's test runtime
* classpath, not its test compile classpath (see {@code gradle/java_deps.gradle}: {@code
* testRuntimeOnly libs.mokito.core}).
* classpath, not its test compile classpath (see the {@code dd-trace-java.conventions.java}
* convention's {@code testRuntimeOnly} dependency on {@code mokito-core}).
*/
class UnmarshallerHelpersBlockFailureTest {

Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-stubs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id 'dd-trace-java.conventions.java'
id 'dd-trace-java.conventions.testing.groovy'
}
1 change: 1 addition & 0 deletions dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-stubs/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'dd-trace-java.conventions.java'
id 'dd-trace-java.conventions.testing.groovy'
}

dependencies {
Expand Down
1 change: 1 addition & 0 deletions dd-java-agent/load-generator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id 'dd-trace-java.conventions.java'
id 'dd-trace-java.conventions.testing.groovy'
}

dependencies {
Expand Down
15 changes: 0 additions & 15 deletions gradle/java_deps.gradle
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion gradle/java_no_deps.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ 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"
apply from: "$rootDir/gradle/spotless.gradle"
apply from: "$rootDir/gradle/repositories.gradle"
apply from: "$rootDir/gradle/test-suites.gradle"
Expand Down
2 changes: 1 addition & 1 deletion gradle/spotless.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ boolean forbidLegacyScriptApplies = project.rootProject.name == 'dd-trace-java'
def legacyScriptApplyLinePattern = ~/^\s*(?:\w+\.)?apply(?:\s+from\s*:|\s*\(\s*from\s*=).*/
// Script plugins that must be replaced by their corresponding convention plugins.
def forbiddenScriptApplies = [
'gradle/java.gradle' : 'Apply the \'dd-trace-java.conventions.java\' convention plugin instead of applying the script plugin \'gradle/java.gradle\' directly.',
'gradle/java.gradle' : 'Apply the \'dd-trace-java.conventions.java\' and \'dd-trace-java.conventions.testing.groovy\' convention plugins instead of applying the script plugin \'gradle/java.gradle\' directly.',
'gradle/publish.gradle': 'Apply the \'dd-trace-java.module.distributable.*\' convention plugin instead of applying the script plugin \'gradle/publish.gradle\' directly.',
]
def forbidLegacyScriptApplyStep = { String text ->
Expand Down
1 change: 0 additions & 1 deletion internal-api/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
26 changes: 2 additions & 24 deletions internal-api/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 4 additions & 6 deletions internal-api/internal-api-9/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
23 changes: 2 additions & 21 deletions internal-api/internal-api-9/gradle.lockfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal-api/src/test/java/datadog/trace/api/TagMapEntryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading
Loading