This is an automated email from the ASF dual-hosted git repository.
guyuqi 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 9f9e622e1 BIGTOP-4019. Upgrade Flink to 1.16.2. (#1194)
9f9e622e1 is described below
commit 9f9e622e1804983c79820e32dda3956894b21965
Author: Kengo Seki <[email protected]>
AuthorDate: Tue Oct 17 15:42:57 2023 +0900
BIGTOP-4019. Upgrade Flink to 1.16.2. (#1194)
---
.../src/common/flink/do-component-build | 4 ---
.../flink/patch0-FLINK-27640-branch-1.15.diff | 39 ----------------------
bigtop.bom | 2 +-
3 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/bigtop-packages/src/common/flink/do-component-build
b/bigtop-packages/src/common/flink/do-component-build
index b6753d483..a2816b91b 100644
--- a/bigtop-packages/src/common/flink/do-component-build
+++ b/bigtop-packages/src/common/flink/do-component-build
@@ -20,10 +20,6 @@ set -ex
#load versions
. `dirname $0`/bigtop.bom
-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"
diff --git
a/bigtop-packages/src/common/flink/patch0-FLINK-27640-branch-1.15.diff
b/bigtop-packages/src/common/flink/patch0-FLINK-27640-branch-1.15.diff
deleted file mode 100644
index cfe8a4815..000000000
--- a/bigtop-packages/src/common/flink/patch0-FLINK-27640-branch-1.15.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-commit f9f989d99b9da64a0cf65e7e19faba3d967a9b8b
-Author: Sergey Nuyanzin <[email protected]>
-Date: Wed Mar 29 21:30:46 2023 +0200
-
- [FLINK-27640][Connector/Hive][SQL Client] Exclude Pentaho dependency from
Hive to avoid build problems with newer Maven versions. Newer Maven versions
block http repositories such as conjars. Conjars is where Pentaho artifacts are
stored (#22299)
-
- Co-authored-by: Martijn Visser <[email protected]>
- (cherry picked from commit 36f39712d289b6b7b0b957a33bd1891266e3f992)
-
-diff --git a/flink-connectors/flink-connector-hive/pom.xml
b/flink-connectors/flink-connector-hive/pom.xml
-index 7d0c36f..81f6a0c 100644
---- a/flink-connectors/flink-connector-hive/pom.xml
-+++ b/flink-connectors/flink-connector-hive/pom.xml
-@@ -508,6 +508,10 @@ under the License.
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>org.pentaho</groupId>
-+
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
-
-diff --git a/flink-table/flink-sql-client/pom.xml
b/flink-table/flink-sql-client/pom.xml
-index f6a0675..9224bd5 100644
---- a/flink-table/flink-sql-client/pom.xml
-+++ b/flink-table/flink-sql-client/pom.xml
-@@ -425,6 +425,10 @@ under the License.
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
-+ <exclusion>
-+ <groupId>org.pentaho</groupId>
-+
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
-+ </exclusion>
- </exclusions>
- </dependency>
-
diff --git a/bigtop.bom b/bigtop.bom
index f6bf61f62..6b3c2ca79 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -235,7 +235,7 @@ bigtop {
name = 'flink'
rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_")
relNotes = 'Apache Flink'
- version { base = '1.15.3'; pkg = base; release = 1 }
+ version { base = '1.16.2'; pkg = base; release = 1 }
tarball { destination = "$name-${version.base}.tar.gz"
source = "$name-${version.base}-src.tgz" }
url { download_path = "/$name/$name-${version.base}"
