This is an automated email from the ASF dual-hosted git repository. yichi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push: new f691d668750 [BEAM-14386] [Flink] Support for scala 2.12 (#17512) f691d668750 is described below commit f691d66875085a19b3f5b0959c7a3211f5c8cf62 Author: Hector Miuler Malpica Gallegos <miu...@gmail.com> AuthorDate: Wed May 4 16:06:45 2022 -0500 [BEAM-14386] [Flink] Support for scala 2.12 (#17512) --- CHANGES.md | 1 + runners/flink/flink_runner.gradle | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a8683df52a1..8071b24be4a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -82,6 +82,7 @@ ## Deprecations +* Support for flink scala 2.12, because most of the libraries support version 2.12 onwards. ([beam-14386](https://issues.apache.org/jira/browse/BEAM-14386)) * Flink 1.11 is no longer supported ([BEAM-14139](https://issues.apache.org/jira/browse/BEAM-14139)). * Python 3.6 is no longer supported ([BEAM-13657](https://issues.apache.org/jira/browse/BEAM-13657)). diff --git a/runners/flink/flink_runner.gradle b/runners/flink/flink_runner.gradle index 066236e22fd..837bc74c32f 100644 --- a/runners/flink/flink_runner.gradle +++ b/runners/flink/flink_runner.gradle @@ -140,10 +140,10 @@ dependencies { implementation library.java.slf4j_api implementation library.java.joda_time implementation library.java.args4j - implementation "org.apache.flink:flink-clients_2.11:$flink_version" + implementation "org.apache.flink:flink-clients_2.12:$flink_version" // Runtime dependencies are not included in Beam's generated pom.xml, so we must declare flink-clients in implementation // configuration (https://issues.apache.org/jira/browse/BEAM-11732). - permitUnusedDeclared "org.apache.flink:flink-clients_2.11:$flink_version" + permitUnusedDeclared "org.apache.flink:flink-clients_2.12:$flink_version" implementation "org.apache.flink:flink-core:$flink_version" implementation "org.apache.flink:flink-metrics-core:$flink_version" implementation "org.apache.flink:flink-java:$flink_version" @@ -153,14 +153,14 @@ dependencies { testImplementation "org.apache.flink:flink-runtime:$flink_version:tests" testImplementation "org.apache.flink:flink-rpc-akka:$flink_version" } else { - implementation "org.apache.flink:flink-runtime_2.11:$flink_version" - implementation "org.apache.flink:flink-optimizer_2.11:$flink_version" - testImplementation "org.apache.flink:flink-runtime_2.11:$flink_version:tests" + implementation "org.apache.flink:flink-runtime_2.12:$flink_version" + implementation "org.apache.flink:flink-optimizer_2.12:$flink_version" + testImplementation "org.apache.flink:flink-runtime_2.12:$flink_version:tests" } - implementation "org.apache.flink:flink-streaming-java_2.11:$flink_version" + implementation "org.apache.flink:flink-streaming-java_2.12:$flink_version" // RocksDB state backend (included in the Flink distribution) - provided "org.apache.flink:flink-statebackend-rocksdb_2.11:$flink_version" - testImplementation "org.apache.flink:flink-statebackend-rocksdb_2.11:$flink_version" + provided "org.apache.flink:flink-statebackend-rocksdb_2.12:$flink_version" + testImplementation "org.apache.flink:flink-statebackend-rocksdb_2.12:$flink_version" testImplementation project(path: ":sdks:java:core", configuration: "shadowTest") // FlinkStateInternalsTest extends abstract StateInternalsTest testImplementation project(path: ":runners:core-java", configuration: "testRuntimeMigration") @@ -172,14 +172,14 @@ dependencies { testImplementation project(":sdks:java:io:google-cloud-platform") testImplementation library.java.jackson_dataformat_yaml testImplementation "org.apache.flink:flink-core:$flink_version:tests" - testImplementation "org.apache.flink:flink-streaming-java_2.11:$flink_version:tests" - testImplementation "org.apache.flink:flink-test-utils_2.11:$flink_version" + testImplementation "org.apache.flink:flink-streaming-java_2.12:$flink_version:tests" + testImplementation "org.apache.flink:flink-test-utils_2.12:$flink_version" testImplementation project(":sdks:java:harness") testRuntimeOnly library.java.slf4j_simple validatesRunner project(path: ":sdks:java:core", configuration: "shadowTest") validatesRunner project(path: ":runners:core-java", configuration: "testRuntimeMigration") validatesRunner project(project.path) - miniCluster "org.apache.flink:flink-runtime-web_2.11:$flink_version" + miniCluster "org.apache.flink:flink-runtime-web_2.12:$flink_version" implementation project(path: ":model:fn-execution", configuration: "shadow") implementation project(path: ":model:pipeline", configuration: "shadow") implementation project(path: ":model:job-management", configuration: "shadow")