Merge branch 'main' into create-index-step

opensearch-project · Mar 14, 2024 · 2aaa63d · 2aaa63d
2 parents 0f4c7f0 + 10915aa
commit 2aaa63d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.whitesource b/.whitesource
@@ -32,6 +32,7 @@
       ":gitSignOff",
       "github>whitesource/merge-confidence:beta"
     ],
+    "addLabels": ["skip-changelog"],
     "workflowRules": {
       "enabled": true
     }

diff --git a/build.gradle b/build.gradle
@@ -184,7 +184,7 @@ dependencies {
 
     configurations.all {
         resolutionStrategy {
-            force("com.google.guava:guava:33.0.0-jre") // CVE for 31.1, keep to force transitive dependencies
+            force("com.google.guava:guava:33.1.0-jre") // CVE for 31.1, keep to force transitive dependencies
             force("org.eclipse.platform:org.eclipse.core.runtime:3.31.0") // CVE for < 3.29.0
             force("com.fasterxml.jackson.core:jackson-core:2.17.0") // Dependency Jar Hell
         }