Merge branch 'main' into added-new-parse-util-method

Signed-off-by: Martin Parvanov Kirilov <[email protected]>
opensearch-project · Jun 2, 2024 · fca8b56 · fca8b56
2 parents aba5a8f + d027c74
commit fca8b56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 - Add Workflow Step for Reindex from source index to destination ([#718](https://github.com/opensearch-project/flow-framework/pull/718))
 - Add param to delete workflow API to clear status even if resources exist ([#719](https://github.com/opensearch-project/flow-framework/pull/719))
 - Add a utility method to parse Float and Boolean values if they exist ([#721](https://github.com/opensearch-project/flow-framework/pull/721))
+
 ### Bug Fixes
 - Add user mapping to Workflow State index ([#705](https://github.com/opensearch-project/flow-framework/pull/705))
 

diff --git a/build.gradle b/build.gradle
@@ -185,7 +185,7 @@ dependencies {
 
     configurations.all {
         resolutionStrategy {
-            force("com.google.guava:guava:33.2.0-jre") // CVE for 31.1, keep to force transitive dependencies
+            force("com.google.guava:guava:33.2.1-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.1") // Dependency Jar Hell
         }