diff --git a/CHANGELOG.md b/CHANGELOG.md index 5639991a9..82b9b06a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bumps `com.fasterxml.jackson.core:jackson-annotations` from 2.17.0 to 2.17.2 - Bumps `com.fasterxml.jackson.core:jackson-databind` from 2.17.0 to 2.17.2 - Bumps `commons-logging:commons-logging` from 1.3.1 to 1.3.4 -- Bumps `com.google.protobuf:protobuf-java` from 4.26.1 to 4.28.0 +- Bumps `com.google.protobuf:protobuf-java` from 4.26.1 to 4.28.1 - Bumps `io.netty:netty-all` from 4.1.109.Final to 4.1.112.Final - Bumps `jakarta.servlet:jakarta.servlet-api` from 6.0.0 to 6.1.0 - Bumps `commons-codec:commons-codec` from 1.17.0 to 1.17.1 @@ -119,4 +119,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) [1.2.0]: https://github.com/opensearch-project/opensearch-hadoop/compare/v1.1.0...v1.2.0 [1.1.0]: https://github.com/opensearch-project/opensearch-hadoop/compare/v1.0.1...v1.1.0 [1.0.1]: https://github.com/opensearch-project/opensearch-hadoop/compare/v1.0.0...v1.0.1 -[1.0.0]: https://github.com/opensearch-project/opensearch-hadoop/compare/v7.13.4...v1.0.0 +[1.0.0]: https://github.com/opensearch-project/opensearch-hadoop/compare/v7.13.4...v1.0.0 \ No newline at end of file diff --git a/licenses/protobuf-java-4.28.0.jar.sha1 b/licenses/protobuf-java-4.28.0.jar.sha1 deleted file mode 100644 index 92b59a1c2..000000000 --- a/licenses/protobuf-java-4.28.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b7f76d4c3179132637581aad5fb8207c992943a \ No newline at end of file diff --git a/licenses/protobuf-java-4.28.1.jar.sha1 b/licenses/protobuf-java-4.28.1.jar.sha1 new file mode 100644 index 000000000..3a9da13a1 --- /dev/null +++ b/licenses/protobuf-java-4.28.1.jar.sha1 @@ -0,0 +1 @@ +fd220ada9371efa092dec39719a3b9d7dd8a1d44 \ No newline at end of file diff --git a/spark/sql-30/build.gradle b/spark/sql-30/build.gradle index 6fe117036..ad550ac71 100644 --- 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.28.0") + add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:4.28.1") 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.28.0.jar.sha1 b/spark/sql-30/licenses/protobuf-java-4.28.0.jar.sha1 deleted file mode 100644 index 92b59a1c2..000000000 --- a/spark/sql-30/licenses/protobuf-java-4.28.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8b7f76d4c3179132637581aad5fb8207c992943a \ No newline at end of file diff --git a/spark/sql-30/licenses/protobuf-java-4.28.1.jar.sha1 b/spark/sql-30/licenses/protobuf-java-4.28.1.jar.sha1 new file mode 100644 index 000000000..3a9da13a1 --- /dev/null +++ b/spark/sql-30/licenses/protobuf-java-4.28.1.jar.sha1 @@ -0,0 +1 @@ +fd220ada9371efa092dec39719a3b9d7dd8a1d44 \ No newline at end of file