From 84783b9779b528ab85298a4630f62fe9c2299560 Mon Sep 17 00:00:00 2001
From: Raymond Xu <2701446+xushiyan@users.noreply.github.com>
Date: Tue, 12 Apr 2022 08:33:48 -0700
Subject: [PATCH] [HUDI-3843] Make flink profiles build with scala-2.11 (#5279)

---
 README.md                              | 12 ++++++++++++
 scripts/release/deploy_staging_jars.sh |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/README.md b/README.md
index e646463ba..78d8113ec 100644
--- a/README.md
+++ b/README.md
@@ -101,6 +101,18 @@ mvn clean package -DskipTests -Pspark2.4,scala-2.12
 
 Starting from versions 0.11, Hudi no longer requires `spark-avro` to be specified using `--packages`
 
+### Build with different Flink versions
+
+The default Flink version supported is 1.14. Refer to the table below for building with different Flink and Scala versions.
+
+| Maven build options        | Expected Flink bundle jar name | Notes                                           |
+|:---------------------------|:-------------------------------|:------------------------------------------------|
+| (empty)                    | hudi-flink1.14-bundle_2.11     | For Flink 1.14 and Scala 2.11 (default options) |
+| `-Dflink1.14`              | hudi-flink1.14-bundle_2.11     | For Flink 1.14 and Scala 2.11 (same as default) |
+| `-Dflink1.14 -Dscala-2.12` | hudi-flink1.14-bundle_2.12     | For Flink 1.14 and Scala 2.12                   |
+| `-Dflink1.13`              | hudi-flink1.13-bundle_2.11     | For Flink 1.13 and Scala 2.11                   |
+| `-Dflink1.13 -Dscala-2.12` | hudi-flink1.13-bundle_2.12     | For Flink 1.13 and Scala 2.12                   |
+
 ## Running Tests
 
 Unit tests can be run with maven profile `unit-tests`.
diff --git a/scripts/release/deploy_staging_jars.sh b/scripts/release/deploy_staging_jars.sh
index 76f018e20..6928e3600 100755
--- a/scripts/release/deploy_staging_jars.sh
+++ b/scripts/release/deploy_staging_jars.sh
@@ -37,7 +37,11 @@ if [ "$#" -gt "1" ]; then
 fi
 
 declare -a ALL_VERSION_OPTS=(
+"-Dscala-2.11 -Dspark2 -Dflink1.13" # for legacy bundle name
+"-Dscala-2.12 -Dspark2 -Dflink1.13" # for legacy bundle name
+"-Dscala-2.12 -Dspark3 -Dflink1.14" # for legacy bundle name
 "-Dscala-2.11 -Dspark2.4 -Dflink1.13"
+"-Dscala-2.11 -Dspark2.4 -Dflink1.14"
 "-Dscala-2.12 -Dspark2.4 -Dflink1.13"
 "-Dscala-2.12 -Dspark3.1 -Dflink1.14"
 "-Dscala-2.12 -Dspark3.2 -Dflink1.14"