You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2017/11/17 22:29:59 UTC

[28/50] [abbrv] beam git commit: Fix hadoop-file-system test dependencies Explain why hcatalog is failing to run

Fix hadoop-file-system test dependencies
Explain why hcatalog is failing to run


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/671a814e
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/671a814e
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/671a814e

Branch: refs/heads/master
Commit: 671a814ed0205675d8f56c0823d4478c5bd7f58b
Parents: 6a72d79
Author: Luke Cwik <lc...@google.com>
Authored: Fri Nov 3 13:32:48 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Fri Nov 17 14:27:15 2017 -0800

----------------------------------------------------------------------
 sdks/java/io/hadoop-file-system/build.gradle |  8 ++++----
 sdks/java/io/hcatalog/build.gradle           | 22 ++++++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/671a814e/sdks/java/io/hadoop-file-system/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop-file-system/build.gradle b/sdks/java/io/hadoop-file-system/build.gradle
index 7c180fc..b81cf39 100644
--- a/sdks/java/io/hadoop-file-system/build.gradle
+++ b/sdks/java/io/hadoop-file-system/build.gradle
@@ -37,12 +37,12 @@ dependencies {
   compile library.java.guava
   compile library.java.slf4j_api
   compile library.java.findbugs_jsr305
-  compileOnly library.java.hadoop_client
-  compileOnly library.java.hadoop_common
-  compileOnly library.java.hadoop_mapreduce_client_core
+  provided library.java.hadoop_client
+  provided library.java.hadoop_common
+  provided library.java.hadoop_mapreduce_client_core
   testCompile project(":beam-runners-parent:beam-runners-direct-java")
   testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
-  testCompile library.java.guava
+  testCompile library.java.guava_testlib
   testCompile library.java.hamcrest_core
   testCompile library.java.mockito_core
   testCompile library.java.junit

http://git-wip-us.apache.org/repos/asf/beam/blob/671a814e/sdks/java/io/hcatalog/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle
index 26cf1d2..bd24b82 100644
--- a/sdks/java/io/hcatalog/build.gradle
+++ b/sdks/java/io/hcatalog/build.gradle
@@ -21,6 +21,12 @@ applyJavaNature()
 
 description = "Apache Beam :: SDKs :: Java :: IO :: HCatalog"
 
+def hive_version = "2.1.0"
+
+// TODO: Get tests to run. Known issues:
+//  * calcite-avatica bundles w/o repackaging Jackson (CALCITE-1110)
+//  * hive-exec bundles w/o repackaging Guava (HIVE-13690)
+
 dependencies {
   compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
   compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hadoop-common")
@@ -28,19 +34,19 @@ dependencies {
   compile library.java.guava
   compile library.java.findbugs_jsr305
   provided library.java.hadoop_common
-  provided "org.apache.hive:hive-exec:2.1.0"
-  provided(group: "org.apache.hive.hcatalog", name: "hive-hcatalog-core", version:"2.1.0") {
-    exclude(module: "hive-exec")
-    exclude(module: "protobuf-java")
+  provided "org.apache.hive:hive-exec:$hive_version"
+  provided(group: "org.apache.hive.hcatalog", name: "hive-hcatalog-core", version: hive_version) {
+    exclude module: "hive-exec"
+    exclude module: "protobuf-java"
   }
   testCompile project(":beam-runners-parent:beam-runners-direct-java")
   testCompile library.java.commons_io_2x
   testCompile library.java.junit
   testCompile library.java.hamcrest_core
-  testCompile "org.apache.hive.hcatalog:hive-hcatalog-core:2.1.0:tests"
-  testCompile "org.apache.hive:hive-exec:2.1.0"
-  testCompile "org.apache.hive:hive-common:2.1.0"
-  testCompile "org.apache.hive:hive-cli:2.1.0"
+  testCompile "org.apache.hive.hcatalog:hive-hcatalog-core:$hive_version:tests"
+  testCompile "org.apache.hive:hive-exec:$hive_version"
+  testCompile "org.apache.hive:hive-common:$hive_version"
+  testCompile "org.apache.hive:hive-cli:$hive_version"
 }
 
 task packageTests(type: Jar) {