You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2022/04/29 23:02:06 UTC
[bigtop] branch branch-3.1 updated: BIGTOP-3675. Building Tez fails due to broken dependency. (#895)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 73572ab7 BIGTOP-3675. Building Tez fails due to broken dependency. (#895)
73572ab7 is described below
commit 73572ab7adc1378cedf0ee9eb3307b3bda6f219c
Author: Kengo Seki <se...@apache.org>
AuthorDate: Sat Apr 30 08:00:20 2022 +0900
BIGTOP-3675. Building Tez fails due to broken dependency. (#895)
(cherry picked from commit a21926df50fcd6167fd09224446d4c7fbcd96dc5)
---
.../src/common/tez/patch1-TEZ-4214.diff | 49 +++++++++
.../common/tez/patch1-snappy-java-dependency.diff | 31 ------
.../src/common/tez/patch2-TEZ-4319.diff | 60 +++++++++++
.../src/common/tez/patch3-TEZ-4411.diff | 119 +++++++++++++++++++++
bigtop.bom | 2 +-
5 files changed, 229 insertions(+), 32 deletions(-)
diff --git a/bigtop-packages/src/common/tez/patch1-TEZ-4214.diff b/bigtop-packages/src/common/tez/patch1-TEZ-4214.diff
new file mode 100644
index 00000000..05659e8c
--- /dev/null
+++ b/bigtop-packages/src/common/tez/patch1-TEZ-4214.diff
@@ -0,0 +1,49 @@
+From 9129644ac96b13879181427e9592d004c86dba17 Mon Sep 17 00:00:00 2001
+From: Igor Dvorzhak <id...@google.com>
+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/patch1-snappy-java-dependency.diff b/bigtop-packages/src/common/tez/patch1-snappy-java-dependency.diff
deleted file mode 100644
index 48a43bbc..00000000
--- a/bigtop-packages/src/common/tez/patch1-snappy-java-dependency.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index 05fcc6d..70cc871 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -333,6 +333,10 @@
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>org.xerial.snappy</groupId>
-+ <artifactId>snappy-java</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
- <dependency>
-diff --git a/tez-api/pom.xml b/tez-api/pom.xml
-index 9c9d7af..5d51e74 100644
---- a/tez-api/pom.xml
-+++ b/tez-api/pom.xml
-@@ -110,6 +110,11 @@
- <artifactId>mockito-all</artifactId>
- <scope>test</scope>
- </dependency>
-+ <dependency>
-+ <groupId>org.xerial.snappy</groupId>
-+ <artifactId>snappy-java</artifactId>
-+ <version>1.1.8.4</version>
-+ </dependency>
- </dependencies>
-
- <build>
diff --git a/bigtop-packages/src/common/tez/patch2-TEZ-4319.diff b/bigtop-packages/src/common/tez/patch2-TEZ-4319.diff
new file mode 100644
index 00000000..e5d0ebdd
--- /dev/null
+++ b/bigtop-packages/src/common/tez/patch2-TEZ-4319.diff
@@ -0,0 +1,60 @@
+From 7725f89271592fc951dd9506ddfd45d2cde9f4e8 Mon Sep 17 00:00:00 2001
+From: Masatake Iwasaki <iw...@apache.org>
+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
+--- a/pom.xml
++++ b/pom.xml
+@@ -65,6 +65,7 @@
+ <slf4j.version>1.7.30</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 @@
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
++ <exclusion>
++ <groupId>org.xerial.snappy</groupId>
++ <artifactId>snappy-java</artifactId>
++ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+@@ -753,6 +758,11 @@
+ <artifactId>leveldbjni-all</artifactId>
+ <version>1.8</version>
+ </dependency>
++ <dependency>
++ <groupId>org.xerial.snappy</groupId>
++ <artifactId>snappy-java</artifactId>
++ <version>${snappy-java.version}</version>
++ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+diff --git a/tez-api/pom.xml b/tez-api/pom.xml
+index 8cab40c17..ddd3e84ae 100644
+--- a/tez-api/pom.xml
++++ b/tez-api/pom.xml
+@@ -115,6 +115,10 @@
+ <artifactId>bcprov-jdk15on</artifactId>
+ <scope>test</scope>
+ </dependency>
++ <dependency>
++ <groupId>org.xerial.snappy</groupId>
++ <artifactId>snappy-java</artifactId>
++ </dependency>
+ </dependencies>
+
+ <build>
diff --git a/bigtop-packages/src/common/tez/patch3-TEZ-4411.diff b/bigtop-packages/src/common/tez/patch3-TEZ-4411.diff
new file mode 100644
index 00000000..030987ab
--- /dev/null
+++ b/bigtop-packages/src/common/tez/patch3-TEZ-4411.diff
@@ -0,0 +1,119 @@
+From 6324552c4ab10c5ac388221439fcc69c87066635 Mon Sep 17 00:00:00 2001
+From: guptanikhil007 <gu...@gmail.com>
+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 <ma...@gmail.com> 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 <gu...@gmail.com>
+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.bom b/bigtop.bom
index 04ad5df3..22d5adf6 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -176,7 +176,7 @@ bigtop {
'tez' {
name = 'tez'
relNotes = 'Apache TEZ'
- version { base = '0.10.0'; pkg = base; release = 1 }
+ version { base = '0.10.1'; pkg = base; release = 1 }
tarball { destination = "apache-${name}-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/${version.base}/"