Skip to content

Commit f3cad24

Browse files
authored
[Gradle] Cleanup build libs vesion catalogue and its usage (elastic#110298)
* [Gradle] Cleanup build libs vesion catalogue and its usage * Snake yaml version in version.properties still used
1 parent 6accd6e commit f3cad24

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build-tools-internal/build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,7 @@ dependencies {
274274
// ensuring brought asm version brought in by spock is up-to-date
275275
testImplementation buildLibs.asm
276276
integTestImplementation buildLibs.asm
277-
integTestImplementation('org.ow2.asm:asm:9.6')
278-
api("org.yaml:snakeyaml") {
279-
version { strictly(versions.snakeyaml) }
280-
}
277+
api(buildLibs.snakeyaml)
281278
}
282279
// Forcefully downgrade the jackson platform as used in production
283280
api enforcedPlatform(buildLibs.jackson.platform)
@@ -314,7 +311,7 @@ dependencies {
314311
compileOnly buildLibs.checkstyle
315312
compileOnly buildLibs.reflections
316313

317-
implementation 'com.github.javaparser:javaparser-core:3.18.0'
314+
implementation buildLibs.javaparser
318315

319316
runtimeOnly "org.elasticsearch.gradle:reaper:$version"
320317
testImplementation buildLibs.checkstyle

gradle/build.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ hamcrest = "org.hamcrest:hamcrest:2.1"
2222
httpcore = "org.apache.httpcomponents:httpcore:4.4.12"
2323
httpclient = "org.apache.httpcomponents:httpclient:4.5.14"
2424
idea-ext = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.1.4"
25+
javaparser = "com.github.javaparser:javaparser-core:3.18.0"
2526
json-schema-validator = "com.networknt:json-schema-validator:1.0.72"
2627
json-assert = "org.skyscreamer:jsonassert:1.5.0"
2728
jackson-core = { group = "com.fasterxml.jackson.core", name="jackson-core", version.ref="jackson" }
@@ -39,6 +40,7 @@ mockito-core = "org.mockito:mockito-core:1.9.5"
3940
nebula-info = "com.netflix.nebula:gradle-info-plugin:11.3.3"
4041
reflections = "org.reflections:reflections:0.9.12"
4142
shadow-plugin = "com.github.breskeby:shadow:3b035f2"
43+
snakeyaml = { group = "org.yaml", name = "snakeyaml", version = { strictly = "2.0" } }
4244
spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
4345
spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }
4446
spock-platform = { group = "org.spockframework", name="spock-bom", version.ref="spock" }

0 commit comments

Comments
 (0)