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/23 00:34:11 UTC
[1/2] beam git commit: Fix test runtime class conflicts and get hbase
tests passing.
Repository: beam
Updated Branches:
refs/heads/master 4847d34d7 -> 558aa2fc3
Fix test runtime class conflicts and get hbase tests passing.
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/07d6607b
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/07d6607b
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/07d6607b
Branch: refs/heads/master
Commit: 07d6607b54110876ad081e3f680e88f5cff679f5
Parents: 4847d34
Author: Luke Cwik <lc...@google.com>
Authored: Wed Nov 22 10:50:43 2017 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Nov 22 16:33:34 2017 -0800
----------------------------------------------------------------------
sdks/java/io/hbase/build.gradle | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/07d6607b/sdks/java/io/hbase/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle
index bcfebbd..dbfceb0 100644
--- a/sdks/java/io/hbase/build.gradle
+++ b/sdks/java/io/hbase/build.gradle
@@ -29,13 +29,6 @@ test {
}
}
-test {
- // TODO: Get tests to run. Known issues:
- // * hbase-server:tests conflict with hbase-shaded-server with ProtobufUtil
- ignoreFailures true
-}
-
-
def hbase_version = "1.2.6"
dependencies {
@@ -54,7 +47,16 @@ dependencies {
testCompile library.java.hadoop_hdfs
testCompile library.java.hadoop_common
testCompile "org.apache.hbase:hbase-shaded-server:$hbase_version"
- testCompile "org.apache.hbase:hbase-server:$hbase_version:tests"
+ testCompile("org.apache.hbase:hbase-server:$hbase_version:tests") {
+ // We prevent bringing in unshaded dependencies to not conflict
+ // with hbase-shaded-server and hbase-shaded-client
+ transitive = false
+ }
+ testCompile("org.apache.hbase:hbase-common:$hbase_version:tests") {
+ // We prevent bringing in unshaded dependencies to not conflict
+ // with hbase-shaded-server and hbase-shaded-client
+ transitive = false
+ }
testCompile "org.apache.hbase:hbase-hadoop-compat:$hbase_version:tests"
testCompile "org.apache.hbase:hbase-hadoop2-compat:$hbase_version:tests"
}
[2/2] beam git commit: Fix test runtime class conflicts and get hbase
tests passing.
Posted by lc...@apache.org.
Fix test runtime class conflicts and get hbase tests passing.
This closes #4166
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/558aa2fc
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/558aa2fc
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/558aa2fc
Branch: refs/heads/master
Commit: 558aa2fc3efda58a2cd398b20a16cf9b6ca3ef09
Parents: 4847d34 07d6607
Author: Luke Cwik <lc...@google.com>
Authored: Wed Nov 22 16:33:56 2017 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Wed Nov 22 16:33:56 2017 -0800
----------------------------------------------------------------------
sdks/java/io/hbase/build.gradle | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------