Skip to content

Commit

Permalink
Make entries for dependencies from server/build.gradle to gradle vers…
Browse files Browse the repository at this point in the history 
…ion catalog (#16707) (#16791)

* Make entries for dependencies from server/build.gradle to gradle version catalog



* Handle NodeList



* Add CHANGELOG entry



* Use wildcard



* Add roaringbitmap



---------


(cherry picked from commit 75a2fc3)

Signed-off-by: Craig Perkins <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
@opensearch-trigger-bot @github-actions
opensearch-trigger-bot[bot] and github-actions[bot] authored Dec 6, 2024
1 parent 8f13e69 commit 3eecea4
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 32 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

### Changed
- Indexed IP field supports `terms_query` with more than 1025 IP masks [#16391](https://github.com/opensearch-project/OpenSearch/pull/16391)
- Make entries for dependencies from server/build.gradle to gradle version catalog ([#16707](https://github.com/opensearch-project/OpenSearch/pull/16707))

### Deprecated
- Performing update operation with default pipeline or final pipeline is deprecated ([#16712](https://github.com/opensearch-project/OpenSearch/pull/16712))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/org/opensearch/gradle/plugin/OptionalDependenciesPlugin.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class OptionalDependenciesPlugin implements Plugin<Project> {

if (foundDep) {
if (foundDep.optional) {
foundDep.optional.value = 'true'
foundDep.optional*.value = 'true'
} else {
foundDep.appendNode(OPTIONAL_IDENTIFIER, 'true')
}
Expand Down
50 changes: 50 additions & 0 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jna = "5.13.0"

netty = "4.1.115.Final"
joda = "2.12.7"
roaringbitmap = "1.3.0"

# project reactor
reactor_netty = "1.1.23"
Expand Down Expand Up @@ -81,3 +82,52 @@ opentelemetrysemconv = "1.27.0-alpha"
# arrow dependencies
arrow = "17.0.0"
flatbuffers = "2.0.0"

[libraries]
hdrhistogram = { group = "org.hdrhistogram", name = "HdrHistogram", version.ref = "hdrhistogram" }
jakartaannotation = { group = "jakarta.annotation", name = "jakarta.annotation-api", version.ref = "jakarta_annotation" }
jodatime = { group = "joda-time", name = "joda-time", version.ref = "joda" }
jna = { group = "net.java.dev.jna", name = "jna", version.ref = "jna" }
jtscore = { group = "org.locationtech.jts", name = "jts-core", version.ref = "jts" }
jzlib = { group = "com.jcraft", name = "jzlib", version.ref = "jzlib" }
log4japi = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
log4jjul = { group = "org.apache.logging.log4j", name = "log4j-jul", version.ref = "log4j" }
log4jcore = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" }
lucene-core = { group = "org.apache.lucene", name = "lucene-core", version.ref = "lucene" }
lucene-analysis-common = { group = "org.apache.lucene", name = "lucene-analysis-common", version.ref = "lucene" }
lucene-backward-codecs = { group = "org.apache.lucene", name = "lucene-backward-codecs", version.ref = "lucene" }
lucene-grouping = { group = "org.apache.lucene", name = "lucene-grouping", version.ref = "lucene" }
lucene-highlighter = { group = "org.apache.lucene", name = "lucene-highlighter", version.ref = "lucene" }
lucene-join = { group = "org.apache.lucene", name = "lucene-join", version.ref = "lucene" }
lucene-memory = { group = "org.apache.lucene", name = "lucene-memory", version.ref = "lucene" }
lucene-misc = { group = "org.apache.lucene", name = "lucene-misc", version.ref = "lucene" }
lucene-queries = { group = "org.apache.lucene", name = "lucene-queries", version.ref = "lucene" }
lucene-queryparser = { group = "org.apache.lucene", name = "lucene-queryparser", version.ref = "lucene" }
lucene-sandbox = { group = "org.apache.lucene", name = "lucene-sandbox", version.ref = "lucene" }
lucene-spatial-extras = { group = "org.apache.lucene", name = "lucene-spatial-extras", version.ref = "lucene" }
lucene-spatial3d = { group = "org.apache.lucene", name = "lucene-spatial3d", version.ref = "lucene" }
lucene-suggest = { group = "org.apache.lucene", name = "lucene-suggest", version.ref = "lucene" }
protobuf = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" }
reactivestreams = { group = "io.projectreactor", name = "reactor-core", version.ref = "reactor" }
reactorcore = { group = "org.reactivestreams", name = "reactive-streams", version.ref = "reactivestreams" }
roaringbitmap = { group = "org.roaringbitmap", name = "RoaringBitmap", version.ref = "roaringbitmap" }
spatial4j = { group = "org.locationtech.spatial4j", name = "spatial4j", version.ref = "spatial4j" }
tdigest = { group = "com.tdunning", name = "t-digest", version.ref = "tdigest" }

[bundles]
lucene = [
"lucene-core",
"lucene-analysis-common",
"lucene-backward-codecs",
"lucene-grouping",
"lucene-highlighter",
"lucene-join",
"lucene-memory",
"lucene-misc",
"lucene-queries",
"lucene-queryparser",
"lucene-sandbox",
"lucene-spatial-extras",
"lucene-spatial3d",
"lucene-suggest"
]
48 changes: 17 additions & 31 deletions server/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,60 +74,46 @@ dependencies {
compileOnly project(':libs:opensearch-plugin-classloader')
testRuntimeOnly project(':libs:opensearch-plugin-classloader')

// lucene
api "org.apache.lucene:lucene-core:${versions.lucene}"
api "org.apache.lucene:lucene-analysis-common:${versions.lucene}"
api "org.apache.lucene:lucene-backward-codecs:${versions.lucene}"
api "org.apache.lucene:lucene-grouping:${versions.lucene}"
api "org.apache.lucene:lucene-highlighter:${versions.lucene}"
api "org.apache.lucene:lucene-join:${versions.lucene}"
api "org.apache.lucene:lucene-memory:${versions.lucene}"
api "org.apache.lucene:lucene-misc:${versions.lucene}"
api "org.apache.lucene:lucene-queries:${versions.lucene}"
api "org.apache.lucene:lucene-queryparser:${versions.lucene}"
api "org.apache.lucene:lucene-sandbox:${versions.lucene}"
api "org.apache.lucene:lucene-spatial-extras:${versions.lucene}"
api "org.apache.lucene:lucene-spatial3d:${versions.lucene}"
api "org.apache.lucene:lucene-suggest:${versions.lucene}"
api libs.bundles.lucene

// utilities
api project(":libs:opensearch-cli")

// time handling, remove with java 8 time
api "joda-time:joda-time:${versions.joda}"
api libs.jodatime

// percentiles aggregation
api "com.tdunning:t-digest:${versions.tdigest}"
api libs.tdigest
// percentile ranks aggregation
api "org.hdrhistogram:HdrHistogram:${versions.hdrhistogram}"
api libs.hdrhistogram

// lucene spatial
api "org.locationtech.spatial4j:spatial4j:${versions.spatial4j}", optional
api "org.locationtech.jts:jts-core:${versions.jts}", optional
api libs.spatial4j, optional
api libs.jtscore, optional

// logging
api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
api "org.apache.logging.log4j:log4j-jul:${versions.log4j}"
api "org.apache.logging.log4j:log4j-core:${versions.log4j}", optional
annotationProcessor "org.apache.logging.log4j:log4j-core:${versions.log4j}"
api libs.log4japi
api libs.log4jjul
api libs.log4jcore, optional
annotationProcessor libs.log4jcore
annotationProcessor project(':libs:opensearch-common')

// jna
api "net.java.dev.jna:jna:${versions.jna}"
api libs.jna

// jcraft
api "com.jcraft:jzlib:${versions.jzlib}"
api libs.jzlib

// reactor
api "io.projectreactor:reactor-core:${versions.reactor}"
api "org.reactivestreams:reactive-streams:${versions.reactivestreams}"
api libs.reactorcore
api libs.reactivestreams

// protobuf
api "com.google.protobuf:protobuf-java:${versions.protobuf}"
api "jakarta.annotation:jakarta.annotation-api:${versions.jakarta_annotation}"
api libs.protobuf
api libs.jakartaannotation

// https://mvnrepository.com/artifact/org.roaringbitmap/RoaringBitmap
implementation 'org.roaringbitmap:RoaringBitmap:1.3.0'
api libs.roaringbitmap

testImplementation(project(":test:framework")) {
// tests use the locally compiled version of server
Expand Down

0 comments on commit 3eecea4

Please sign in to comment.