From 8766320078e0360e3248a7bcf3c8097d1a2a0728 Mon Sep 17 00:00:00 2001 From: Igor Dvorzhak Date: Sat, 1 May 2021 18:40:21 -0700 Subject: [PATCH 1/6] Upgrade Protobuf to version 3.12.4 --- LICENSE-binary | 2 +- .../pom.xml | 6 +++--- pom.xml | 4 ++-- src/site/markdown/index.md.vm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename {hadoop-shaded-protobuf_3_7 => hadoop-shaded-protobuf_3_12}/pom.xml (96%) diff --git a/LICENSE-binary b/LICENSE-binary index 6e5d636..8ef1164 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -216,7 +216,7 @@ See licenses-binary/ for text of these licenses. BSD 3-Clause ------------ -com.google.protobuf:protobuf-java:3.7.1 +com.google.protobuf:protobuf-java:3.12.4 MIT License diff --git a/hadoop-shaded-protobuf_3_7/pom.xml b/hadoop-shaded-protobuf_3_12/pom.xml similarity index 96% rename from hadoop-shaded-protobuf_3_7/pom.xml rename to hadoop-shaded-protobuf_3_12/pom.xml index ae288fb..3fd2ec5 100644 --- a/hadoop-shaded-protobuf_3_7/pom.xml +++ b/hadoop-shaded-protobuf_3_12/pom.xml @@ -27,8 +27,8 @@ .. 4.0.0 - hadoop-shaded-protobuf_3_7 - Apache Hadoop shaded Protobuf 3.7 + hadoop-shaded-protobuf_3_12 + Apache Hadoop shaded Protobuf 3.12 jar @@ -38,7 +38,7 @@ com.google.protobuf protobuf-java - ${protobuf_3_7.version} + ${protobuf_3_12.version} diff --git a/pom.xml b/pom.xml index bdb2e7d..7216c27 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.apache.hadoop.thirdparty ${shaded.prefix}.protobuf - 3.7.1 + 3.12.4 30.1.1-jre @@ -122,7 +122,7 @@ - hadoop-shaded-protobuf_3_7 + hadoop-shaded-protobuf_3_12 hadoop-shaded-guava diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm index 280b1c6..e1d52eb 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.7.1 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7* artifact. +Google Protobuf's 3.12.4 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_12* artifact. -Following are relocations under *hadoop-shaded-protobuf_3_7* artifact: +Following are relocations under *hadoop-shaded-protobuf_3_12* artifact: |Original package | Shaded package | |---|---| From 273c169ee398eb68bae056f46f9f764d25a435dc Mon Sep 17 00:00:00 2001 From: Igor Dvorzhak Date: Thu, 13 May 2021 20:40:58 -0700 Subject: [PATCH 2/6] Upgraed Protobuf to 3.17.0 --- LICENSE-binary | 2 +- .../pom.xml | 6 +++--- pom.xml | 4 ++-- src/site/markdown/index.md.vm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename {hadoop-shaded-protobuf_3_12 => hadoop-shaded-protobuf_3_17}/pom.xml (96%) diff --git a/LICENSE-binary b/LICENSE-binary index 8ef1164..02aecd8 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -216,7 +216,7 @@ See licenses-binary/ for text of these licenses. BSD 3-Clause ------------ -com.google.protobuf:protobuf-java:3.12.4 +com.google.protobuf:protobuf-java:3.17.0 MIT License diff --git a/hadoop-shaded-protobuf_3_12/pom.xml b/hadoop-shaded-protobuf_3_17/pom.xml similarity index 96% rename from hadoop-shaded-protobuf_3_12/pom.xml rename to hadoop-shaded-protobuf_3_17/pom.xml index 3fd2ec5..66046bd 100644 --- a/hadoop-shaded-protobuf_3_12/pom.xml +++ b/hadoop-shaded-protobuf_3_17/pom.xml @@ -27,8 +27,8 @@ .. 4.0.0 - hadoop-shaded-protobuf_3_12 - Apache Hadoop shaded Protobuf 3.12 + hadoop-shaded-protobuf_3_17 + Apache Hadoop shaded Protobuf 3.17 jar @@ -38,7 +38,7 @@ com.google.protobuf protobuf-java - ${protobuf_3_12.version} + ${protobuf_3_17.version} diff --git a/pom.xml b/pom.xml index 7216c27..6bd378e 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.apache.hadoop.thirdparty ${shaded.prefix}.protobuf - 3.12.4 + 3.17.0 30.1.1-jre @@ -122,7 +122,7 @@ - hadoop-shaded-protobuf_3_12 + hadoop-shaded-protobuf_3_17 hadoop-shaded-guava diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm index e1d52eb..dae4ed4 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.12.4 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_12* artifact. +Google Protobuf's 3.17.0 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_17* artifact. -Following are relocations under *hadoop-shaded-protobuf_3_12* artifact: +Following are relocations under *hadoop-shaded-protobuf_3_17* artifact: |Original package | Shaded package | |---|---| From 0c628f3b49f3e46af30e6e61fdb5f348106b318f Mon Sep 17 00:00:00 2001 From: Igor Dvorzhak Date: Sat, 4 Sep 2021 00:05:51 -0700 Subject: [PATCH 3/6] Update LICENSE-binary --- LICENSE-binary | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 02aecd8..b2a44f1 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -216,9 +216,9 @@ See licenses-binary/ for text of these licenses. BSD 3-Clause ------------ -com.google.protobuf:protobuf-java:3.17.0 +com.google.protobuf:protobuf-java:3.17.3 MIT License ----------- -org.checkerframework:checker-qual:jar:3.8.0 \ No newline at end of file +org.checkerframework:checker-qual:jar:3.8.0 From c2b5a7bee0ac963a8144f082e973ead4c6c7c304 Mon Sep 17 00:00:00 2001 From: Igor Dvorzhak Date: Sat, 4 Sep 2021 00:06:16 -0700 Subject: [PATCH 4/6] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bd378e..08a2d4c 100644 --- a/pom.xml +++ b/pom.xml @@ -94,7 +94,7 @@ org.apache.hadoop.thirdparty ${shaded.prefix}.protobuf - 3.17.0 + 3.17.3 30.1.1-jre From 4e3995a1258bd7150eeaed6ddaf365a8db3a2aa6 Mon Sep 17 00:00:00 2001 From: Igor Dvorzhak Date: Sat, 4 Sep 2021 00:06:40 -0700 Subject: [PATCH 5/6] Update index.md.vm --- src/site/markdown/index.md.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm index dae4ed4..a17d73a 100644 --- a/src/site/markdown/index.md.vm +++ b/src/site/markdown/index.md.vm @@ -42,7 +42,7 @@ This page provides an overview of the major changes. Protobuf-java ------------- -Google Protobuf's 3.17.0 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_17* artifact. +Google Protobuf's 3.17.3 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_17* artifact. Following are relocations under *hadoop-shaded-protobuf_3_17* artifact: @@ -70,4 +70,4 @@ Following are relocations under *hadoop-shaded-jaeger* artifact: |kotlin|org.apache.hadoop.thirdparty.io.jaegertracing.kotlin| |org.intellij|org.apache.hadoop.thirdparty.io.jaegertracing.org.intellij| |org.jetbrains|org.apache.hadoop.thirdparty.io.jaegertracing.org.jetbrains| -|okio|org.apache.hadoop.thirdparty.io.jaegertracing.okio| \ No newline at end of file +|okio|org.apache.hadoop.thirdparty.io.jaegertracing.okio| From 1969c326ed9d8ae0c7bdd68c322bdd5ecbb0e97a Mon Sep 17 00:00:00 2001 From: Igor Dvorzhak Date: Sat, 4 Sep 2021 00:08:12 -0700 Subject: [PATCH 6/6] Update index.md.vm --- src/site/markdown/index.md.vm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/site/markdown/index.md.vm b/src/site/markdown/index.md.vm index 1522f75..604d081 100644 --- a/src/site/markdown/index.md.vm +++ b/src/site/markdown/index.md.vm @@ -59,15 +59,5 @@ Following are relocations under *hadoop-shaded-guava* artifact: |Original package | Shaded package | |---|---| -|com.google.gson | org.apache.hadoop.thirdparty.io.jaegertracing.com.google.gson| -|io.jaegertracing.thriftjava|org.apache.hadoop.thirdparty.io.jaegertracing.thriftjava| -|io.jaegertracing.crossdock|org.apache.hadoop.thirdparty.io.jaegertracing.crossdock| -|io.jaegertracing.thrift|org.apache.hadoop.thirdparty.io.jaegertracing.thrift| -|io.jaegertracing.agent|org.apache.hadoop.thirdparty.io.jaegertracing.agent| -|org.apache.thrift|org.apache.hadoop.thirdparty.io.jaegertracing.apache.thrift| -|com.twitter.zipkin|org.apache.hadoop.thirdparty.io.jaegertracing.com.twitter.zipkin| -|okhttp3|org.apache.hadoop.thirdparty.io.jaegertracing.okhttp3| -|kotlin|org.apache.hadoop.thirdparty.io.jaegertracing.kotlin| -|org.intellij|org.apache.hadoop.thirdparty.io.jaegertracing.org.intellij| -|org.jetbrains|org.apache.hadoop.thirdparty.io.jaegertracing.org.jetbrains| -|okio|org.apache.hadoop.thirdparty.io.jaegertracing.okio| +|com.google|org.apache.hadoop.thirdparty.com.google| +|org.checkerframework|org.apache.hadoop.thirdparty.org.checkerframework|