This is an automated email from the ASF dual-hosted git repository. iemejia pushed a commit to branch BEAM-7092-spark3 in repository https://gitbox.apache.org/repos/asf/beam.git
commit b397e83a56b3f519ad1f993a2a525f4c1c6eb0cd Author: Ismaël Mejía <[email protected]> AuthorDate: Fri Aug 2 15:48:11 2019 +0200 Change dependencies to use scala 2.12 --- .../groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 12 ++++++------ runners/spark/build.gradle | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy index c1e888c..7613916 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -516,13 +516,13 @@ class BeamModulePlugin implements Plugin<Project> { jackson_dataformat_xml : "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jackson_version", jackson_dataformat_yaml : "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jackson_version", jackson_datatype_joda : "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version", - jackson_module_scala : "com.fasterxml.jackson.module:jackson-module-scala_2.11:$jackson_version", + jackson_module_scala : "com.fasterxml.jackson.module:jackson-module-scala_2.12:$jackson_version", jaxb_api : "javax.xml.bind:jaxb-api:$jaxb_api_version", joda_time : "joda-time:joda-time:2.10.5", jsonassert : "org.skyscreamer:jsonassert:1.5.0", jsr305 : "com.google.code.findbugs:jsr305:3.0.2", junit : "junit:junit:4.13-beta-3", - kafka : "org.apache.kafka:kafka_2.11:$kafka_version", + kafka : "org.apache.kafka:kafka_2.12:$kafka_version", kafka_clients : "org.apache.kafka:kafka-clients:$kafka_version", mockito_core : "org.mockito:mockito-core:3.0.0", nemo_compiler_frontend_beam : "org.apache.nemo:nemo-compiler-frontend-beam:$nemo_version", @@ -545,10 +545,10 @@ class BeamModulePlugin implements Plugin<Project> { slf4j_jdk14 : "org.slf4j:slf4j-jdk14:1.7.25", slf4j_log4j12 : "org.slf4j:slf4j-log4j12:1.7.25", snappy_java : "org.xerial.snappy:snappy-java:1.1.4", - spark_core : "org.apache.spark:spark-core_2.11:$spark_version", - spark_network_common : "org.apache.spark:spark-network-common_2.11:$spark_version", - spark_sql : "org.apache.spark:spark-sql_2.11:$spark_version", - spark_streaming : "org.apache.spark:spark-streaming_2.11:$spark_version", + spark_core : "org.apache.spark:spark-core_2.12:$spark_version", + spark_network_common : "org.apache.spark:spark-network-common_2.12:$spark_version", + spark_sql : "org.apache.spark:spark-sql_2.12:$spark_version", + spark_streaming : "org.apache.spark:spark-streaming_2.12:$spark_version", stax2_api : "org.codehaus.woodstox:stax2-api:3.1.4", vendored_bytebuddy_1_10_8 : "org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1", vendored_grpc_1_26_0 : "org.apache.beam:beam-vendor-grpc-1_26_0:0.3", diff --git a/runners/spark/build.gradle b/runners/spark/build.gradle index 0a558fd..a89556b 100644 --- a/runners/spark/build.gradle +++ b/runners/spark/build.gradle @@ -77,7 +77,7 @@ dependencies { provided library.java.hamcrest_library provided "com.esotericsoftware.kryo:kryo:2.21" runtimeOnly library.java.jackson_module_scala - runtimeOnly "org.scala-lang:scala-library:2.11.8" + runtimeOnly "org.scala-lang:scala-library:2.12.10" testCompile project(":sdks:java:io:kafka") testCompile project(path: ":sdks:java:core", configuration: "shadowTest") // SparkStateInternalsTest extends abstract StateInternalsTest
