Skip to content

Commit

Permalink
Sync Guava version across all modules (opensearch-project#10051)
Browse files Browse the repository at this point in the history
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
  • Loading branch information
reta authored Sep 14, 2023
1 parent 99182fd commit 14d6175
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion distribution/tools/keystore-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ dependencies {
compileOnly project(":libs:opensearch-cli")
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.1'
testRuntimeOnly 'com.google.guava:guava:32.0.1-jre'
testRuntimeOnly "com.google.guava:guava:${versions.guava}"
}
2 changes: 1 addition & 1 deletion distribution/tools/plugin-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies {
api "org.bouncycastle:bc-fips:1.0.2.3"
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.2'
testRuntimeOnly 'com.google.guava:guava:32.0.1-jre'
testRuntimeOnly "com.google.guava:guava:${versions.guava}"
}

tasks.named("dependencyLicenses").configure {
Expand Down
2 changes: 1 addition & 1 deletion distribution/tools/upgrade-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
testImplementation project(":test:framework")
testImplementation 'com.google.jimfs:jimfs:1.2'
testRuntimeOnly 'com.google.guava:guava:32.0.1-jre'
testRuntimeOnly "com.google.guava:guava:${versions.guava}"
}

tasks.named("dependencyLicenses").configure {
Expand Down
2 changes: 1 addition & 1 deletion plugins/ingest-attachment/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ dependencies {
api "org.apache.tika:tika-langdetect-optimaize:${versions.tika}"
// Optimaize libraries/dependencies
runtimeOnly "com.optimaize.languagedetector:language-detector:0.6"
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
runtimeOnly "com.google.guava:guava:${versions.guava}"
// Other dependencies
api 'org.tukaani:xz:1.9'
api 'commons-io:commons-io:2.11.0'
Expand Down
2 changes: 1 addition & 1 deletion plugins/repository-azure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ dependencies {
api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}"
api 'org.codehaus.woodstox:stax2-api:4.2.1'
implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
runtimeOnly "com.google.guava:guava:${versions.guava}"
api 'org.apache.commons:commons-lang3:3.12.0'
testImplementation project(':test:fixtures:azure-fixture')
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/repository-gcs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ opensearchplugin {
dependencies {
api 'com.google.cloud:google-cloud-storage:1.113.1'
api 'com.google.cloud:google-cloud-core:1.93.3'
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
runtimeOnly "com.google.guava:guava:${versions.guava}"
api 'com.google.guava:failureaccess:1.0.1'
api 'com.google.http-client:google-http-client:1.35.0'
api "commons-logging:commons-logging:${versions.commonslogging}"
Expand Down
2 changes: 1 addition & 1 deletion plugins/repository-hdfs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies {
api 'org.apache.avro:avro:1.10.2'
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
api 'com.google.code.gson:gson:2.9.0'
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
runtimeOnly "com.google.guava:guava:${versions.guava}"
api 'com.google.protobuf:protobuf-java:3.21.9'
api 'commons-logging:commons-logging:1.1.3'
api 'commons-cli:commons-cli:1.2'
Expand Down
5 changes: 4 additions & 1 deletion qa/evil-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,12 @@ import org.opensearch.gradle.info.BuildParams
apply plugin: 'opensearch.testclusters'
apply plugin: 'opensearch.standalone-test'

def props = new Properties()
project(":build-tools").file("version.properties").withInputStream { props.load(it) }

dependencies {
testImplementation 'com.google.jimfs:jimfs:1.2'
testRuntimeOnly 'com.google.guava:guava:32.0.1-jre'
testRuntimeOnly "com.google.guava:guava:${props.getProperty('guava')}"
}

// TODO: give each evil test its own fresh JVM for more isolation.
Expand Down

0 comments on commit 14d6175

Please sign in to comment.