From cb960d0eaac9d39ff7556345de25b57c82fc5a05 Mon Sep 17 00:00:00 2001 From: BilwaST Date: Mon, 27 May 2024 15:44:09 +0530 Subject: [PATCH] HADOOP-19163. Use protobuf-java 3.25.3 (#36). Contributed by Bilwa S T --- LICENSE-binary | 2 +- .../pom.xml | 2 +- pom.xml | 4 ++-- src/site/markdown/index.md.vm | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename {hadoop-shaded-protobuf_3_23 => hadoop-shaded-protobuf_3_25}/pom.xml (98%) diff --git a/LICENSE-binary b/LICENSE-binary index 1510d48..95d9b42 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -218,7 +218,7 @@ See licenses-binary/ for text of these licenses. BSD 3-Clause ------------ -com.google.protobuf:protobuf-java:3.23.4 +com.google.protobuf:protobuf-java:3.25.3 MIT License diff --git a/hadoop-shaded-protobuf_3_23/pom.xml b/hadoop-shaded-protobuf_3_25/pom.xml similarity index 98% rename from hadoop-shaded-protobuf_3_23/pom.xml rename to hadoop-shaded-protobuf_3_25/pom.xml index 0c1d3c8..3e9a98d 100644 --- a/hadoop-shaded-protobuf_3_23/pom.xml +++ b/hadoop-shaded-protobuf_3_25/pom.xml @@ -27,7 +27,7 @@ ../pom.xml 4.0.0 - hadoop-shaded-protobuf_3_23 + hadoop-shaded-protobuf_3_25 Apache Hadoop shaded Protobuf jar diff --git a/pom.xml b/pom.xml index ae56ab1..e98cf77 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.apache.hadoop.thirdparty ${shaded.prefix}.protobuf - 3.23.4 + 3.25.3 32.0.1-jre 1.11.3 @@ -123,7 +123,7 @@ - hadoop-shaded-protobuf_3_23 + hadoop-shaded-protobuf_3_25 hadoop-shaded-guava hadoop-shaded-avro_1_11 diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm index 11710d2..549975d 100644 --- a/src/site/markdown/index.md.vm +++ b/src/site/markdown/index.md.vm @@ -42,9 +42,9 @@ This page provides an overview of the major changes. Protobuf-java ------------- -Google Protobuf's 3.23.4 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_23* artifact. +Google Protobuf's 3.25.3 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_25* artifact. -Following are relocations under *hadoop-shaded-protobuf_3_23* artifact: +Following are relocations under *hadoop-shaded-protobuf_3_25* artifact: |Original package | Shaded package | |---|---|