Skip to content

Commit 0db78b3

Browse files
committed
[Java] Tidy up dependency declarations.
1 parent 88b5e8c commit 0db78b3

File tree

2 files changed

+28
-13
lines changed

2 files changed

+28
-13
lines changed

build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ allprojects {
150150
resolutionStrategy {
151151
failOnVersionConflict()
152152
// patching conflicting Checkstyle dependencies
153-
force "org.codehaus.plexus:plexus-utils:3.3.0",
154-
"org.apache.commons:commons-lang3:3.8.1",
155-
"org.apache.httpcomponents:httpcore:4.4.14",
156-
"commons-codec:commons-codec:1.15"
153+
force libs.commons.codec,
154+
libs.commons.lang3,
155+
libs.httpcore,
156+
libs.plexus.utils
157157
}
158158
}
159159

@@ -284,7 +284,7 @@ project(':sbe-tool') {
284284
implementation files("${layout.buildDirectory.get()}/classes/java/generated")
285285
implementation libs.hamcrest
286286
implementation libs.mockito
287-
implementation platform("org.junit:junit-bom:${libs.versions.junit.get()}")
287+
implementation platform(libs.junit.bom)
288288
implementation "org.junit.jupiter:junit-jupiter-params"
289289
}
290290
}

gradle/libs.versions.toml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,34 @@
11
[versions]
22
agrona = "2.0.1"
33
checkstyle = "10.21.1"
4-
junit = "5.11.4"
5-
jmh = "1.37"
4+
commons-codec = "1.15"
5+
commons-lang3 = "3.8.1"
66
gradle = "8.11.1"
7+
hamcrest = "3.0"
8+
httpcore = "4.4.14"
9+
jqwik = "1.9.2"
10+
jmh = "1.37"
11+
json = "20250107"
12+
junit = "5.11.4"
13+
mockito = "5.15.2"
14+
plexus = "3.3.0"
15+
shadow = "8.3.5"
16+
versions = "0.51.0"
717

818
[libraries]
919
agrona = { group = "org.agrona", name = "agrona", version.ref = "agrona" }
10-
mockito = { group = "org.mockito", name = "mockito-core", version = "5.15.2" }
11-
hamcrest = { group = "org.hamcrest", name = "hamcrest", version = "3.0" }
12-
jqwik = { group = "net.jqwik", name = "jqwik", version = "1.9.2" }
13-
json = { group = "org.json", name = "json", version = "20250107" }
20+
commons-codec = { group = "commons-codec", name = "commons-codec", version.ref = "commons-codec" }
21+
commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commons-lang3" }
22+
hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
23+
httpcore = { group = "org.apache.httpcomponents", name = "httpcore", version.ref = "httpcore" }
24+
jqwik = { group = "net.jqwik", name = "jqwik", version.ref = "jqwik" }
25+
json = { group = "org.json", name = "json", version.ref = "json" }
1426
jmh-core = { group = "org.openjdk.jmh", name = "jmh-core", version.ref = "jmh" }
1527
jmh-generator-annprocess = { group = "org.openjdk.jmh", name = "jmh-generator-annprocess", version.ref = "jmh" }
28+
junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
29+
mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
30+
plexus-utils = { group = "org.codehaus.plexus", name = "plexus-utils", version.ref = "plexus" }
1631

1732
[plugins]
18-
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }
19-
shadow = { id = "com.gradleup.shadow", version = "8.3.5" }
33+
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
34+
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

0 commit comments

Comments
 (0)