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 572a99bab07e53e043887243e2b1e69120563be5 Merge: cb31b7b 05b3fd3 Author: Ismaël Mejía <ieme...@gmail.com> AuthorDate: Thu Apr 8 06:25:51 2021 +0200 Merge pull request #14203: [BEAM-11948] Drop support for Flink 1.8 and 1.9 CHANGES.md | 1 + gradle.properties | 2 +- runners/flink/1.10/build.gradle | 4 +- .../beam/runners/flink/FlinkCapabilities.java | 34 ------------ .../streaming/AbstractStreamOperatorCompat.java | 0 .../beam/runners/flink/RemoteMiniClusterImpl.java | 0 .../runners/flink/SourceTransformationCompat.java | 0 runners/flink/1.11/build.gradle | 4 +- runners/flink/1.12/build.gradle | 4 +- runners/flink/1.8/build.gradle | 34 ------------ .../flink/1.8/job-server-container/build.gradle | 26 --------- runners/flink/1.8/job-server/build.gradle | 31 ----------- .../beam/runners/flink/FlinkCapabilities.java | 34 ------------ .../streaming/io/BeamStoppableFunction.java | 29 ---------- .../beam/runners/flink/FlinkRunnerTestCompat.java | 43 --------------- .../runners/flink/streaming/StreamSources.java | 50 ----------------- runners/flink/1.9/build.gradle | 33 ------------ .../flink/1.9/job-server-container/build.gradle | 26 --------- runners/flink/1.9/job-server/build.gradle | 31 ----------- .../runners/flink/streaming/StreamSources.java | 62 ---------------------- .../flink/FlinkBatchTransformTranslators.java | 10 +--- .../beam/runners/flink/FlinkPipelineRunner.java | 8 --- .../org/apache/beam/runners/flink/FlinkRunner.java | 7 --- .../translation/functions/FlinkDoFnFunction.java | 12 +---- .../translation/types/CoderTypeSerializer.java | 0 .../translation/types/EncodedValueSerializer.java | 0 .../streaming/io/BeamStoppableFunction.java | 0 .../flink/batch/NonMergingGroupByKeyTest.java | 5 -- .../translation/types/CoderTypeSerializerTest.java | 0 settings.gradle.kts | 8 --- .../site/content/en/documentation/runners/flink.md | 25 ++++++--- 31 files changed, 29 insertions(+), 494 deletions(-) diff --cc runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java index 396000b,96b8781..b911567 --- a/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java +++ b/runners/flink/src/main/java/org/apache/beam/runners/flink/FlinkPipelineRunner.java @@@ -43,10 -43,9 +43,9 @@@ import org.apache.beam.sdk.metrics.Metr import org.apache.beam.sdk.metrics.MetricsOptions; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsFactory; -import org.apache.beam.vendor.grpc.v1p26p0.com.google.protobuf.Struct; +import org.apache.beam.vendor.grpc.v1p36p0.com.google.protobuf.Struct; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Preconditions; import org.apache.flink.api.common.JobExecutionResult; - import org.apache.flink.runtime.util.EnvironmentInformation; import org.checkerframework.checker.nullness.qual.Nullable; import org.kohsuke.args4j.CmdLineException; import org.kohsuke.args4j.CmdLineParser;