Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HADOOP-17679. Upgrade Protobuf to 3.17.3 #13

Closed
wants to merge 7 commits into from
Closed

HADOOP-17679. Upgrade Protobuf to 3.17.3 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8766320
Upgrade Protobuf to version 3.12.4
medb May 2, 2021
273c169
Upgraed Protobuf to 3.17.0
medb May 14, 2021
0c628f3
Update LICENSE-binary
medb Sep 4, 2021
c2b5a7b
Update pom.xml
medb Sep 4, 2021
4e3995a
Update index.md.vm
medb Sep 4, 2021
e937e3c
Merge branch 'trunk' into trunk
medb Sep 4, 2021
1969c32
Update index.md.vm
medb Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ 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.17.3


MIT License
-----------
org.checkerframework:checker-qual:jar:3.8.0
org.checkerframework:checker-qual:jar:3.8.0
6 changes: 3 additions & 3 deletions hadoop-shaded-protobuf_3_7/pom.xml → hadoop-shaded-protobuf_3_17/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<relativePath>..</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hadoop-shaded-protobuf_3_7</artifactId>
<name>Apache Hadoop shaded Protobuf 3.7</name>
<artifactId>hadoop-shaded-protobuf_3_17</artifactId>
<name>Apache Hadoop shaded Protobuf 3.17</name>
<packaging>jar</packaging>

<properties>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf_3_7.version}</version>
<version>${protobuf_3_17.version}</version>
</dependency>
</dependencies>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<!--thirdparty dependency versions-->
<shaded.prefix>org.apache.hadoop.thirdparty</shaded.prefix>
<protobuf.shade.prefix>${shaded.prefix}.protobuf</protobuf.shade.prefix>
<protobuf_3_7.version>3.7.1</protobuf_3_7.version>
<protobuf_3_17.version>3.17.3</protobuf_3_17.version>
<guava.version>30.1.1-jre</guava.version>

<!-- maven plugin versions -->
Expand Down Expand Up @@ -122,7 +122,7 @@
</organization>

<modules>
<module>hadoop-shaded-protobuf_3_7</module>
<module>hadoop-shaded-protobuf_3_17</module>
<module>hadoop-shaded-guava</module>
</modules>

Expand Down
6 changes: 3 additions & 3 deletions src/site/markdown/index.md.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.17.3 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_17* artifact.

Following are relocations under *hadoop-shaded-protobuf_3_7* artifact:
Following are relocations under *hadoop-shaded-protobuf_3_17* artifact:

|Original package | Shaded package |
|---|---|
Expand All @@ -60,4 +60,4 @@ Following are relocations under *hadoop-shaded-guava* artifact:
|Original package | Shaded package |
|---|---|
|com.google|org.apache.hadoop.thirdparty.com.google|
|org.checkerframework|org.apache.hadoop.thirdparty.org.checkerframework|
|org.checkerframework|org.apache.hadoop.thirdparty.org.checkerframework|