resolve conflicts

apache · Jan 28, 2021 · 7352ed1 · 7352ed1
2 parents 431b00e + 953d7c1
commit 7352ed1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/sdks/java/extensions/euphoria/build.gradle b/sdks/java/extensions/euphoria/build.gradle
@@ -27,8 +27,8 @@ description = "Apache Beam :: SDKs :: Java :: Extensions :: Euphoria Java 8 DSL"
 
 dependencies {
   compile project(path: ":sdks:java:core", configuration: "shadow")
-  implementation library.java.slf4j_api
   implementation library.java.jackson_annotations
+  implementation library.java.slf4j_api
   implementation library.java.vendored_guava_26_0_jre
   implementation library.java.joda_time
   testCompile project(":sdks:java:extensions:kryo")

diff --git a/sdks/java/extensions/google-cloud-platform-core/build.gradle b/sdks/java/extensions/google-cloud-platform-core/build.gradle
@@ -42,6 +42,8 @@ dependencies {
   compile library.java.vendored_guava_26_0_jre
   compile project(path: ":sdks:java:core", configuration: "shadow")
   compile project(path: ":runners:core-java")
+  compile library.java.http_core
+  compile library.java.http_client
   compile library.java.google_http_client_jackson2
   compile library.java.google_auth_library_oauth2_http
   compile library.java.google_api_client

diff --git a/sdks/java/extensions/schemaio-expansion-service/build.gradle b/sdks/java/extensions/schemaio-expansion-service/build.gradle
@@ -38,6 +38,6 @@ dependencies {
     testCompile library.java.junit
     testCompile library.java.mockito_core
     // TODO(BEAM-10632): remove this dependency
+    testCompile "org.checkerframework:checker-qual:3.5.0"
 }
 
-
diff --git a/sdks/java/extensions/zetasketch/build.gradle b/sdks/java/extensions/zetasketch/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     compile library.java.vendored_guava_26_0_jre
     compile project(path: ":sdks:java:core", configuration: "shadow")
     compile "com.google.zetasketch:zetasketch:$zetasketch_version"
+    compile "org.checkerframework:checker-qual:2.8.1"
     testCompile library.java.junit
     testCompile project(":sdks:java:io:google-cloud-platform")
     testRuntimeOnly library.java.slf4j_simple