Skip to content

upgrade dependencies to make it compatible with AD #4412

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

Open
wants to merge 1 commit into
base: feature/mcorr
Choose a base branch
from
Open

upgrade dependencies to make it compatible with AD #4412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ subprojects {

configurations.all {
// Force spotless depending on newer version of guava due to CVE-2023-2976. Remove after spotless upgrades.
resolutionStrategy.force "com.google.guava:guava:32.1.3-jre"
resolutionStrategy.force "com.google.guava:guava:33.4.5-jre"
Copy link
Collaborator

@dhrubo-os dhrubo-os Nov 11, 2025

Choose a reason for hiding this comment

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

May be both plugins can take version from core: https://github.com/opensearch-project/OpenSearch/blob/main/gradle/libs.versions.toml#L23 ?

Copy link
Collaborator Author

@jackiehanyang jackiehanyang Nov 11, 2025

Choose a reason for hiding this comment

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

No, AD needs it for a resource permission related change from security plugin side - opensearch-project/anomaly-detection@ee8e38d They are planning to make this change for all plugins just AD is the first one onboarded

Copy link
Contributor

@rithin-pullela-aws rithin-pullela-aws Nov 28, 2025

Choose a reason for hiding this comment

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

NIT:
We are forcing the newer version in the root module, but looks like other modules still declare older versions 32.1.3
Should we change it in all the packages as well? This would be more for overall consistency since the resolutionStrategy.force in the root module would ensure all the modules use the latest version declared here.

resolutionStrategy.force 'org.apache.commons:commons-compress:1.26.0'
resolutionStrategy.force "io.netty:netty-buffer:${versions.netty}"
resolutionStrategy.force "io.netty:netty-codec:${versions.netty}"
Expand Down
7 changes: 5 additions & 2 deletions common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,11 @@ shadowJar {
destinationDirectory = file("${project.buildDir}/distributions")
archiveClassifier.set(null)
exclude 'META-INF/maven/com.google.guava/**'
exclude 'com/google/thirdparty/**'
relocate 'com.google.common', 'org.opensearch.ml.repackage.com.google.common' // dependency of cron-utils

exclude 'org/jspecify/**'
// Relocate Guava to avoid conflicts with other plugins
relocate 'com.google.common', 'org.opensearch.ml.repackage.com.google.common'
relocate 'com.google.thirdparty', 'org.opensearch.ml.repackage.com.google.thirdparty'
}

jar {
Expand Down
Loading