From 302bb9b48760585536cce2ba77f882d5a8462283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= Date: Mon, 13 Jan 2020 13:55:35 +0100 Subject: [PATCH 1/2] [BEAM-8740] Remove unused dependency from Spark runner --- .../main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy | 1 - runners/spark/build.gradle | 1 - 2 files changed, 2 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 7e1cf0f6a47b..d6cf5e175f30 100644 --- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy +++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy @@ -387,7 +387,6 @@ class BeamModulePlugin implements Plugin { def protobuf_version = "3.11.1" def quickcheck_version = "0.8" def spark_version = "2.4.4" - def spark_structured_streaming_version = "2.4.0" // A map of maps containing common libraries used per language. To use: // dependencies { diff --git a/runners/spark/build.gradle b/runners/spark/build.gradle index 1d70ad1ed51d..495b1d9d2b56 100644 --- a/runners/spark/build.gradle +++ b/runners/spark/build.gradle @@ -76,7 +76,6 @@ dependencies { provided "com.esotericsoftware.kryo:kryo:2.21" runtimeOnly library.java.jackson_module_scala runtimeOnly "org.scala-lang:scala-library:2.11.8" - compile "org.scala-lang.modules:scala-java8-compat_2.11:0.9.0" testCompile project(":sdks:java:io:kafka") testCompile project(path: ":sdks:java:core", configuration: "shadowTest") // SparkStateInternalsTest extends abstract StateInternalsTest From 04a79fbc0e02407aa409255d3899480c2a207445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Mej=C3=ADa?= Date: Mon, 13 Jan 2020 15:58:21 +0100 Subject: [PATCH 2/2] Add UsesTestStream category on ParDoTest$TimerTests.testOutputTimestamp --- .../src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java index 884b9a64d858..7cd03a755529 100644 --- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java +++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/ParDoTest.java @@ -3736,6 +3736,7 @@ public void testTwoTimersSettingEachOtherWithCreateAsInput() { ValidatesRunner.class, UsesStatefulParDo.class, UsesTimersInParDo.class, + UsesTestStream.class, UsesTestStreamWithOutputTimestamp.class }) public void testOutputTimestamp() {