Merge branch 'main' into dependabot/gradle/dist/commons-codec-commons…

…-codec-1.17.2 Signed-off-by: Thomas Farr <[email protected]>
opensearch-project · Jan 14, 2025 · e588b10 · e588b10
2 parents c80f5c6 + 7bf4d4b
commit e588b10
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,7 +18,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Bumps `com.fasterxml.jackson.core:jackson-databind` from 2.17.2 to 2.18.2
 - Bumps `com.fasterxml.jackson.core:jackson-annotations` from 2.17.2 to 2.18.2
 - Bumps `io.netty:netty-all` from 4.1.112.Final to 4.1.115.Final
-- Bumps `com.google.protobuf:protobuf-java` from 4.28.2 to 4.29.2
+- Bumps `com.google.protobuf:protobuf-java` from 4.28.2 to 4.29.3
 - Bumps `commons-codec:commons-codec` from 1.17.1 to 1.17.2
 
 ## [1.3.0]

diff --git a/licenses/protobuf-java-4.29.2.jar.sha1 b/licenses/protobuf-java-4.29.2.jar.sha1
diff --git a/licenses/protobuf-java-4.29.3.jar.sha1 b/licenses/protobuf-java-4.29.3.jar.sha1
@@ -0,0 +1 @@
+83afa847b893932b49a8fd896608fa23cd5fb0b5
diff --git a/spark/sql-30/build.gradle b/spark/sql-30/build.gradle
@@ -70,7 +70,7 @@ sparkVariants {
             }
             add(variant.configuration('implementation'), "commons-logging:commons-logging:1.3.4")
             add(variant.configuration('implementation'), "javax.xml.bind:jaxb-api:2.3.1")
-            add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:4.29.2")
+            add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:4.29.3")
             add(variant.configuration('implementation'), "org.apache.spark:spark-catalyst_${variant.scalaMajorVersion}:$variant.sparkVersion")
             add(variant.configuration('implementation'), "org.apache.spark:spark-yarn_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'

diff --git a/spark/sql-30/licenses/protobuf-java-4.29.2.jar.sha1 b/spark/sql-30/licenses/protobuf-java-4.29.2.jar.sha1
diff --git a/spark/sql-30/licenses/protobuf-java-4.29.3.jar.sha1 b/spark/sql-30/licenses/protobuf-java-4.29.3.jar.sha1
@@ -0,0 +1 @@
+83afa847b893932b49a8fd896608fa23cd5fb0b5