Merge pull request #32843: Drop Flink 1.15 and 1.16 support

apache · Oct 21, 2024 · e845caa · e845caa
2 parents 56696ec + dfa54b2
commit e845caa
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 411 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -84,6 +84,7 @@
 
 ## Deprecations
 
+* Removed support for Flink 1.15 and 1.16
 * X behavior is deprecated and will be removed in X versions ([#X](https://github.com/apache/beam/issues/X)).
 
 ## Bugfixes

diff --git a/gradle.properties b/gradle.properties
@@ -39,6 +39,6 @@ docker_image_default_repo_root=apache
 docker_image_default_repo_prefix=beam_
 
 # supported flink versions
-flink_versions=1.15,1.16,1.17,1.18,1.19
+flink_versions=1.17,1.18,1.19
 # supported python versions
 python_versions=3.9,3.10,3.11,3.12
diff --git a/...rning-content/introduction/introduction-concepts/runner-concepts/description.md b/...rning-content/introduction/introduction-concepts/runner-concepts/description.md
@@ -191,8 +191,8 @@ $ wordcount --input gs://dataflow-samples/shakespeare/kinglear.txt \
 {{if (eq .Sdk "java")}}
 
 ##### Portable
-1. Starting with Beam 2.18.0, pre-built Flink Job Service Docker images are available at Docker Hub: `Flink 1.15`, `Flink 1.16`, `Flink 1.17`, `Flink 1.18`.
-2. Start the JobService endpoint: `docker run --net=host apache/beam_flink1.10_job_server:latest`
+1. Starting with Beam 2.18.0, pre-built Flink Job Service Docker images are available at Docker Hub: `Flink 1.17`, `Flink 1.18`, `Flink 1.19`.
+2. Start the JobService endpoint: `docker run --net=host apache/beam_flink1.19_job_server:latest`
 3. Submit the pipeline to the above endpoint by using the PortableRunner, job_endpoint set to localhost:8099 (this is the default address of the JobService). Optionally set environment_type set to LOOPBACK. For example:
 
 ```
@@ -233,8 +233,8 @@ mvn exec:java -Dexec.mainClass=org.apache.beam.examples.WordCount \
 {{end}}
 
 {{if (eq .Sdk "python")}}
-1. Starting with Beam 2.18.0, pre-built Flink Job Service Docker images are available at Docker Hub: `Flink 1.10`, `Flink 1.11`, `Flink 1.12`, `Flink 1.13`, `Flink 1.14`.
-2. Start the JobService endpoint: `docker run --net=host apache/beam_flink1.10_job_server:latest`
+1. Starting with Beam 2.18.0, pre-built Flink Job Service Docker images are available at Docker Hub: `Flink 1.17`, `Flink 1.18`, `Flink 1.19`.
+2. Start the JobService endpoint: `docker run --net=host apache/beam_flink1.19_job_server:latest`
 3. Submit the pipeline to the above endpoint by using the PortableRunner, job_endpoint set to localhost:8099 (this is the default address of the JobService). Optionally set environment_type set to LOOPBACK. For example:
 
 ```

diff --git a/runners/flink/1.15/build.gradle b/runners/flink/1.15/build.gradle
diff --git a/runners/flink/1.15/job-server-container/build.gradle b/runners/flink/1.15/job-server-container/build.gradle
diff --git a/runners/flink/1.15/job-server/build.gradle b/runners/flink/1.15/job-server/build.gradle
diff --git a/...15/src/main/java/org/apache/beam/runners/flink/translation/types/CoderTypeSerializer.java b/...15/src/main/java/org/apache/beam/runners/flink/translation/types/CoderTypeSerializer.java
diff --git a/runners/flink/1.16/build.gradle b/runners/flink/1.16/build.gradle
diff --git a/runners/flink/1.16/job-server-container/build.gradle b/runners/flink/1.16/job-server-container/build.gradle