This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new f30e6d74c BIGTOP-4020. Upgrade Tez to 0.10.2. (#1191)
f30e6d74c is described below
commit f30e6d74cd7497ae151f88458a5e2ed9e82bd5c4
Author: Kengo Seki <[email protected]>
AuthorDate: Mon Oct 16 06:47:03 2023 +0900
BIGTOP-4020. Upgrade Tez to 0.10.2. (#1191)
(cherry picked from commit a98fc1f1905801591db0ede8549d38386a12cb5b)
---
.../src/common/tez/patch0-remove-phantomjs.diff | 8 +-
.../src/common/tez/patch1-TEZ-4214.diff | 49 ---
.../src/common/tez/patch2-TEZ-4319.diff | 32 +-
.../src/common/tez/patch3-TEZ-4411.diff | 119 ------
.../common/tez/patch4-TEZ-4300-and-TEZ-4428.diff | 425 ---------------------
.../src/common/tez/patch5-TEZ-4298.diff | 41 --
.../src/common/tez/patch7-TEZ-4493.diff | 24 --
bigtop.bom | 2 +-
8 files changed, 17 insertions(+), 683 deletions(-)
diff --git a/bigtop-packages/src/common/tez/patch0-remove-phantomjs.diff
b/bigtop-packages/src/common/tez/patch0-remove-phantomjs.diff
index 69396bb47..28aef8959 100644
--- a/bigtop-packages/src/common/tez/patch0-remove-phantomjs.diff
+++ b/bigtop-packages/src/common/tez/patch0-remove-phantomjs.diff
@@ -1,5 +1,7 @@
---- apache-tez-0.9.0-src/tez-ui/src/main/webapp/package.json_ 2017-11-25
17:52:37.868021145 +0000
-+++ apache-tez-0.9.0-src/tez-ui/src/main/webapp/package.json 2017-11-25
17:55:49.390774359 +0000
+diff --git a/tez-ui/src/main/webapp/package.json
b/tez-ui/src/main/webapp/package.json
+index 3500b8aaf..bafe7bf61 100644
+--- a/tez-ui/src/main/webapp/package.json
++++ b/tez-ui/src/main/webapp/package.json
@@ -57,8 +57,7 @@
"ember-truth-helpers": "1.3.0",
"bower-shrinkwrap-resolver-ext": "^0.1.0",
@@ -9,4 +11,4 @@
+ "testem": "0.9.11"
},
"dependencies": {
- "em-helpers": "0.8.0",
+ "em-tgraph": "0.0.14"
diff --git a/bigtop-packages/src/common/tez/patch1-TEZ-4214.diff
b/bigtop-packages/src/common/tez/patch1-TEZ-4214.diff
deleted file mode 100644
index 05659e8cc..000000000
--- a/bigtop-packages/src/common/tez/patch1-TEZ-4214.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-From 9129644ac96b13879181427e9592d004c86dba17 Mon Sep 17 00:00:00 2001
-From: Igor Dvorzhak <[email protected]>
-Date: Sat, 1 Aug 2020 21:32:04 -0700
-Subject: [PATCH] TEZ-4214. Upgrade RoaringBitmap version to 0.7.45
-
----
- pom.xml | 5 +++--
- tez-plugins/tez-aux-services/pom.xml | 1 +
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 1d8194ad5..ba65cc6ad 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -64,11 +64,12 @@
- <jersey.version>1.19</jersey.version>
- <slf4j.version>1.7.30</slf4j.version>
- <protobuf.version>2.5.0</protobuf.version>
-+ <roaringbitmap.version>0.7.45</roaringbitmap.version>
- <protoc.path>${env.PROTOC_PATH}</protoc.path>
- <scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
- <frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
- <findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
--
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
-+ <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
- <checkstyle.version>8.35</checkstyle.version>
- <dependency-check-maven.version>1.3.6</dependency-check-maven.version>
- <test.build.data>${project.build.directory}/tmp</test.build.data>
-@@ -232,7 +233,7 @@
- <dependency>
- <groupId>org.roaringbitmap</groupId>
- <artifactId>RoaringBitmap</artifactId>
-- <version>0.5.21</version>
-+ <version>${roaringbitmap.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
-diff --git a/tez-plugins/tez-aux-services/pom.xml
b/tez-plugins/tez-aux-services/pom.xml
-index 965663ce4..2a936d6fa 100644
---- a/tez-plugins/tez-aux-services/pom.xml
-+++ b/tez-plugins/tez-aux-services/pom.xml
-@@ -195,6 +195,7 @@
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
-+ <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
diff --git a/bigtop-packages/src/common/tez/patch2-TEZ-4319.diff
b/bigtop-packages/src/common/tez/patch2-TEZ-4319.diff
index e5d0ebdd7..40e9e687d 100644
--- a/bigtop-packages/src/common/tez/patch2-TEZ-4319.diff
+++ b/bigtop-packages/src/common/tez/patch2-TEZ-4319.diff
@@ -1,26 +1,16 @@
-From 7725f89271592fc951dd9506ddfd45d2cde9f4e8 Mon Sep 17 00:00:00 2001
-From: Masatake Iwasaki <[email protected]>
-Date: Wed, 14 Jul 2021 07:53:26 +0000
-Subject: [PATCH] TEZ-4319. Add explicit dependency on snappy-java to tez-api.
-
----
- pom.xml | 10 ++++++++++
- tez-api/pom.xml | 4 ++++
- 2 files changed, 14 insertions(+)
-
diff --git a/pom.xml b/pom.xml
-index ba65cc6ad..a58f62482 100644
+index 840ab74e4..893a68fa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,7 @@
- <slf4j.version>1.7.30</slf4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
<protobuf.version>2.5.0</protobuf.version>
<roaringbitmap.version>0.7.45</roaringbitmap.version>
+ <snappy-java.version>1.1.8.4</snappy-java.version>
<protoc.path>${env.PROTOC_PATH}</protoc.path>
<scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
- <frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
-@@ -345,6 +346,10 @@
+ <frontend-maven-plugin.version>1.8.0</frontend-maven-plugin.version>
+@@ -363,6 +364,10 @@
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
@@ -28,10 +18,10 @@ index ba65cc6ad..a58f62482 100644
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-@@ -753,6 +758,11 @@
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+@@ -764,6 +769,11 @@
<artifactId>leveldbjni-all</artifactId>
<version>1.8</version>
</dependency>
@@ -44,7 +34,7 @@ index ba65cc6ad..a58f62482 100644
</dependencyManagement>
diff --git a/tez-api/pom.xml b/tez-api/pom.xml
-index 8cab40c17..ddd3e84ae 100644
+index 5c11fdc3b..57acc4e12 100644
--- a/tez-api/pom.xml
+++ b/tez-api/pom.xml
@@ -115,6 +115,10 @@
@@ -52,8 +42,8 @@ index 8cab40c17..ddd3e84ae 100644
<scope>test</scope>
</dependency>
+ <dependency>
-+ <groupId>org.xerial.snappy</groupId>
-+ <artifactId>snappy-java</artifactId>
++ <groupId>org.xerial.snappy</groupId>
++ <artifactId>snappy-java</artifactId>
+ </dependency>
</dependencies>
diff --git a/bigtop-packages/src/common/tez/patch3-TEZ-4411.diff
b/bigtop-packages/src/common/tez/patch3-TEZ-4411.diff
deleted file mode 100644
index 030987ab3..000000000
--- a/bigtop-packages/src/common/tez/patch3-TEZ-4411.diff
+++ /dev/null
@@ -1,119 +0,0 @@
-From 6324552c4ab10c5ac388221439fcc69c87066635 Mon Sep 17 00:00:00 2001
-From: guptanikhil007 <[email protected]>
-Date: Tue, 26 Apr 2022 16:12:13 +0530
-Subject: [PATCH 1/2] TEZ-4411: Update FileSaver dependency
-
----
- tez-ui/src/main/resources/META-INF/LICENSE.txt | 2 +-
- tez-ui/src/main/webapp/bower-shrinkwrap.json | 6 +++---
- tez-ui/src/main/webapp/bower.json | 4 ++--
- tez-ui/src/main/webapp/ember-cli-build.js | 2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tez-ui/src/main/resources/META-INF/LICENSE.txt
b/tez-ui/src/main/resources/META-INF/LICENSE.txt
-index 608dc614c8..833a2b00c6 100644
---- a/tez-ui/src/main/resources/META-INF/LICENSE.txt
-+++ b/tez-ui/src/main/resources/META-INF/LICENSE.txt
-@@ -224,7 +224,7 @@ The Apache TEZ tez-ui bundles the following files under
the MIT License:
- - jquery-ui v1.11.4 (http://jqueryui.com/) - Copyright 2014 jQuery
Foundation and other contributors
- - jquery-mousewheel v3.1.13 (https://github.com/jquery/jquery-mousewheel) -
Copyright 2006, 2014 jQuery Foundation and other contributors,
https://jquery.org/
- - CodeMirror 5.11.0 (https://codemirror.net/) - Copyright (C) 2015 by Marijn
Haverbeke <[email protected]> and others
-- - file-saver.js v1.20150507.2 (https://github.com/Teleborder/FileSaver.js) -
Authored by Eli Grey
-+ - file-saver v1.3.4 (https://github.com/eligrey/FileSaver.js) - Authored by
Eli Grey
- - moment v2.12.0 (http://momentjs.com/) - Copyright (c) 2011-2015 Tim Wood,
Iskren Chernev, Moment.js contributors
- - moment-timezone v0.5.0 (http://momentjs.com/timezone/) - Copyright (c)
2014 Tim Wood
- - font-awesome css/less files v4.5.0 (http://fontawesome.io/) - Created by
Dave Gandy
-diff --git a/tez-ui/src/main/webapp/bower-shrinkwrap.json
b/tez-ui/src/main/webapp/bower-shrinkwrap.json
-index 357d57691a..224a53dfc9 100644
---- a/tez-ui/src/main/webapp/bower-shrinkwrap.json
-+++ b/tez-ui/src/main/webapp/bower-shrinkwrap.json
-@@ -2,9 +2,6 @@
- "https://github.com/FortAwesome/Font-Awesome.git": {
- "4.5.0": "593ad563a987977f14102be935d0abc2a172903e"
- },
-- "https://github.com/Teleborder/FileSaver.js.git": {
-- "1.20150507.2": "b7cf622909258086bc63ad764d08fcaed780ab42"
-- },
- "https://github.com/adamwdraper/Numeral-js.git": {
- "1.5.3": "f97f14bb8bab988f28f1d854525b4cfeff8ec9e1"
- },
-@@ -26,6 +23,9 @@
- "https://github.com/dockyard/qunit-notifications.git": {
- "0.1.1": "7a13f6dba5a340e1cb9e0b64c1c711e4d7edaca1"
- },
-+ "https://github.com/eligrey/FileSaver.js.git": {
-+ "1.3.4": "b4a918669accb81f184c610d741a4a8e1306aa27"
-+ },
- "https://github.com/ember-cli/ember-cli-shims.git": {
- "0.0.6": "dcab43b58d5698690050bb9a46ead5c8663c7da1"
- },
-diff --git a/tez-ui/src/main/webapp/bower.json
b/tez-ui/src/main/webapp/bower.json
-index cca56d817a..dbae67a7a5 100644
---- a/tez-ui/src/main/webapp/bower.json
-+++ b/tez-ui/src/main/webapp/bower.json
-@@ -22,7 +22,7 @@
- "snippet-ss": "1.11.0",
- "jquery-mousewheel": "3.1.13",
- "codemirror": "5.11.0",
-- "file-saver.js": "1.20150507.2",
-- "zip-js": "1.0.0"
-+ "zip-js": "1.0.0",
-+ "file-saver": "1.3.4"
- }
- }
-diff --git a/tez-ui/src/main/webapp/ember-cli-build.js
b/tez-ui/src/main/webapp/ember-cli-build.js
-index e4217e9591..f34092c52a 100644
---- a/tez-ui/src/main/webapp/ember-cli-build.js
-+++ b/tez-ui/src/main/webapp/ember-cli-build.js
-@@ -64,7 +64,7 @@ module.exports = function(defaults) {
-
- app.import('bower_components/more-js/dist/more.js');
-
-- app.import('bower_components/file-saver.js/FileSaver.js');
-+ app.import('bower_components/file-saver/FileSaver.js');
- app.import('bower_components/zip-js/WebContent/zip.js');
-
- app.import('bower_components/codemirror/lib/codemirror.js');
-
-From ab17daa96215b09c2ab1357d69eb9036ec1822f2 Mon Sep 17 00:00:00 2001
-From: guptanikhil007 <[email protected]>
-Date: Fri, 29 Apr 2022 10:59:17 +0530
-Subject: [PATCH 2/2] Update file-saver version
-
----
- tez-ui/src/main/webapp/bower-shrinkwrap.json | 4 ++--
- tez-ui/src/main/webapp/bower.json | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tez-ui/src/main/webapp/bower-shrinkwrap.json
b/tez-ui/src/main/webapp/bower-shrinkwrap.json
-index 224a53dfc9..c8c506edce 100644
---- a/tez-ui/src/main/webapp/bower-shrinkwrap.json
-+++ b/tez-ui/src/main/webapp/bower-shrinkwrap.json
-@@ -24,7 +24,7 @@
- "0.1.1": "7a13f6dba5a340e1cb9e0b64c1c711e4d7edaca1"
- },
- "https://github.com/eligrey/FileSaver.js.git": {
-- "1.3.4": "b4a918669accb81f184c610d741a4a8e1306aa27"
-+ "1.2.0": "a6d11998e279e94f2926b2a897231355dfab48ab"
- },
- "https://github.com/ember-cli/ember-cli-shims.git": {
- "0.0.6": "dcab43b58d5698690050bb9a46ead5c8663c7da1"
-@@ -69,4 +69,4 @@
- "https://github.com/twbs/bootstrap.git": {
- "3.3.6": "81df608a40bf0629a1dc08e584849bb1e43e0b7a"
- }
--}
-\ No newline at end of file
-+}
-diff --git a/tez-ui/src/main/webapp/bower.json
b/tez-ui/src/main/webapp/bower.json
-index dbae67a7a5..fb0498f11e 100644
---- a/tez-ui/src/main/webapp/bower.json
-+++ b/tez-ui/src/main/webapp/bower.json
-@@ -23,6 +23,6 @@
- "jquery-mousewheel": "3.1.13",
- "codemirror": "5.11.0",
- "zip-js": "1.0.0",
-- "file-saver": "1.3.4"
-+ "file-saver": "v1.2.0"
- }
- }
diff --git a/bigtop-packages/src/common/tez/patch4-TEZ-4300-and-TEZ-4428.diff
b/bigtop-packages/src/common/tez/patch4-TEZ-4300-and-TEZ-4428.diff
deleted file mode 100644
index 5751181a1..000000000
--- a/bigtop-packages/src/common/tez/patch4-TEZ-4300-and-TEZ-4428.diff
+++ /dev/null
@@ -1,425 +0,0 @@
-diff --git a/.travis.yml b/.travis.yml
-index 3637a0def..65eaf7778 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -22,9 +22,6 @@ sudo: required
-
- env: MAVEN_OPTS="-Xmx2G -XX:MaxPermSize=512M"
-
--before_install:
-- - ./build-tools/install-protobuf.sh
--
- script:
- - jdk_switcher use oraclejdk8
- - mvn -B clean install package -DskipTests=true -Dmaven.javadoc.skip=true
-diff --git a/BUILDING.txt b/BUILDING.txt
-index 875bf3e09..8b89a559d 100644
---- a/BUILDING.txt
-+++ b/BUILDING.txt
-@@ -117,13 +117,16 @@ It's important to note that maven will still include
tez-ui project, but all of
-
----------------------------------------------------------------------------------
- Protocol Buffer compiler:
-
--The version of Protocol Buffer compiler, protoc, must be 2.5.0 and match the
--version of the protobuf JAR.
-+The version of Protocol Buffer compiler, protoc, can be defined on-the-fly as:
-+ $ mvn clean install -DskipTests -pl ./tez-api -Dprotobuf.version=3.7.1
-
--If you have multiple versions of protoc in your system, you can set in your
--build shell the PROTOC_PATH environment variable to point to the one you
--want to use for the Tez build. If you don't define this environment variable,
--protoc is looked up in the PATH.
-+The default version is defined in the root pom.xml.
-+
-+If you have multiple versions of protoc in your system, you can set in your
-+build shell the PROTOC_PATH environment variable to point to the one you
-+want to use for the Tez build. If you don't define this environment variable
then the
-+embedded protoc compiler will be used with the version defined in
${protobuf.version}.
-+It detects the platform and executes the corresponding protoc binary at build
time.
-
- You can also specify the path to protoc while building using -Dprotoc.path
-
-diff --git a/build-tools/.gitignore b/build-tools/.gitignore
-new file mode 100644
-index 000000000..adfc42ea4
---- /dev/null
-+++ b/build-tools/.gitignore
-@@ -0,0 +1,2 @@
-+protobuf
-+
-diff --git a/build-tools/install-protobuf.sh b/build-tools/install-protobuf.sh
-deleted file mode 100755
-index 902049dab..000000000
---- a/build-tools/install-protobuf.sh
-+++ /dev/null
-@@ -1,22 +0,0 @@
--#!/bin/sh
--
--# Licensed to the Apache Software Foundation (ASF) under one
--# or more contributor license agreements. See the NOTICE file
--# distributed with this work for additional information
--# regarding copyright ownership. The ASF licenses this file
--# to you under the Apache License, Version 2.0 (the
--# "License"); you may not use this file except in compliance
--# with the License. You may obtain a copy of the License at
--#
--# http://www.apache.org/licenses/LICENSE-2.0
--#
--# Unless required by applicable law or agreed to in writing, software
--# distributed under the License is distributed on an "AS IS" BASIS,
--# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--# See the License for the specific language governing permissions and
--# limitations under the License.
--
--set -ex
--wget
https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz
--tar -xzvf protobuf-2.5.0.tar.gz
--cd protobuf-2.5.0 && ./configure --prefix=/usr && make && sudo make install
-diff --git a/tez-api/pom.xml b/tez-api/pom.xml
-index 71a692351..ef682bcf1 100644
---- a/tez-api/pom.xml
-+++ b/tez-api/pom.xml
-@@ -150,30 +150,27 @@
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- <plugin>
-- <groupId>org.apache.hadoop</groupId>
-- <artifactId>hadoop-maven-plugins</artifactId>
-+ <groupId>com.github.os72</groupId>
-+ <artifactId>protoc-jar-maven-plugin</artifactId>
-+ <version>3.11.4</version>
- <executions>
- <execution>
-- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
-- <goal>protoc</goal>
-+ <goal>run</goal>
- </goals>
- <configuration>
-- <protocVersion>${protobuf.version}</protocVersion>
-+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
- <protocCommand>${protoc.path}</protocCommand>
-- <imports>
-- <param>${basedir}/src/main/proto</param>
-- </imports>
-- <source>
-- <directory>${basedir}/src/main/proto</directory>
-- <includes>
-- <include>DAGApiRecords.proto</include>
-- <include>DAGClientAMProtocol.proto</include>
-- <include>Events.proto</include>
-- </includes>
-- </source>
--
<output>${project.build.directory}/generated-sources/java</output>
-+ <addSources>none</addSources>
-+ <inputDirectories>
-+ <include>${basedir}/src/main/proto</include>
-+ </inputDirectories>
-+ <outputTargets>
-+ <outputTarget>
-+
<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
-+ </outputTarget>
-+ </outputTargets>
- </configuration>
- </execution>
- </executions>
-diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
-index a052b320a..83fe50edd 100644
---- a/tez-dag/pom.xml
-+++ b/tez-dag/pom.xml
-@@ -207,30 +207,31 @@
- </configuration>
- </plugin>
- <plugin>
-- <groupId>org.apache.hadoop</groupId>
-- <artifactId>hadoop-maven-plugins</artifactId>
-+ <groupId>com.github.os72</groupId>
-+ <artifactId>protoc-jar-maven-plugin</artifactId>
-+ <version>3.11.4</version>
- <executions>
- <execution>
-- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
-- <goal>protoc</goal>
-+ <goal>run</goal>
- </goals>
- <configuration>
-- <protocVersion>${protobuf.version}</protocVersion>
-+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
- <protocCommand>${protoc.path}</protocCommand>
-- <imports>
-- <param>${basedir}/src/main/proto</param>
-- <param>${basedir}/../tez-api/src/main/proto</param>
--
<param>${basedir}/../tez-runtime-internals/src/main/proto</param>
-- </imports>
-- <source>
-- <directory>${basedir}/src/main/proto</directory>
-- <includes>
-- <include>HistoryEvents.proto</include>
-- </includes>
-- </source>
--
<output>${project.build.directory}/generated-sources/java</output>
-+ <addSources>none</addSources>
-+ <includeDirectories>
-+ <include>${basedir}/../tez-api/src/main/proto</include>
-+
<include>${basedir}/../tez-runtime-internals/src/main/proto</include>
-+ </includeDirectories>
-+ <inputDirectories>
-+ <include>${basedir}/src/main/proto</include>
-+ </inputDirectories>
-+ <outputTargets>
-+ <outputTarget>
-+
<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
-+ </outputTarget>
-+ </outputTargets>
- </configuration>
- </execution>
- </executions>
-diff --git a/tez-ext-service-tests/pom.xml b/tez-ext-service-tests/pom.xml
-index d98e2343c..c57aec565 100644
---- a/tez-ext-service-tests/pom.xml
-+++ b/tez-ext-service-tests/pom.xml
-@@ -161,29 +161,30 @@
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- <plugin>
-- <groupId>org.apache.hadoop</groupId>
-- <artifactId>hadoop-maven-plugins</artifactId>
-+ <groupId>com.github.os72</groupId>
-+ <artifactId>protoc-jar-maven-plugin</artifactId>
-+ <version>3.11.4</version>
- <executions>
- <execution>
-- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
-- <goal>protoc</goal>
-+ <goal>run</goal>
- </goals>
- <configuration>
-- <protocVersion>${protobuf.version}</protocVersion>
-+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
- <protocCommand>${protoc.path}</protocCommand>
-- <imports>
-- <param>${basedir}/src/test/proto</param>
-+ <addSources>none</addSources>
-+ <includeDirectories>
- <param>${basedir}/../tez-api/src/main/proto</param>
-- </imports>
-- <source>
-- <directory>${basedir}/src/test/proto</directory>
-- <includes>
-- <include>TezDaemonProtocol.proto</include>
-- </includes>
-- </source>
--
<output>${project.build.directory}/generated-test-sources/java</output>
-+ </includeDirectories>
-+ <inputDirectories>
-+ <include>${basedir}/src/test/proto</include>
-+ </inputDirectories>
-+ <outputTargets>
-+ <outputTarget>
-+
<outputDirectory>${project.build.directory}/generated-test-sources/java</outputDirectory>
-+ </outputTarget>
-+ </outputTargets>
- </configuration>
- </execution>
- </executions>
-diff --git a/tez-mapreduce/pom.xml b/tez-mapreduce/pom.xml
-index 5dc016f9c..8a22afac2 100644
---- a/tez-mapreduce/pom.xml
-+++ b/tez-mapreduce/pom.xml
-@@ -133,28 +133,27 @@
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- <plugin>
-- <groupId>org.apache.hadoop</groupId>
-- <artifactId>hadoop-maven-plugins</artifactId>
-+ <groupId>com.github.os72</groupId>
-+ <artifactId>protoc-jar-maven-plugin</artifactId>
-+ <version>3.11.4</version>
- <executions>
- <execution>
-- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
-- <goal>protoc</goal>
-+ <goal>run</goal>
- </goals>
- <configuration>
-- <protocVersion>${protobuf.version}</protocVersion>
-+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
- <protocCommand>${protoc.path}</protocCommand>
-- <imports>
-- <param>${basedir}/src/main/proto</param>
-- </imports>
-- <source>
-- <directory>${basedir}/src/main/proto</directory>
-- <includes>
-- <include>MRRuntimeProtos.proto</include>
-- </includes>
-- </source>
--
<output>${project.build.directory}/generated-sources/java</output>
-+ <addSources>none</addSources>
-+ <inputDirectories>
-+ <include>${basedir}/src/main/proto</include>
-+ </inputDirectories>
-+ <outputTargets>
-+ <outputTarget>
-+
<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
-+ </outputTarget>
-+ </outputTargets>
- </configuration>
- </execution>
- </executions>
-diff --git a/tez-plugins/tez-protobuf-history-plugin/pom.xml
b/tez-plugins/tez-protobuf-history-plugin/pom.xml
-index e11767f54..829597d02 100644
---- a/tez-plugins/tez-protobuf-history-plugin/pom.xml
-+++ b/tez-plugins/tez-protobuf-history-plugin/pom.xml
-@@ -59,34 +59,31 @@
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- <plugin>
-- <groupId>org.apache.hadoop</groupId>
-- <artifactId>hadoop-maven-plugins</artifactId>
-+ <groupId>com.github.os72</groupId>
-+ <artifactId>protoc-jar-maven-plugin</artifactId>
-+ <version>3.11.4</version>
- <executions>
- <execution>
-- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
-- <goal>protoc</goal>
-+ <goal>run</goal>
- </goals>
- <configuration>
-- <protocVersion>${protobuf.version}</protocVersion>
-+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
- <protocCommand>${protoc.path}</protocCommand>
-- <imports>
-- <param>${basedir}/src/main/proto</param>
-- </imports>
-- <source>
-- <directory>${basedir}/src/main/proto</directory>
-- <includes>
-- <include>HistoryLogger.proto</include>
-- </includes>
-- </source>
--
<output>${project.build.directory}/generated-sources/java</output>
-+ <addSources>none</addSources>
-+ <inputDirectories>
-+ <include>${basedir}/src/main/proto</include>
-+ </inputDirectories>
-+ <outputTargets>
-+ <outputTarget>
-+
<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
-+ </outputTarget>
-+ </outputTargets>
- </configuration>
- </execution>
- </executions>
- </plugin>
--
- </plugins>
- </build>
--
- </project>
-diff --git a/tez-runtime-internals/pom.xml b/tez-runtime-internals/pom.xml
-index dcfd4ef70..2bea0d093 100644
---- a/tez-runtime-internals/pom.xml
-+++ b/tez-runtime-internals/pom.xml
-@@ -87,28 +87,27 @@
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- <plugin>
-- <groupId>org.apache.hadoop</groupId>
-- <artifactId>hadoop-maven-plugins</artifactId>
-+ <groupId>com.github.os72</groupId>
-+ <artifactId>protoc-jar-maven-plugin</artifactId>
-+ <version>3.11.4</version>
- <executions>
- <execution>
-- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
-- <goal>protoc</goal>
-+ <goal>run</goal>
- </goals>
- <configuration>
-- <protocVersion>${protobuf.version}</protocVersion>
-+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
- <protocCommand>${protoc.path}</protocCommand>
-- <imports>
-- <param>${basedir}/src/main/proto</param>
-- </imports>
-- <source>
-- <directory>${basedir}/src/main/proto</directory>
-- <includes>
-- <include>RuntimeEvents.proto</include>
-- </includes>
-- </source>
--
<output>${project.build.directory}/generated-sources/java</output>
-+ <addSources>none</addSources>
-+ <inputDirectories>
-+ <include>${basedir}/src/main/proto</include>
-+ </inputDirectories>
-+ <outputTargets>
-+ <outputTarget>
-+
<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
-+ </outputTarget>
-+ </outputTargets>
- </configuration>
- </execution>
- </executions>
-diff --git a/tez-runtime-library/pom.xml b/tez-runtime-library/pom.xml
-index 658417a7b..1e62c0cec 100644
---- a/tez-runtime-library/pom.xml
-+++ b/tez-runtime-library/pom.xml
-@@ -110,30 +110,27 @@
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- <plugin>
-- <groupId>org.apache.hadoop</groupId>
-- <artifactId>hadoop-maven-plugins</artifactId>
-+ <groupId>com.github.os72</groupId>
-+ <artifactId>protoc-jar-maven-plugin</artifactId>
-+ <version>3.11.4</version>
- <executions>
- <execution>
-- <id>compile-protoc</id>
- <phase>generate-sources</phase>
- <goals>
-- <goal>protoc</goal>
-+ <goal>run</goal>
- </goals>
- <configuration>
-- <protocVersion>${protobuf.version}</protocVersion>
-+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
- <protocCommand>${protoc.path}</protocCommand>
-- <imports>
-- <param>${basedir}/src/main/proto</param>
-- </imports>
-- <source>
-- <directory>${basedir}/src/main/proto</directory>
-- <includes>
-- <include>ShufflePayloads.proto</include>
-- <include>CartesianProductPayload.proto</include>
-- <include>FairShufflePayloads.proto</include>
-- </includes>
-- </source>
--
<output>${project.build.directory}/generated-sources/java</output>
-+ <addSources>none</addSources>
-+ <inputDirectories>
-+ <include>${basedir}/src/main/proto</include>
-+ </inputDirectories>
-+ <outputTargets>
-+ <outputTarget>
-+
<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
-+ </outputTarget>
-+ </outputTargets>
- </configuration>
- </execution>
- </executions>
diff --git a/bigtop-packages/src/common/tez/patch5-TEZ-4298.diff
b/bigtop-packages/src/common/tez/patch5-TEZ-4298.diff
deleted file mode 100644
index 9dabc35e6..000000000
--- a/bigtop-packages/src/common/tez/patch5-TEZ-4298.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/tez-plugins/tez-aux-services/findbugs-exclude.xml
b/tez-plugins/tez-aux-services/findbugs-exclude.xml
-index 5b11308f6..adfd7041a 100644
---- a/tez-plugins/tez-aux-services/findbugs-exclude.xml
-+++ b/tez-plugins/tez-aux-services/findbugs-exclude.xml
-@@ -12,5 +12,10 @@
- limitations under the License. See accompanying LICENSE file.
- -->
- <FindBugsFilter>
--
-+ <!-- TEZ-4298 -->
-+ <Match>
-+ <Class name="org.apache.tez.auxservices.ShuffleHandler"/>
-+ <Method name="recordJobShuffleInfo"/>
-+ <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
-+ </Match>
- </FindBugsFilter>
-diff --git
a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java
b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java
-index e73805a1f..fb28a0f4b 100644
----
a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java
-+++
b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java
-@@ -153,7 +153,6 @@ import com.google.common.cache.LoadingCache;
- import com.google.common.cache.RemovalListener;
- import com.google.common.cache.RemovalNotification;
- import com.google.common.cache.Weigher;
--import com.google.protobuf.ByteString;
-
- public class ShuffleHandler extends AuxiliaryService {
-
-@@ -796,9 +795,10 @@ public class ShuffleHandler extends AuxiliaryService {
- private void recordJobShuffleInfo(JobID jobId, String user,
- Token<JobTokenIdentifier> jobToken) throws IOException {
- if (stateDb != null) {
-+ // Discover type instead of assuming ByteString to allow for shading.
- TokenProto tokenProto = TokenProto.newBuilder()
-- .setIdentifier(ByteString.copyFrom(jobToken.getIdentifier()))
-- .setPassword(ByteString.copyFrom(jobToken.getPassword()))
-+
.setIdentifier(TokenProto.getDefaultInstance().getIdentifier().copyFrom(jobToken.getIdentifier()))
-+
.setPassword(TokenProto.getDefaultInstance().getPassword().copyFrom(jobToken.getPassword()))
- .setKind(jobToken.getKind().toString())
- .setService(jobToken.getService().toString())
- .build();
diff --git a/bigtop-packages/src/common/tez/patch7-TEZ-4493.diff
b/bigtop-packages/src/common/tez/patch7-TEZ-4493.diff
index a7583ce17..59f861519 100644
--- a/bigtop-packages/src/common/tez/patch7-TEZ-4493.diff
+++ b/bigtop-packages/src/common/tez/patch7-TEZ-4493.diff
@@ -1,27 +1,3 @@
-commit 0fc920ec3739a766dfac82120c3c17a091d13213
-Author: Ayush Saxena <[email protected]>
-Date: Fri Jun 30 01:24:00 2023 +0530
-
- TEZ-4493: Upgrade Hadoop to 3.3.6. (#285) (Ayush Saxena reviewed by Laszlo
Bodor)
-
- (cherry picked from commit 50380751b7e7e628aeb40a985b94aba98d2a88db)
-
- Conflicts:
- pom.xml
-
-diff --git a/pom.xml b/pom.xml
-index f5a526ae2..25efcea21 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -58,7 +58,7 @@
-
- <clover.license>${user.home}/clover.license</clover.license>
- <guava.version>27.0-jre</guava.version>
-- <hadoop.version>3.1.3</hadoop.version>
-+ <hadoop.version>3.3.6</hadoop.version>
- <netty.version>4.0.52.Final</netty.version>
- <pig.version>0.13.0</pig.version>
- <jersey.version>1.19</jersey.version>
diff --git a/tez-dag/src/main/java/org/apache/tez/state/StateMachineTez.java
b/tez-dag/src/main/java/org/apache/tez/state/StateMachineTez.java
index 3be771892..cbb838d7f 100644
--- a/tez-dag/src/main/java/org/apache/tez/state/StateMachineTez.java
diff --git a/bigtop.bom b/bigtop.bom
index 77e4b3782..c2078117e 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -185,7 +185,7 @@ bigtop {
name = 'tez'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
relNotes = 'Apache TEZ'
- version { base = '0.10.1'; pkg = base; release = 1 }
+ version { base = '0.10.2'; pkg = base; release = 1 }
tarball { destination = "apache-${name}-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/${version.base}/"
