This is an automated email from the ASF dual-hosted git repository.
iemejia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 511fb05e5925fe48947efdd872433d621c85e52d
Merge: 4f0ea5f 22575c7
Author: Ismaël Mejía <ieme...@gmail.com>
AuthorDate: Wed Jun 2 11:08:53 2021 +0200
Merge pull request #14906: [BEAM-12281] Drop support for Flink 1.10
.test-infra/dataproc/flink_cluster.sh | 2 +-
.test-infra/jenkins/Flink.groovy | 4 +-
.../jenkins/job_LoadTests_Combine_Flink_Go.groovy | 2 +-
.../job_LoadTests_Combine_Flink_Python.groovy | 2 +-
.../jenkins/job_LoadTests_GBK_Flink_Go.groovy | 2 +-
.../jenkins/job_LoadTests_GBK_Flink_Python.groovy | 2 +-
.../jenkins/job_LoadTests_ParDo_Flink_Go.groovy | 2 +-
.../job_LoadTests_ParDo_Flink_Python.groovy | 2 +-
.../job_LoadTests_SideInput_Flink_Go.groovy | 2 +-
.../jenkins/job_LoadTests_coGBK_Flink_Go.groovy | 2 +-
.../job_LoadTests_coGBK_Flink_Python.groovy | 2 +-
...Commit_Python_Chicago_Taxi_Example_Flink.groovy | 2 +-
CHANGES.md | 1 +
gradle.properties | 2 +-
release/build.gradle.kts | 2 +-
release/src/main/scripts/run_rc_validation.sh | 2 +-
runners/flink/1.10/build.gradle | 33 ----------
.../flink/1.10/job-server-container/build.gradle | 26 --------
runners/flink/1.10/job-server/build.gradle | 31 ----------
.../streaming/AbstractStreamOperatorCompat.java | 30 ---------
.../beam/runners/flink/FlinkRunnerTestCompat.java | 42 -------------
.../beam/runners/flink/RemoteMiniClusterImpl.java | 71 ----------------------
.../runners/flink/SourceTransformationCompat.java | 28 ---------
runners/flink/1.11/build.gradle | 4 +-
.../runners/flink/streaming/StreamSources.java | 0
runners/flink/1.12/build.gradle | 4 +-
runners/flink/1.13/build.gradle | 4 +-
runners/flink/flink_runner.gradle | 2 +-
.../beam/runners/flink/FlinkPipelineRunner.java | 7 +--
.../org/apache/beam/runners/flink/FlinkRunner.java | 7 +--
.../flink/FlinkExecutionEnvironmentsTest.java | 34 +++--------
.../FlinkPipelineExecutionEnvironmentTest.java | 22 +++----
sdks/go/examples/stringsplit/stringsplit.go | 2 +-
sdks/java/testing/nexmark/build.gradle | 2 +-
sdks/java/testing/tpcds/build.gradle | 2 +-
sdks/python/apache_beam/transforms/sql_test.py | 4 +-
settings.gradle.kts | 4 --
.../site/content/en/contribute/release-guide.md | 2 +-
.../content/en/documentation/dsls/sql/shell.md | 6 +-
.../site/content/en/documentation/runners/flink.md | 6 +-
.../en/documentation/sdks/java/testing/nexmark.md | 6 +-
41 files changed, 57 insertions(+), 355 deletions(-)
diff --cc runners/flink/1.12/build.gradle
index 1096d80,d38d873..99dd015
--- a/runners/flink/1.12/build.gradle
+++ b/runners/flink/1.12/build.gradle
@@@ -20,10 -20,10 +20,10 @@@ def basePath = '..
/* All properties required for loading the Flink build script */
project.ext {
// Set the version of all Flink-related dependencies here.
- flink_version = '1.12.3'
+ flink_version = '1.12.4'
// Version specific code overrides.
- main_source_overrides = ["${basePath}/1.10/src/main/java",
"${basePath}/1.11/src/main/java", './src/main/java']
- test_source_overrides = ["${basePath}/1.10/src/test/java",
"${basePath}/1.11/src/test/java", './src/test/java']
+ main_source_overrides = ["${basePath}/1.11/src/main/java",
'./src/main/java']
+ test_source_overrides = ["${basePath}/1.11/src/test/java",
'./src/test/java']
main_resources_overrides = []
test_resources_overrides = []
archives_base_name = 'beam-runners-flink-1.12'
diff --cc runners/flink/1.13/build.gradle
index 1799ffc,0484c29..067933f
--- a/runners/flink/1.13/build.gradle
+++ b/runners/flink/1.13/build.gradle
@@@ -20,10 -20,10 +20,10 @@@ def basePath = '..
/* All properties required for loading the Flink build script */
project.ext {
// Set the version of all Flink-related dependencies here.
- flink_version = '1.13.0'
+ flink_version = '1.13.1'
// Version specific code overrides.
- main_source_overrides = ["${basePath}/1.10/src/main/java",
"${basePath}/1.11/src/main/java", "${basePath}/1.12/src/main/java",
'./src/main/java']
- test_source_overrides = ["${basePath}/1.10/src/test/java",
"${basePath}/1.11/src/test/java", "${basePath}/1.12/src/test/java",
'./src/test/java']
+ main_source_overrides = ["${basePath}/1.11/src/main/java",
"${basePath}/1.12/src/main/java", './src/main/java']
+ test_source_overrides = ["${basePath}/1.11/src/test/java",
"${basePath}/1.12/src/test/java", './src/test/java']
main_resources_overrides = []
test_resources_overrides = []
archives_base_name = 'beam-runners-flink-1.13'
