Merge pull request apache#31394: apache#31112 drop flink 1.14

robertwb · May 25, 2024 · 0790d69 · 0790d69
2 parents cf3592b + c10f5d4
commit 0790d69
Show file tree

Hide file tree

Showing 38 changed files with 115 additions and 436 deletions.
diff --git a/.github/actions/setup-default-test-properties/test-properties.json b/.github/actions/setup-default-test-properties/test-properties.json
@@ -14,7 +14,7 @@
   },
   "JavaTestProperties": {
     "SUPPORTED_VERSIONS": ["8", "11", "17", "21"],
-    "FLINK_VERSIONS": ["1.14", "1.15", "1.16", "1.17"],
+    "FLINK_VERSIONS": ["1.15", "1.16", "1.17", "1.18"],
     "SPARK_VERSIONS": ["2", "3"]
   },
   "GoTestProperties": {

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.14,1.15,1.16,1.17,1.18
+flink_versions=1.15,1.16,1.17,1.18
 # supported python versions
 python_versions=3.8,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,7 +191,7 @@ $ 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.14`, `Flink 1.15`, `Flink 1.16`, `Flink 1.17`.
+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`
 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.14/build.gradle b/runners/flink/1.14/build.gradle
diff --git a/runners/flink/1.14/job-server-container/build.gradle b/runners/flink/1.14/job-server-container/build.gradle
diff --git a/runners/flink/1.14/job-server/build.gradle b/runners/flink/1.14/job-server/build.gradle
diff --git a/...pache/beam/runners/flink/translation/wrappers/streaming/AbstractStreamOperatorCompat.java b/...pache/beam/runners/flink/translation/wrappers/streaming/AbstractStreamOperatorCompat.java
diff --git a/...pache/beam/runners/flink/translation/wrappers/streaming/ProcessingTimeCallbackCompat.java b/...pache/beam/runners/flink/translation/wrappers/streaming/ProcessingTimeCallbackCompat.java
diff --git a/...beam/runners/flink/translation/wrappers/streaming/io/source/compat/FlinkSourceCompat.java b/...beam/runners/flink/translation/wrappers/streaming/io/source/compat/FlinkSourceCompat.java
diff --git a/.../runners/flink/translation/wrappers/streaming/io/source/compat/SplitEnumeratorCompat.java b/.../runners/flink/translation/wrappers/streaming/io/source/compat/SplitEnumeratorCompat.java
diff --git a/...ache/beam/runners/flink/translation/wrappers/streaming/io/source/compat/package-info.java b/...ache/beam/runners/flink/translation/wrappers/streaming/io/source/compat/package-info.java
diff --git a/runners/flink/1.14/src/test/java/org/apache/beam/runners/flink/MiniClusterCompat.java b/runners/flink/1.14/src/test/java/org/apache/beam/runners/flink/MiniClusterCompat.java
diff --git a/...rs/flink/1.14/src/test/java/org/apache/beam/runners/flink/metrics/MetricGroupWrapper.java b/...rs/flink/1.14/src/test/java/org/apache/beam/runners/flink/metrics/MetricGroupWrapper.java
diff --git a/...ranslation/types/CoderTypeSerializer.java → ...ranslation/types/CoderTypeSerializer.java b/...ranslation/types/CoderTypeSerializer.java → ...ranslation/types/CoderTypeSerializer.java
diff --git a/...pache/beam/runners/flink/translation/wrappers/streaming/ProcessingTimeCallbackCompat.java b/...pache/beam/runners/flink/translation/wrappers/streaming/ProcessingTimeCallbackCompat.java