feat(build): Move to lib catalog

DataDog · Jun 24, 2024 · cb08639 · cb08639
1 parent 2ebe47b
commit cb08639
Show file tree

Hide file tree

Showing 104 changed files with 260 additions and 366 deletions.
diff --git a/communication/build.gradle b/communication/build.gradle
@@ -20,7 +20,7 @@ dependencies {
   testImplementation libs.bytebuddy
   testImplementation group: 'org.msgpack', name: 'msgpack-core', version: '0.8.20'
   testImplementation group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.20'
-  testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy
+  testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
 }
 
 ext {

diff --git a/dd-java-agent/agent-crashtracking/build.gradle b/dd-java-agent/agent-crashtracking/build.gradle
@@ -12,18 +12,18 @@ tasks.withType(Test).configureEach { subTask ->
 }
 
 dependencies {
-  implementation deps.slf4j
+  implementation libs.slf4j
   implementation project(':communication')
   implementation project(':internal-api')
   implementation project(':utils:container-utils')
   implementation project(':utils:version-utils')
 
-  implementation deps.okhttp
-  implementation group: 'com.squareup.moshi', name: 'moshi', version: versions.moshi
+  implementation libs.okhttp
+  implementation libs.moshi
 
-  testImplementation deps.junit5
-  testImplementation deps.mockito
-  testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
-  testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
+  testImplementation libs.bundles.junit5
+  testImplementation libs.bundles.mockito
+  testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
+  testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
 }
 
diff --git a/dd-java-agent/agent-debugger/build.gradle b/dd-java-agent/agent-debugger/build.gradle
@@ -27,28 +27,27 @@ excludedClassesCoverage += [
 dependencies {
   // main dependencies
   implementation project(':utils:container-utils')
-  implementation deps.slf4j
-  implementation deps.asm
-  implementation deps.asmcommons
+  implementation libs.slf4j
+  implementation libs.bundles.asm
   implementation project(':internal-api')
   implementation project(':communication')
   compileOnly project(':dd-java-agent:agent-tooling')
   compileOnly project(':dd-java-agent:agent-builder')
   compileOnly project(':dd-trace-core')
   implementation project(':dd-java-agent:agent-debugger:debugger-el')
   implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
-  implementation deps.okhttp
-  implementation deps.dogstatsd
-  implementation deps.moshi
+  implementation libs.okhttp
+  implementation libs.dogstatsd
+  implementation libs.moshi
 
-  testImplementation deps.junit5
-  testImplementation group: 'org.ow2.asm', name: 'asm-util', version: versions.asm
-  testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: "${versions.junit5}"
+  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')
   testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.7.0")
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit5}")
-  testImplementation deps.mockito
-  testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
+  testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: libs.versions.junit5.get()
+  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'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.3.5.RELEASE'
   testImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.30'
@@ -57,7 +56,7 @@ dependencies {
   testImplementation project(':dd-trace-core')
   testImplementation project(':dd-java-agent:agent-builder')
   testImplementation project(':utils:test-utils')
-  testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: versions.scala213
+  testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: libs.versions.scala213.get()
   testRuntimeOnly group: 'antlr', name: 'antlr', version: '2.7.7'
 }
 

diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle b/dd-java-agent/agent-debugger/debugger-bootstrap/build.gradle
@@ -9,6 +9,6 @@ minimumInstructionCoverage = 0.0
 minimumBranchCoverage = 0.0
 
 dependencies {
-  implementation deps.slf4j
+  implementation libs.slf4j
   implementation project(':internal-api')
 }
diff --git a/dd-java-agent/agent-debugger/debugger-el/build.gradle b/dd-java-agent/agent-debugger/debugger-el/build.gradle
@@ -18,10 +18,10 @@ excludedClassesCoverage += [
 dependencies {
   implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
 
-  implementation deps.slf4j
-  implementation deps.moshi
-  testImplementation deps.junit5
+  implementation libs.slf4j
+  implementation libs.moshi
+  testImplementation libs.bundles.junit5
   testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.1")
-  testImplementation deps.mockito
+  testImplementation libs.bundles.mockito
   testImplementation project(':internal-api')
 }
diff --git a/dd-java-agent/agent-iast/build.gradle b/dd-java-agent/agent-iast/build.gradle
@@ -42,18 +42,18 @@ protobuf {
 }
 
 dependencies {
-  api deps.slf4j
+  api libs.slf4j
 
   compileOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
 
   implementation project(':internal-api')
   implementation project(':internal-api:internal-api-9')
-  implementation group: 'com.squareup.moshi', name: 'moshi', version: versions.moshi
+  implementation libs.moshi
 
   testFixturesApi project(':dd-java-agent:testing')
   testFixturesApi project(':utils:test-utils')
-  testImplementation deps.bytebuddy
+  testImplementation libs.bytebuddy
   testImplementation('org.skyscreamer:jsonassert:1.5.1')
   testImplementation('org.codehaus.groovy:groovy-yaml:3.0.17')
 

diff --git a/dd-java-agent/agent-jmxfetch/build.gradle b/dd-java-agent/agent-jmxfetch/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.fasterxml.jackson.jr', module: 'jackson-jr-objects'
   }
-  api deps.slf4j
+  api libs.slf4j
   api project(':internal-api')
 }
 

diff --git a/dd-java-agent/agent-logging/build.gradle b/dd-java-agent/agent-logging/build.gradle
@@ -19,6 +19,6 @@ excludedClassesCoverage += [
 
 dependencies {
   // This is fine since this project is shadowed into the agent-jar by dd-java-agent:agent-bootstrap
-  api group: 'org.slf4j', name: 'slf4j-api', version: versions.slf4j
+  api libs.slf4j
   api project(':internal-api')
 }
diff --git a/dd-java-agent/agent-otel/otel-tooling/build.gradle b/dd-java-agent/agent-otel/otel-tooling/build.gradle
@@ -12,8 +12,8 @@ configurations {
 }
 
 dependencies {
-  api deps.bytebuddy
-  api deps.bytebuddyagent
+  api libs.bytebuddy
+  api libs.bytebuddyagent
 
   compileOnly project(':dd-java-agent:agent-tooling')
 }
diff --git a/dd-java-agent/agent-profiling/build.gradle b/dd-java-agent/agent-profiling/build.gradle
@@ -14,7 +14,7 @@ excludedClassesCoverage += [
 ]
 
 dependencies {
-  api deps.slf4j
+  api libs.slf4j
   api project(':internal-api')
 
   implementation project(path: ':dd-java-agent:agent-profiling:profiling-ddprof', configuration: 'shadow')
@@ -26,8 +26,8 @@ dependencies {
   api project(':dd-java-agent:agent-profiling:profiling-controller-openjdk')
   api project(':dd-java-agent:agent-profiling:profiling-controller-oracle')
 
-  testImplementation deps.junit5
-  testImplementation deps.mockito
+  testImplementation libs.bundles.junit5
+  testImplementation libs.bundles.mockito
 }
 
 subprojects { Project subProj ->
@@ -38,8 +38,9 @@ subprojects { Project subProj ->
 
 configurations {
   // exclude bootstrap dependencies from shadowJar
-  runtime.exclude module: deps.slf4j
-  runtime.exclude group: 'org.slf4j'
+  runtime {
+    exclude(group: 'org.slf4j', module: 'slf4j-api')
+  }
 }
 
 shadowJar {

diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle
@@ -21,14 +21,14 @@ excludedClassesCoverage += [
 ]
 
 dependencies {
-  api deps.slf4j
+  api libs.slf4j
   api project(':internal-api')
   implementation project(path: ':dd-java-agent:agent-profiling:profiling-ddprof', configuration: 'shadow')
   api project(':dd-java-agent:agent-profiling:profiling-controller')
   api project(':dd-java-agent:agent-profiling:profiling-utils')
 
-  testImplementation deps.junit5
-  testImplementation deps.mockito
+  testImplementation libs.bundles.junit5
+  testImplementation libs.bundles.mockito
   testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
   testImplementation project(':dd-java-agent:agent-profiling')
 }

diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle
@@ -16,15 +16,15 @@ apply plugin: 'idea'
 dependencies {
   api project(':dd-java-agent:agent-profiling:profiling-controller')
 
-  implementation deps.jctools
-  implementation deps.slf4j
+  implementation libs.jctools
+  implementation libs.slf4j
 
-  annotationProcessor deps.autoserviceProcessor
-  compileOnly deps.autoserviceAnnotation
+  annotationProcessor libs.autoservice.processor
+  compileOnly libs.autoservice.annotation
 
   testImplementation group: 'org.openjdk.jmc', name: 'flightrecorder.writer', version: '8.1.0'
-  testImplementation deps.mockito
-  testImplementation deps.junit5
+  testImplementation libs.bundles.mockito
+  testImplementation libs.bundles.junit5
 }
 
 excludedClassesCoverage += ['com.datadog.profiling.controller.jfr.JdkTypeIDs']

diff --git a/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle
@@ -26,10 +26,10 @@ dependencies {
   api project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
   main_java11CompileOnly project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
 
-  implementation deps.slf4j
+  implementation libs.slf4j
 
-  testImplementation deps.mockito
-  testImplementation deps.junit5
+  testImplementation libs.bundles.mockito
+  testImplementation libs.bundles.junit5
   testImplementation sourceSets.main_java11.output
 }
 

diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle
@@ -15,16 +15,16 @@ apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'idea'
 
 dependencies {
-  api deps.slf4j
+  api libs.slf4j
   api project(':internal-api')
   api(project(':dd-java-agent:agent-bootstrap')) {
     exclude group: 'com.datadoghq', module: 'agent-logging'
   }
   api project(':dd-java-agent:agent-profiling:profiling-controller')
   api project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
 
-  testImplementation deps.junit5
-  testImplementation deps.mockito
+  testImplementation libs.bundles.junit5
+  testImplementation libs.bundles.mockito
   testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
   testImplementation files(project(':dd-java-agent:agent-profiling:profiling-controller-jfr').sourceSets.test.output)
   testImplementation project(':dd-java-agent:agent-profiling')

diff --git a/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle
@@ -17,13 +17,13 @@ minimumInstructionCoverage = 0.7
 excludedClassesCoverage += ['com.datadog.profiling.controller.oracle.JdkTypeIDs_8']
 
 dependencies {
-  api deps.slf4j
+  api libs.slf4j
   api project(':internal-api')
   api project(':dd-java-agent:agent-profiling:profiling-controller')
   api project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
 
-  testImplementation deps.junit5
-  testImplementation deps.mockito
+  testImplementation libs.bundles.junit5
+  testImplementation libs.bundles.mockito
   testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
   testImplementation files(project(':dd-java-agent:agent-profiling:profiling-controller-jfr').sourceSets.test.output)
   testImplementation project(':dd-java-agent:agent-profiling')

diff --git a/dd-java-agent/agent-profiling/profiling-controller/build.gradle b/dd-java-agent/agent-profiling/profiling-controller/build.gradle
@@ -17,13 +17,13 @@ excludedClassesCoverage += [
 ]
 
 dependencies {
-  api deps.slf4j
+  api libs.slf4j
   api project(':internal-api')
   api project(':dd-java-agent:agent-profiling:profiling-utils')
 
-  testImplementation deps.junit5
-  testImplementation deps.guava
-  testImplementation deps.mockito
+  testImplementation libs.bundles.junit5
+  testImplementation libs.guava
+  testImplementation libs.bundles.mockito
   testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.0.1'
 }
 
diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-ddprof/build.gradle
@@ -29,15 +29,15 @@ excludedClassesCoverage += [
 dependencies {
   api project(':dd-java-agent:agent-profiling:profiling-controller')
   api project(':dd-java-agent:agent-profiling:profiling-utils')
-  implementation project.hasProperty('ddprof.jar') ? files(project.getProperty('ddprof.jar')) : deps.ddprof
+  implementation project.hasProperty('ddprof.jar') ? files(project.getProperty('ddprof.jar')) : libs.ddprof
 
-  annotationProcessor deps.autoserviceProcessor
-  compileOnly deps.autoserviceAnnotation
+  annotationProcessor libs.autoservice.processor
+  compileOnly libs.autoservice.annotation
 
-  implementation deps.slf4j
+  implementation libs.slf4j
 
-  testImplementation deps.jmc
-  testImplementation deps.junit5
+  testImplementation libs.bundles.jmc
+  testImplementation libs.bundles.junit5
 }
 
 shadowJar {

diff --git a/dd-java-agent/agent-profiling/profiling-testing/build.gradle b/dd-java-agent/agent-profiling/profiling-testing/build.gradle
@@ -4,10 +4,10 @@ excludedClassesCoverage += [// These classes are using only for testing
   'com.datadog.profiling.testing.*',]
 
 dependencies {
-  api deps.guava
-  api deps.okhttp
+  api libs.guava
+  api libs.okhttp
   api group: 'org.javadelight', name: 'delight-fileupload', version: '0.0.5'
   api group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
-  api group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
+  api group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
 }
 
diff --git a/dd-java-agent/agent-profiling/profiling-uploader/build.gradle b/dd-java-agent/agent-profiling/profiling-uploader/build.gradle
@@ -20,21 +20,21 @@ excludedClassesCoverage += [
 ]
 
 dependencies {
-  implementation deps.slf4j
+  implementation libs.slf4j
   implementation project(':communication')
   implementation project(':internal-api')
   implementation project(':utils:socket-utils')
   implementation project(':utils:version-utils')
 
   implementation project(':dd-java-agent:agent-profiling:profiling-controller')
 
-  implementation deps.okhttp
-  implementation deps.lz4
+  implementation libs.okhttp
+  implementation libs.lz4
 
-  testImplementation deps.junit5
+  testImplementation libs.bundles.junit5
   testImplementation project(':dd-java-agent:agent-profiling:profiling-testing')
-  testImplementation deps.mockito
-  testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
+  testImplementation libs.bundles.mockito
+  testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
 
   testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
 }

diff --git a/dd-java-agent/agent-profiling/profiling-utils/build.gradle b/dd-java-agent/agent-profiling/profiling-utils/build.gradle
@@ -11,9 +11,8 @@ excludedClassesCoverage += [// an enum with no additional functionality
 
 dependencies {
   api project(':internal-api')
-  implementation deps.slf4j
+  implementation libs.slf4j
 
-  testImplementation deps.junit5
-  testImplementation deps.mockito
+  testImplementation libs.bundles.junit5
+  testImplementation libs.bundles.mockito
 }
-
diff --git a/dd-java-agent/agent-tooling/build.gradle b/dd-java-agent/agent-tooling/build.gradle
@@ -43,19 +43,19 @@ dependencies {
   }
   compileOnly project(':dd-java-agent:agent-profiling')
   api group: 'com.blogspot.mydailyjava', name: 'weak-lock-free', version: '0.17'
-  api deps.bytebuddy
-  api deps.bytebuddyagent
+  api libs.bytebuddy
+  api libs.bytebuddyagent
   implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
   implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0'
 
   api project(':dd-trace-core')
 
   implementation project(':dd-java-agent:agent-crashtracking')
 
-  compileOnly group: 'com.github.jnr', name: 'jnr-posix', version: "${versions.jnr_posix}"
+  compileOnly group: 'com.github.jnr', name: 'jnr-posix', version: libs.versions.jnr.posix.get()
 
   testImplementation project(':dd-java-agent:testing')
-  testImplementation deps.bytebuddy
+  testImplementation libs.bytebuddy
   testImplementation group: 'com.google.guava', name: 'guava-testlib', version: '20.0'
 
   jmhImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.3.5.RELEASE'