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

Author: AlexeyKuznetsov-DD

buildSrc/build.gradle.kts

@@ -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")

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -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)
   implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
 
   testImplementation("net.bytebuddy", "byte-buddy", "1.17.5")

dd-java-agent/agent-debugger/build.gradle

@@ -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'
@@ -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'
 }

gradle/libs.versions.toml

@@ -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"}