This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 28ff2d74b77d YARN-11657. Remove protobuf-2.5 from hadoop-yarn-api
module (#6575) (#6581)
28ff2d74b77d is described below
commit 28ff2d74b77d3cf9092ad1284cbdb47a7372832e
Author: Steve Loughran <ste...@cloudera.com>
AuthorDate: Tue Mar 5 11:01:35 2024 +0000
YARN-11657. Remove protobuf-2.5 from hadoop-yarn-api module (#6575) (#6581)
The import of protobuf-java-2.5 in the hadoop-yarn-api module
is downgraded from "compile" to "provided"
This removes it from share/hadoop/yarn/lib/protobuf-java-2.5.0.jar
It is still found under
share/hadoop/yarn/timelineservice/lib/protobuf-java-2.5.0.jar
Contributed by Steve Loughran
---
BUILDING.txt | 10 +++++++---
LICENSE-binary | 4 ++--
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml | 5 -----
.../hadoop-yarn-server-applicationhistoryservice/pom.xml | 1 +
.../hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml | 4 ----
5 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index e2e7c57da244..79b070cf0dae 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -297,12 +297,12 @@ Controlling the redistribution of the protobuf-2.5
dependency
The protobuf 2.5.0 library is used at compile time to compile the class
org.apache.hadoop.ipc.ProtobufHelper; this class known to have been used by
- external projects in the past. Protobuf 2.5 is not used elsewhere in
+ external projects in the past. Protobuf 2.5 is not used directly in
the Hadoop codebase; alongside the move to Protobuf 3.x a private successor
class, org.apache.hadoop.ipc.internal.ShadedProtobufHelper is now used.
The hadoop-common module no longer exports its compile-time dependency on
- protobuf-2.5. Hadoop distributions no longer include it.
+ protobuf-java-2.5.
Any application declaring a dependency on hadoop-commmon will no longer get
the artifact added to their classpath.
If is still required, then they must explicitly declare it:
@@ -319,10 +319,14 @@ Controlling the redistribution of the protobuf-2.5
dependency
-Dcommon.protobuf2.scope=compile
- If this is done then protobuf-2.5.0.jar will again be exported as a
+ If this is done then protobuf-java-2.5.0.jar will again be exported as a
hadoop-common dependency, and included in the share/hadoop/common/lib/
directory of any Hadoop distribution built.
+ Note that protobuf-java-2.5.0.jar is still placed in
+ share/hadoop/yarn/timelineservice/lib; this is needed by the hbase client
+ library.
+
----------------------------------------------------------------------------------
Building components separately
diff --git a/LICENSE-binary b/LICENSE-binary
index 1c734cbe9641..2f81bb40a99d 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -397,8 +397,8 @@ hadoop-tools/hadoop-sls/src/main/html/js/thirdparty/d3.v3.js
hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/static/d3-v4.1.1.min.js
leveldb v1.13
-com.google.protobuf:protobuf-java:3.6.1
-com.google.protobuf:protobuf-java:3.7.1
+com.google.protobuf:protobuf-java:2.5.0
+com.google.protobuf:protobuf-java:3.21.12
com.google.re2j:re2j:1.1
com.jcraft:jsch:0.1.55
com.thoughtworks.paranamer:paranamer:2.3
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
index 30a47c80abdd..10f4880cf7e5 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml
@@ -62,11 +62,6 @@
<artifactId>hadoop-annotations</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.hadoop.thirdparty</groupId>
<artifactId>hadoop-shaded-protobuf_3_21</artifactId>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
index 732274eecd09..1bac976a84c5 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml
@@ -70,6 +70,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
+ <scope>${transient.protobuf2.scope}</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
index 9b26c84ba136..dd96fe604f3d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/pom.xml
@@ -112,10 +112,6 @@
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- </dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
