Skip to content

Commit c313a05

Browse files
cwperkstandonks
authored andcommitted
Switch ingest-geoip and lang-painless modules to use the gradle version catalog (opensearch-project#18316)
* Switch ingest-geoip and lang-painless modules to use the gradle version catalog Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add to CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove CHANGELOG entry Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent 1b27ae9 commit c313a05

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

gradle/libs.versions.toml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,17 @@ arrow = "18.1.0"
9393
flatbuffers = "2.0.0"
9494

9595
[libraries]
96+
antlr4-runtime = { group = "org.antlr", name = "antlr4-runtime", version.ref = "antlr4" }
97+
asm-analysis = { group = "org.ow2.asm", name = "asm-analysis", version.ref = "asm" }
98+
asm-commons = { group = "org.ow2.asm", name = "asm-commons", version.ref = "asm" }
99+
asm-core = { group = "org.ow2.asm", name = "asm", version.ref = "asm" }
100+
asm-tree = { group = "org.ow2.asm", name = "asm-tree", version.ref = "asm" }
101+
asm-util = { group = "org.ow2.asm", name = "asm-util", version.ref = "asm" }
96102
hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrest" }
97103
hdrhistogram = { group = "org.hdrhistogram", name = "HdrHistogram", version.ref = "hdrhistogram" }
104+
jackson-annotation = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jackson" }
105+
jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jackson_databind" }
106+
jackson-datatype-jsr310 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jsr310", version.ref = "jackson" }
98107
jakartaannotation = { group = "jakarta.annotation", name = "jakarta.annotation-api", version.ref = "jakarta_annotation" }
99108
jodatime = { group = "joda-time", name = "joda-time", version.ref = "joda" }
100109
jna = { group = "net.java.dev.jna", name = "jna", version.ref = "jna" }
@@ -142,6 +151,13 @@ spatial4j = { group = "org.locationtech.spatial4j", name = "spatial4j", version.
142151
tdigest = { group = "com.tdunning", name = "t-digest", version.ref = "tdigest" }
143152

144153
[bundles]
154+
asm = [
155+
"asm-analysis",
156+
"asm-commons",
157+
"asm-core",
158+
"asm-tree",
159+
"asm-util"
160+
]
145161
lucene = [
146162
"lucene-core",
147163
"lucene-analysis-common",

modules/ingest-geoip/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ dependencies {
4242
api('com.maxmind.geoip2:geoip2:4.3.0')
4343
// geoip2 dependencies:
4444
api('com.maxmind.db:maxmind-db:3.1.1')
45-
api("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
46-
api("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
47-
api("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson}")
45+
api(libs.jackson.annotation)
46+
api(libs.jackson.databind)
47+
api(libs.jackson.datatype.jsr310)
4848

4949
testImplementation 'org.elasticsearch:geolite2-databases:20191119'
5050
}

modules/lang-painless/build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,8 @@ testClusters.all {
5454
}
5555

5656
dependencies {
57-
api "org.antlr:antlr4-runtime:${versions.antlr4}"
58-
api "org.ow2.asm:asm-util:${versions.asm}"
59-
api "org.ow2.asm:asm-tree:${versions.asm}"
60-
api "org.ow2.asm:asm-commons:${versions.asm}"
61-
api "org.ow2.asm:asm-analysis:${versions.asm}"
62-
api "org.ow2.asm:asm:${versions.asm}"
57+
api(libs.antlr4.runtime)
58+
api(libs.bundles.asm)
6359
api project('spi')
6460
}
6561

0 commit comments

Comments
 (0)