Skip to content

Commit cb08639

Browse files
PerfectSlayerPerfectSlayer
committed
feat(build): Move to lib catalog
1 parent 2ebe47b commit cb08639

File tree

104 files changed

+260
-366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+260
-366
lines changed

‎communication/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
testImplementation libs.bytebuddy
2121
testImplementation group: 'org.msgpack', name: 'msgpack-core', version: '0.8.20'
2222
testImplementation group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.8.20'
23-
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy
23+
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
2424
}
2525

2626
ext {

‎dd-java-agent/agent-crashtracking/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ tasks.withType(Test).configureEach { subTask ->
1212
}
1313

1414
dependencies {
15-
implementation deps.slf4j
15+
implementation libs.slf4j
1616
implementation project(':communication')
1717
implementation project(':internal-api')
1818
implementation project(':utils:container-utils')
1919
implementation project(':utils:version-utils')
2020

21-
implementation deps.okhttp
22-
implementation group: 'com.squareup.moshi', name: 'moshi', version: versions.moshi
21+
implementation libs.okhttp
22+
implementation libs.moshi
2323

24-
testImplementation deps.junit5
25-
testImplementation deps.mockito
26-
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
27-
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
24+
testImplementation libs.bundles.junit5
25+
testImplementation libs.bundles.mockito
26+
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
27+
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
2828
}
2929

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

+12-13
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,27 @@ excludedClassesCoverage += [
2727
dependencies {
2828
// main dependencies
2929
implementation project(':utils:container-utils')
30-
implementation deps.slf4j
31-
implementation deps.asm
32-
implementation deps.asmcommons
30+
implementation libs.slf4j
31+
implementation libs.bundles.asm
3332
implementation project(':internal-api')
3433
implementation project(':communication')
3534
compileOnly project(':dd-java-agent:agent-tooling')
3635
compileOnly project(':dd-java-agent:agent-builder')
3736
compileOnly project(':dd-trace-core')
3837
implementation project(':dd-java-agent:agent-debugger:debugger-el')
3938
implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
40-
implementation deps.okhttp
41-
implementation deps.dogstatsd
42-
implementation deps.moshi
39+
implementation libs.okhttp
40+
implementation libs.dogstatsd
41+
implementation libs.moshi
4342

44-
testImplementation deps.junit5
45-
testImplementation group: 'org.ow2.asm', name: 'asm-util', version: versions.asm
46-
testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: "${versions.junit5}"
43+
testImplementation libs.bundles.junit5
44+
testImplementation group: 'org.ow2.asm', name: 'asm-util', version: libs.versions.asm.get()
45+
testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: libs.versions.junit5.get()
4746
testImplementation project(':dd-java-agent:agent-debugger:debugger-test-scala')
4847
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.7.0")
49-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit5}")
50-
testImplementation deps.mockito
51-
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
48+
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: libs.versions.junit5.get()
49+
testImplementation libs.bundles.mockito
50+
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
5251
testImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '2.3.5.RELEASE'
5352
testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.3.5.RELEASE'
5453
testImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.30'
@@ -57,7 +56,7 @@ dependencies {
5756
testImplementation project(':dd-trace-core')
5857
testImplementation project(':dd-java-agent:agent-builder')
5958
testImplementation project(':utils:test-utils')
60-
testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: versions.scala213
59+
testRuntimeOnly group: 'org.scala-lang', name: 'scala-compiler', version: libs.versions.scala213.get()
6160
testRuntimeOnly group: 'antlr', name: 'antlr', version: '2.7.7'
6261
}
6362

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ minimumInstructionCoverage = 0.0
99
minimumBranchCoverage = 0.0
1010

1111
dependencies {
12-
implementation deps.slf4j
12+
implementation libs.slf4j
1313
implementation project(':internal-api')
1414
}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ excludedClassesCoverage += [
1818
dependencies {
1919
implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
2020

21-
implementation deps.slf4j
22-
implementation deps.moshi
23-
testImplementation deps.junit5
21+
implementation libs.slf4j
22+
implementation libs.moshi
23+
testImplementation libs.bundles.junit5
2424
testImplementation("org.junit.jupiter:junit-jupiter-params:5.8.1")
25-
testImplementation deps.mockito
25+
testImplementation libs.bundles.mockito
2626
testImplementation project(':internal-api')
2727
}

‎dd-java-agent/agent-iast/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,18 @@ protobuf {
4242
}
4343

4444
dependencies {
45-
api deps.slf4j
45+
api libs.slf4j
4646

4747
compileOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
4848
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
4949

5050
implementation project(':internal-api')
5151
implementation project(':internal-api:internal-api-9')
52-
implementation group: 'com.squareup.moshi', name: 'moshi', version: versions.moshi
52+
implementation libs.moshi
5353

5454
testFixturesApi project(':dd-java-agent:testing')
5555
testFixturesApi project(':utils:test-utils')
56-
testImplementation deps.bytebuddy
56+
testImplementation libs.bytebuddy
5757
testImplementation('org.skyscreamer:jsonassert:1.5.1')
5858
testImplementation('org.codehaus.groovy:groovy-yaml:3.0.17')
5959

‎dd-java-agent/agent-jmxfetch/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
1919
exclude group: 'com.fasterxml.jackson.jr', module: 'jackson-jr-objects'
2020
}
21-
api deps.slf4j
21+
api libs.slf4j
2222
api project(':internal-api')
2323
}
2424

‎dd-java-agent/agent-logging/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ excludedClassesCoverage += [
1919

2020
dependencies {
2121
// This is fine since this project is shadowed into the agent-jar by dd-java-agent:agent-bootstrap
22-
api group: 'org.slf4j', name: 'slf4j-api', version: versions.slf4j
22+
api libs.slf4j
2323
api project(':internal-api')
2424
}

‎dd-java-agent/agent-otel/otel-tooling/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ configurations {
1212
}
1313

1414
dependencies {
15-
api deps.bytebuddy
16-
api deps.bytebuddyagent
15+
api libs.bytebuddy
16+
api libs.bytebuddyagent
1717

1818
compileOnly project(':dd-java-agent:agent-tooling')
1919
}

‎dd-java-agent/agent-profiling/build.gradle

+6-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ excludedClassesCoverage += [
1414
]
1515

1616
dependencies {
17-
api deps.slf4j
17+
api libs.slf4j
1818
api project(':internal-api')
1919

2020
implementation project(path: ':dd-java-agent:agent-profiling:profiling-ddprof', configuration: 'shadow')
@@ -26,8 +26,8 @@ dependencies {
2626
api project(':dd-java-agent:agent-profiling:profiling-controller-openjdk')
2727
api project(':dd-java-agent:agent-profiling:profiling-controller-oracle')
2828

29-
testImplementation deps.junit5
30-
testImplementation deps.mockito
29+
testImplementation libs.bundles.junit5
30+
testImplementation libs.bundles.mockito
3131
}
3232

3333
subprojects { Project subProj ->
@@ -38,8 +38,9 @@ subprojects { Project subProj ->
3838

3939
configurations {
4040
// exclude bootstrap dependencies from shadowJar
41-
runtime.exclude module: deps.slf4j
42-
runtime.exclude group: 'org.slf4j'
41+
runtime {
42+
exclude(group: 'org.slf4j', module: 'slf4j-api')
43+
}
4344
}
4445

4546
shadowJar {

‎dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ excludedClassesCoverage += [
2121
]
2222

2323
dependencies {
24-
api deps.slf4j
24+
api libs.slf4j
2525
api project(':internal-api')
2626
implementation project(path: ':dd-java-agent:agent-profiling:profiling-ddprof', configuration: 'shadow')
2727
api project(':dd-java-agent:agent-profiling:profiling-controller')
2828
api project(':dd-java-agent:agent-profiling:profiling-utils')
2929

30-
testImplementation deps.junit5
31-
testImplementation deps.mockito
30+
testImplementation libs.bundles.junit5
31+
testImplementation libs.bundles.mockito
3232
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
3333
testImplementation project(':dd-java-agent:agent-profiling')
3434
}

‎dd-java-agent/agent-profiling/profiling-controller-jfr/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ apply plugin: 'idea'
1616
dependencies {
1717
api project(':dd-java-agent:agent-profiling:profiling-controller')
1818

19-
implementation deps.jctools
20-
implementation deps.slf4j
19+
implementation libs.jctools
20+
implementation libs.slf4j
2121

22-
annotationProcessor deps.autoserviceProcessor
23-
compileOnly deps.autoserviceAnnotation
22+
annotationProcessor libs.autoservice.processor
23+
compileOnly libs.autoservice.annotation
2424

2525
testImplementation group: 'org.openjdk.jmc', name: 'flightrecorder.writer', version: '8.1.0'
26-
testImplementation deps.mockito
27-
testImplementation deps.junit5
26+
testImplementation libs.bundles.mockito
27+
testImplementation libs.bundles.junit5
2828
}
2929

3030
excludedClassesCoverage += ['com.datadog.profiling.controller.jfr.JdkTypeIDs']

‎dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ dependencies {
2626
api project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
2727
main_java11CompileOnly project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
2828

29-
implementation deps.slf4j
29+
implementation libs.slf4j
3030

31-
testImplementation deps.mockito
32-
testImplementation deps.junit5
31+
testImplementation libs.bundles.mockito
32+
testImplementation libs.bundles.junit5
3333
testImplementation sourceSets.main_java11.output
3434
}
3535

‎dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ apply from: "$rootDir/gradle/java.gradle"
1515
apply plugin: 'idea'
1616

1717
dependencies {
18-
api deps.slf4j
18+
api libs.slf4j
1919
api project(':internal-api')
2020
api(project(':dd-java-agent:agent-bootstrap')) {
2121
exclude group: 'com.datadoghq', module: 'agent-logging'
2222
}
2323
api project(':dd-java-agent:agent-profiling:profiling-controller')
2424
api project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
2525

26-
testImplementation deps.junit5
27-
testImplementation deps.mockito
26+
testImplementation libs.bundles.junit5
27+
testImplementation libs.bundles.mockito
2828
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
2929
testImplementation files(project(':dd-java-agent:agent-profiling:profiling-controller-jfr').sourceSets.test.output)
3030
testImplementation project(':dd-java-agent:agent-profiling')

‎dd-java-agent/agent-profiling/profiling-controller-oracle/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ minimumInstructionCoverage = 0.7
1717
excludedClassesCoverage += ['com.datadog.profiling.controller.oracle.JdkTypeIDs_8']
1818

1919
dependencies {
20-
api deps.slf4j
20+
api libs.slf4j
2121
api project(':internal-api')
2222
api project(':dd-java-agent:agent-profiling:profiling-controller')
2323
api project(':dd-java-agent:agent-profiling:profiling-controller-jfr')
2424

25-
testImplementation deps.junit5
26-
testImplementation deps.mockito
25+
testImplementation libs.bundles.junit5
26+
testImplementation libs.bundles.mockito
2727
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
2828
testImplementation files(project(':dd-java-agent:agent-profiling:profiling-controller-jfr').sourceSets.test.output)
2929
testImplementation project(':dd-java-agent:agent-profiling')

‎dd-java-agent/agent-profiling/profiling-controller/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ excludedClassesCoverage += [
1717
]
1818

1919
dependencies {
20-
api deps.slf4j
20+
api libs.slf4j
2121
api project(':internal-api')
2222
api project(':dd-java-agent:agent-profiling:profiling-utils')
2323

24-
testImplementation deps.junit5
25-
testImplementation deps.guava
26-
testImplementation deps.mockito
24+
testImplementation libs.bundles.junit5
25+
testImplementation libs.guava
26+
testImplementation libs.bundles.mockito
2727
testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.0.1'
2828
}
2929

‎dd-java-agent/agent-profiling/profiling-ddprof/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ excludedClassesCoverage += [
2929
dependencies {
3030
api project(':dd-java-agent:agent-profiling:profiling-controller')
3131
api project(':dd-java-agent:agent-profiling:profiling-utils')
32-
implementation project.hasProperty('ddprof.jar') ? files(project.getProperty('ddprof.jar')) : deps.ddprof
32+
implementation project.hasProperty('ddprof.jar') ? files(project.getProperty('ddprof.jar')) : libs.ddprof
3333

34-
annotationProcessor deps.autoserviceProcessor
35-
compileOnly deps.autoserviceAnnotation
34+
annotationProcessor libs.autoservice.processor
35+
compileOnly libs.autoservice.annotation
3636

37-
implementation deps.slf4j
37+
implementation libs.slf4j
3838

39-
testImplementation deps.jmc
40-
testImplementation deps.junit5
39+
testImplementation libs.bundles.jmc
40+
testImplementation libs.bundles.junit5
4141
}
4242

4343
shadowJar {

‎dd-java-agent/agent-profiling/profiling-testing/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ excludedClassesCoverage += [// These classes are using only for testing
44
'com.datadog.profiling.testing.*',]
55

66
dependencies {
7-
api deps.guava
8-
api deps.okhttp
7+
api libs.guava
8+
api libs.okhttp
99
api group: 'org.javadelight', name: 'delight-fileupload', version: '0.0.5'
1010
api group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
11-
api group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
11+
api group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
1212
}
1313

‎dd-java-agent/agent-profiling/profiling-uploader/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ excludedClassesCoverage += [
2020
]
2121

2222
dependencies {
23-
implementation deps.slf4j
23+
implementation libs.slf4j
2424
implementation project(':communication')
2525
implementation project(':internal-api')
2626
implementation project(':utils:socket-utils')
2727
implementation project(':utils:version-utils')
2828

2929
implementation project(':dd-java-agent:agent-profiling:profiling-controller')
3030

31-
implementation deps.okhttp
32-
implementation deps.lz4
31+
implementation libs.okhttp
32+
implementation libs.lz4
3333

34-
testImplementation deps.junit5
34+
testImplementation libs.bundles.junit5
3535
testImplementation project(':dd-java-agent:agent-profiling:profiling-testing')
36-
testImplementation deps.mockito
37-
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: versions.okhttp_legacy
36+
testImplementation libs.bundles.mockito
37+
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
3838

3939
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
4040
}

‎dd-java-agent/agent-profiling/profiling-utils/build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ excludedClassesCoverage += [// an enum with no additional functionality
1111

1212
dependencies {
1313
api project(':internal-api')
14-
implementation deps.slf4j
14+
implementation libs.slf4j
1515

16-
testImplementation deps.junit5
17-
testImplementation deps.mockito
16+
testImplementation libs.bundles.junit5
17+
testImplementation libs.bundles.mockito
1818
}
19-

‎dd-java-agent/agent-tooling/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,19 @@ dependencies {
4343
}
4444
compileOnly project(':dd-java-agent:agent-profiling')
4545
api group: 'com.blogspot.mydailyjava', name: 'weak-lock-free', version: '0.17'
46-
api deps.bytebuddy
47-
api deps.bytebuddyagent
46+
api libs.bytebuddy
47+
api libs.bytebuddyagent
4848
implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
4949
implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.8.0'
5050

5151
api project(':dd-trace-core')
5252

5353
implementation project(':dd-java-agent:agent-crashtracking')
5454

55-
compileOnly group: 'com.github.jnr', name: 'jnr-posix', version: "${versions.jnr_posix}"
55+
compileOnly group: 'com.github.jnr', name: 'jnr-posix', version: libs.versions.jnr.posix.get()
5656

5757
testImplementation project(':dd-java-agent:testing')
58-
testImplementation deps.bytebuddy
58+
testImplementation libs.bytebuddy
5959
testImplementation group: 'com.google.guava', name: 'guava-testlib', version: '20.0'
6060

6161
jmhImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.3.5.RELEASE'

0 commit comments

Comments
 (0)