You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by se...@apache.org on 2022/06/06 23:01:00 UTC
[bigtop] branch master updated: BIGTOP-3692: Upgrade flink version to 1.15.0 (#909)
This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 8d87cd2b BIGTOP-3692: Upgrade flink version to 1.15.0 (#909)
8d87cd2b is described below
commit 8d87cd2bc09492f79ed56f2925c56641db0ecfaf
Author: Leona Yoda <yo...@oss.nttdata.com>
AuthorDate: Tue Jun 7 08:00:55 2022 +0900
BIGTOP-3692: Upgrade flink version to 1.15.0 (#909)
* upgrade flink version to 1.15.0 and add patches for husky
* use python3 in rpmbuild to avoid bytecompilation errors
---
.../src/common/flink/do-component-build | 15 ++++++
.../src/common/flink/patch0-FLINK-25472.diff | 58 ----------------------
bigtop-packages/src/rpm/flink/SPECS/flink.spec | 1 +
bigtop.bom | 2 +-
4 files changed, 17 insertions(+), 59 deletions(-)
diff --git a/bigtop-packages/src/common/flink/do-component-build b/bigtop-packages/src/common/flink/do-component-build
index faec8177..b6753d48 100644
--- a/bigtop-packages/src/common/flink/do-component-build
+++ b/bigtop-packages/src/common/flink/do-component-build
@@ -24,6 +24,21 @@ if [ $HOSTTYPE = "powerpc64le" ] ; then
sed -i "s|<nodeVersion>v10.9.0</nodeVersion>|<nodeVersion>v12.22.1</nodeVersion>|" flink-runtime-web/pom.xml
fi
+# husky have to be executed from the path that .git exists
+git_path="$(cd $(dirname $0)/../../../.. && pwd)"
+cmd_from="cd ../.. && husky install flink-runtime-web/web-dashboard/.husky"
+repl_from=$(sed -e 's/[&\\/]/\\&/g; s/$/\\/' -e '$s/\\$//' <<<"$cmd_from")
+if [[ "$0" == *rpm* ]]; then
+ package_json_path="build/flink/rpm/BUILD/flink-$FLINK_VERSION/flink-runtime-web/web-dashboard"
+ cmd_to="cd $git_path && husky install $package_json_path/.husky"
+ repl_to=$(sed -e 's/[&\\/]/\\&/g; s/$/\\/' -e '$s/\\$//' <<<"$cmd_to")
+elif [[ "$0" == *debian* ]]; then
+ package_json_path="output/flink/flink-$FLINK_VERSION/flink-runtime-web/web-dashboard"
+ cmd_to="cd $git_path && husky install $package_json_path/.husky"
+ repl_to=$(sed -e 's/[&\\/]/\\&/g; s/$/\\/' -e '$s/\\$//' <<<"$cmd_to")
+fi
+sed -i "s/$repl_from/$repl_to/" flink-runtime-web/web-dashboard/package.json
+
# Use Maven to build Flink from source
mvn install $FLINK_BUILD_OPTS -Drat.skip=true -DskipTests -Dhadoop.version=$HADOOP_VERSION "$@"
cd flink-dist
diff --git a/bigtop-packages/src/common/flink/patch0-FLINK-25472.diff b/bigtop-packages/src/common/flink/patch0-FLINK-25472.diff
deleted file mode 100644
index 5b2dd8dc..00000000
--- a/bigtop-packages/src/common/flink/patch0-FLINK-25472.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/docs/dev/project-configuration.md b/docs/dev/project-configuration.md
-index d6443012..15d597c3 100644
---- a/docs/dev/project-configuration.md
-+++ b/docs/dev/project-configuration.md
-@@ -305,7 +305,7 @@ ext {
- flinkVersion = '{{ site.version }}'
- scalaBinaryVersion = '{{ site.scala_version }}'
- slf4jVersion = '1.7.15'
-- log4jVersion = '2.15.0'
-+ log4jVersion = '2.17.1'
- }
-
-
-diff --git a/docs/dev/project-configuration.zh.md b/docs/dev/project-configuration.zh.md
-index d6443012..15d597c3 100644
---- a/docs/dev/project-configuration.zh.md
-+++ b/docs/dev/project-configuration.zh.md
-@@ -305,7 +305,7 @@ ext {
- flinkVersion = '{{ site.version }}'
- scalaBinaryVersion = '{{ site.scala_version }}'
- slf4jVersion = '1.7.15'
-- log4jVersion = '2.15.0'
-+ log4jVersion = '2.17.1'
- }
-
-
-diff --git a/pom.xml b/pom.xml
-index 333e5e29..cb80a410 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -108,7 +108,7 @@ under the License.
- <akka.version>2.5.21</akka.version>
- <java.version>1.8</java.version>
- <slf4j.version>1.7.15</slf4j.version>
-- <log4j.version>2.16.0</log4j.version>
-+ <log4j.version>2.17.1</log4j.version>
- <!-- Overwrite default values from parent pom.
- Intellij is (sometimes?) using those values to choose target language level
- and thus is changing back to java 1.6 on each maven re-import -->
-diff --git a/tools/releasing/NOTICE-binary_PREAMBLE.txt b/tools/releasing/NOTICE-binary_PREAMBLE.txt
-index 257fcc70..6228b0bd 100644
---- a/tools/releasing/NOTICE-binary_PREAMBLE.txt
-+++ b/tools/releasing/NOTICE-binary_PREAMBLE.txt
-@@ -8,10 +8,10 @@ Copyright 2014-2021 The Apache Software Foundation
-
- This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
--- org.apache.logging.log4j:log4j-api:2.16.0
--- org.apache.logging.log4j:log4j-core:2.16.0
--- org.apache.logging.log4j:log4j-slf4j-impl:2.16.0
--- org.apache.logging.log4j:log4j-1.2-api:2.16.0
-+- org.apache.logging.log4j:log4j-api:2.17.1
-+- org.apache.logging.log4j:log4j-core:2.17.1
-+- org.apache.logging.log4j:log4j-slf4j-impl:2.17.1
-+- org.apache.logging.log4j:log4j-1.2-api:2.17.1
-
- This project bundles the following dependencies under the BSD license.
- See bundled license files for details.
diff --git a/bigtop-packages/src/rpm/flink/SPECS/flink.spec b/bigtop-packages/src/rpm/flink/SPECS/flink.spec
index fbd30c98..79b96420 100644
--- a/bigtop-packages/src/rpm/flink/SPECS/flink.spec
+++ b/bigtop-packages/src/rpm/flink/SPECS/flink.spec
@@ -22,6 +22,7 @@
%define flink_services flink-jobmanager flink-taskmanager
%define var_log_flink /var/log/%{flink_name}
%define build_target_flink flink-dist/target/%{flink_name}-%{flink_version}-bin/%{flink_name}-%{flink_version}/
+%global __python %{__python3}
%if %{!?suse_version:1}0
diff --git a/bigtop.bom b/bigtop.bom
index 296a5388..97dbaf6e 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -233,7 +233,7 @@ bigtop {
'flink' {
name = 'flink'
relNotes = 'Apache Flink'
- version { base = '1.11.6'; pkg = base; release = 1 }
+ version { base = '1.15.0'; pkg = base; release = 1 }
tarball { destination = "$name-${version.base}.tar.gz"
source = "$name-${version.base}-src.tgz" }
url { download_path = "/$name/$name-${version.base}"