Skip to content

Fix guava and errorprone dependencies #2883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
karenyrx wants to merge 8 commits into from
+17 −15
Closed

Fix guava and errorprone dependencies #2883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1588442
Remove guava test dependencies and use api guava and failureaccess deps
karenyrx Sep 18, 2025
29b494e
match core versions
karenyrx Sep 18, 2025
ab25c27
add guava as compileOnly and exclude errorprone from guava
karenyrx Sep 18, 2025
cc9061f
Update CHANGELOG.md
karenyrx Sep 18, 2025
4281ea1
Update CHANGELOG.md
karenyrx Sep 18, 2025
01a6f69
make failureaccess an api dep
karenyrx Sep 18, 2025
710df65
bundle together
karenyrx Sep 18, 2025
d2be2f1
implementation dep
karenyrx Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,13 +342,21 @@ dependencies {
compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${versions.opensearch}"
compileOnly "org.opensearch.plugin:transport-grpc-spi:${opensearch_version}"
compileOnly "org.opensearch:protobufs:0.13.0"
compileOnly group: 'com.google.guava', name: 'failureaccess', version:'1.0.2'
// Guava is provided by OpenSearch's transport-grpc module - use compileOnly to avoid jar hell
compileOnly group: 'com.google.guava', name: 'guava', version:'33.2.1-jre'
// Add failureaccess using implementation to make it available to transport-grpc's Guava
implementation group: 'com.google.guava', name: 'failureaccess', version:'1.0.2'
testImplementation('com.google.guava:guava:33.2.1-jre') {
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
}
testFixturesImplementation('com.google.guava:guava:33.2.1-jre') {
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
}
// Use the OpenSearch core version of error_prone_annotations for tests
testImplementation group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.41.0'
testFixturesImplementation group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.41.0'
api "org.apache.commons:commons-lang3:${versions.commonslang}"
testFixturesImplementation "org.opensearch.test:framework:${opensearch_version}"
// Add Guava for test configurations since it's needed for testing but excluded from runtime
testImplementation group: 'com.google.guava', name: 'guava', version:'33.2.1-jre'
testFixturesImplementation group: 'com.google.guava', name: 'guava', version:'33.2.1-jre'
testImplementation group: 'net.bytebuddy', name: 'byte-buddy', version: "${versions.bytebuddy}"
testImplementation group: 'org.objenesis', name: 'objenesis', version: '3.3'
testImplementation group: 'net.bytebuddy', name: 'byte-buddy-agent', version: "${versions.bytebuddy}"
Expand Down
7 changes: 5 additions & 2 deletions qa/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ dependencies {
api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
api "org.apache.logging.log4j:log4j-core:${versions.log4j}"

// Guava needed for BWC test compilation (ImmutableList, ImmutableMap usage)
testImplementation group: 'com.google.guava', name: 'guava', version:'33.2.1-jre'
// Guava is provided by transport-grpc but needed for QA test compilation
testImplementation('com.google.guava:guava:33.2.1-jre') {
exclude group: 'com.google.errorprone', module: 'error_prone_annotations'
}
testImplementation group: 'com.google.errorprone', name: 'error_prone_annotations', version: '2.41.0'
testImplementation "org.opensearch.test:framework:${opensearch_version}"
testImplementation(testFixtures(rootProject))
}
Expand Down
5 changes: 0 additions & 5 deletions qa/restart-upgrade/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ import org.apache.tools.ant.taskdefs.condition.Os

apply from : "$rootDir/qa/build.gradle"

dependencies {
Copy link
Copy Markdown
Contributor Author

@karenyrx karenyrx Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not needed as it inherits from qa/build.gradle (as it has apply from : "$rootDir/qa/build.gradle" on Line 9)

// Ensure Guava is available for BWC test compilation
testImplementation group: 'com.google.guava', name: 'guava', version:'33.2.1-jre'
}

String default_bwc_version = System.getProperty("bwc.version")
String knn_bwc_version = System.getProperty("tests.bwc.version", default_bwc_version)
boolean isSnapshot = knn_bwc_version.contains("-SNAPSHOT")
Expand Down
4 changes: 0 additions & 4 deletions qa/rolling-upgrade/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ import org.apache.tools.ant.taskdefs.condition.Os

apply from : "$rootDir/qa/build.gradle"

dependencies {
Copy link
Copy Markdown
Contributor Author

@karenyrx karenyrx Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not needed as it inherits from qa/build.gradle (as it has apply from : "$rootDir/qa/build.gradle" on Line 9)

// Ensure Guava is available for BWC test compilation
testImplementation group: 'com.google.guava', name: 'guava', version:'33.2.1-jre'
}

String default_bwc_version = System.getProperty("bwc.version")
String knn_bwc_version = System.getProperty("tests.bwc.version", default_bwc_version)
Expand Down
Loading