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

Jump to bottom

HADOOP-18197. Protobuf-Java 3.21.12 #26

Merged
merged 5 commits into from
Jan 11, 2024
Merged

HADOOP-18197. Protobuf-Java 3.21.12 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49fe0d0
HADOOP-18197. Upgrade protobuf to 3.20.1
steveloughran Jun 8, 2022
b44c43f
HADOOP-18197. Upgrade protobuf to 3.21.1
steveloughran Jun 8, 2022
77339d6
HADOOP-18197. latest protobuf 3 and rename module
steveloughran Oct 10, 2022
4c83fe0
Merge remote-tracking branch 'upstream/trunk' into pr/19
pjfanning Dec 12, 2023
4b45a92
protobuf-java 3.21.12
pjfanning Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,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.21.12


MIT License
Expand Down
2 changes: 1 addition & 1 deletion hadoop-shaded-guava/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<artifactId>hadoop-thirdparty</artifactId>
<groupId>org.apache.hadoop.thirdparty</groupId>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hadoop-shaded-guava</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions hadoop-shaded-protobuf_3_7/pom.xml → hadoop-shaded-protobuf_3_21/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
<artifactId>hadoop-thirdparty</artifactId>
<groupId>org.apache.hadoop.thirdparty</groupId>
<version>1.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
<relativePath>../pom.xml</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_21</artifactId>
<name>Apache Hadoop shaded Protobuf</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.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.version>3.21.12</protobuf_3.version>
<guava.version>32.0.1-jre</guava.version>
<avro.version>1.11.3</avro.version>

Expand Down Expand Up @@ -123,7 +123,7 @@
</organization>

<modules>
<module>hadoop-shaded-protobuf_3_7</module>
<module>hadoop-shaded-protobuf_3_21</module>
<module>hadoop-shaded-guava</module>
<module>hadoop-shaded-avro_1_11</module>
</modules>
Expand Down
4 changes: 2 additions & 2 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.21.12 jar is available as *org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_21* artifact.

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

|Original package | Shaded package |
|---|---|
Expand Down