Skip to content

Commit f05c4b2

Browse files
authored
Consolidates use of OpenSearch clients using the Gradle version catalog. Removes some unnecessary Gradle configurations. (opensearch-project#2569)
Signed-off-by: David Venable <dlv@amazon.com>
1 parent 7d734e2 commit f05c4b2

3 files changed

Lines changed: 7 additions & 42 deletions

File tree

data-prepper-plugins/opensearch/build.gradle

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,14 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
buildscript {
7-
ext {
8-
opensearchVersion = System.getProperty('opensearch.version', "${libs.versions.opensearch.get()}")
9-
}
10-
11-
repositories {
12-
mavenCentral()
13-
gradlePluginPortal()
14-
}
15-
16-
dependencies {
17-
constraints {
18-
classpath('com.netflix.nebula:nebula-core') {
19-
version {
20-
require '3.0.1'
21-
}
22-
because 'Nebula 3.0.0 is not in Maven Central and any dependency on it will attempt to use JCenter.'
23-
}
24-
}
25-
}
26-
}
27-
28-
plugins {
29-
id 'java'
30-
}
31-
32-
repositories {
33-
mavenCentral()
34-
}
35-
366
dependencies {
377
implementation project(':data-prepper-api')
388
testImplementation project(':data-prepper-api').sourceSets.test.output
399
implementation project(':data-prepper-plugins:common')
4010
implementation project(':data-prepper-plugins:failures-common')
41-
implementation "org.opensearch.client:opensearch-rest-high-level-client:${opensearchVersion}"
42-
implementation "org.opensearch.client:opensearch-rest-client:${opensearchVersion}"
43-
implementation 'org.opensearch.client:opensearch-java:2.2.0'
11+
implementation libs.opensearch.client
12+
implementation libs.opensearch.rhlc
13+
implementation libs.opensearch.java
4414
implementation 'com.fasterxml.jackson.core:jackson-databind'
4515
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
4616
implementation libs.guava.core

data-prepper-plugins/otel-trace-group-processor/build.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,10 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
plugins {
7-
id 'java'
8-
}
9-
10-
ext {
11-
opensearchVersion = System.getProperty("opensearch.version", "${libs.versions.opensearch.get()}")
12-
}
13-
146
dependencies {
157
implementation project(':data-prepper-api')
168
implementation project(':data-prepper-plugins:opensearch')
17-
implementation "org.opensearch.client:opensearch-rest-high-level-client:${opensearchVersion}"
9+
implementation libs.opensearch.rhlc
1810
implementation 'com.fasterxml.jackson.core:jackson-databind'
1911
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
2012
implementation 'io.micrometer:micrometer-core'

settings.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ dependencyResolutionManagement {
2626
library('protobuf-util', 'com.google.protobuf', 'protobuf-java-util').versionRef('protobuf')
2727
version('opentelemetry', '0.16.0-alpha')
2828
library('opentelemetry-proto', 'io.opentelemetry.proto', 'opentelemetry-proto').versionRef('opentelemetry')
29+
version('opensearchJava', '2.2.0')
30+
library('opensearch-java', 'org.opensearch.client', 'opensearch-java').versionRef('opensearchJava')
2931
version('opensearch', '1.3.8')
32+
library('opensearch-client', 'org.opensearch.client', 'opensearch-rest-client').versionRef('opensearch')
3033
library('opensearch-rhlc', 'org.opensearch.client', 'opensearch-rest-high-level-client').versionRef('opensearch')
3134
version('spring', '5.3.27')
3235
library('spring-core', 'org.springframework', 'spring-core').versionRef('spring')

0 commit comments

Comments
 (0)