Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
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

Choose a reason for hiding this comment

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

Copy link
Collaborator Author

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

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
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