Skip to content

Minor refactoring of build scripts to use asm version from versions catalog. #9688

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
AlexeyKuznetsov-DD merged 1 commit into from
Oct 7, 2025
Merged

Minor refactoring of build scripts to use asm version from versions catalog. #9688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ dependencies {
implementation("com.github.zafarkhaja:java-semver:0.10.2")

implementation("com.google.guava", "guava", "20.0")
implementation("org.ow2.asm", "asm", "9.9")
implementation("org.ow2.asm", "asm-tree", "9.9")
implementation(libs.asm)
implementation(libs.asm.tree)

implementation(platform("com.fasterxml.jackson:jackson-bom:2.17.2"))
implementation("com.fasterxml.jackson.core:jackson-databind")
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/call-site-instrumentation-plugin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ dependencies {
compileOnly("com.google.code.findbugs", "jsr305", "3.0.2")

implementation("org.freemarker", "freemarker", "2.3.30")
implementation("org.ow2.asm", "asm", "9.9")
implementation("org.ow2.asm", "asm-tree", "9.9")
implementation(libs.asm)
implementation(libs.asm.tree)
Comment on lines +35 to +36
Copy link
Copy Markdown
Contributor

@bric3 bric3 Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: Possibly this can be replaced by a bundle instead.

implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")

testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")
Expand Down
8 changes: 5 additions & 3 deletions dd-java-agent/agent-debugger/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ dependencies {
implementation libs.dogstatsd
implementation libs.moshi

testImplementation libs.asm.util
testImplementation libs.bundles.junit5
testImplementation group: 'org.ow2.asm', name: 'asm-util', version: libs.versions.asm.get()
testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: libs.versions.junit5.get()
testImplementation project(':dd-java-agent:agent-debugger:debugger-test-scala')
testImplementation libs.junit.jupiter.params
testImplementation libs.bundles.mockito
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
testImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '2.3.5.RELEASE'
Expand All @@ -56,10 +55,13 @@ dependencies {
testImplementation group: 'org.jooq', name: 'joor-java-8', version: '0.9.13'
testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-compiler-embeddable', version: "2.1.21"
testImplementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: "1.0.0"

testImplementation project(':dd-java-agent:agent-debugger:debugger-test-scala')
testImplementation project(':dd-trace-core')
testImplementation project(':dd-java-agent:agent-builder')
testImplementation project(':remote-config:remote-config-core')
testImplementation project(':utils:test-utils')

testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: libs.versions.scala213.get()
testRuntimeOnly group: 'antlr', name: 'antlr', version: '2.7.7'
}
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ autoservice-annotation = { module = "com.google.auto.service:auto-service-annota
commons-math = { module = "org.apache.commons:commons-math3", version.ref = "commons" }
ddprof = { module = "com.datadoghq:ddprof", version.ref = "ddprof" }
asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
asm-tree = { module = "org.ow2.asm:asm-tree", version.ref = "asm" }
asm-util = { module = "org.ow2.asm:asm-util", version.ref = "asm" }
asmcommons = { module = "org.ow2.asm:asm-commons", version.ref = "asm" }
dogstatsd = { module = "com.datadoghq:java-dogstatsd-client", version.ref = "dogstatsd" }
jnr-unixsocket = { module = "com.github.jnr:jnr-unixsocket", version.ref = "jnr-unixsocket"}
Expand Down