From 48ad4172ebcf7b8ba21dcda5f48453bbd2e1fcad Mon Sep 17 00:00:00 2001 From: Elliott Neil Clark Date: Wed, 2 Oct 2013 10:13:07 -0700 Subject: [PATCH] HBASE-9699 For Downstreamers using HBaseTestingUtility is hard. --- hbase-assembly/pom.xml | 26 +---- hbase-examples/pom.xml | 34 +++--- hbase-it/pom.xml | 69 +++++-------- hbase-shell/pom.xml | 21 +--- hbase-testing-util/pom.xml | 245 ++++++++++++++++++++++++++++++++++++++++++++ hbase-thrift/pom.xml | 22 +--- pom.xml | 7 ++ 7 files changed, 294 insertions(+), 130 deletions(-) create mode 100644 hbase-testing-util/pom.xml diff --git hbase-assembly/pom.xml hbase-assembly/pom.xml index ee6a727..f8d3aa2 100644 --- hbase-assembly/pom.xml +++ hbase-assembly/pom.xml @@ -85,41 +85,21 @@ org.apache.hbase - hbase-common - test-jar - - - org.apache.hbase hbase-server - org.apache.hbase - hbase-server - test-jar - test - - org.apache.hbase hbase-hadoop-compat org.apache.hbase - hbase-hadoop-compat - ${project.version} - test-jar - test - - - org.apache.hbase ${compat.module} ${project.version} - org.apache.hbase - ${compat.module} - ${project.version} - test-jar - test + org.apache.hbase + hbase-shell + ${project.version} diff --git hbase-examples/pom.xml hbase-examples/pom.xml index ddaa8c5..2a16ca4 100644 --- hbase-examples/pom.xml +++ hbase-examples/pom.xml @@ -69,42 +69,26 @@ org.apache.hbase - hbase-common - test-jar - test - - - org.apache.hbase hbase-protocol - compile org.apache.hbase hbase-client - compile - - - org.apache.zookeeper - zookeeper - com.google.protobuf - protobuf-java + org.apache.hbase + hbase-server org.apache.hbase - hbase-server + hbase-thrift org.apache.hbase - hbase-server - test-jar + hbase-testing-util test - - org.apache.hbase - hbase-thrift - + org.apache.thrift libthrift @@ -113,6 +97,14 @@ commons-logging commons-logging + + org.apache.zookeeper + zookeeper + + + com.google.protobuf + protobuf-java + diff --git hbase-it/pom.xml hbase-it/pom.xml index 145052c..584ddc2 100644 --- hbase-it/pom.xml +++ hbase-it/pom.xml @@ -144,16 +144,32 @@ org.apache.hbase - hbase-common - test-jar + hbase-protocol org.apache.hbase - hbase-protocol + hbase-client org.apache.hbase - hbase-client + hbase-shell + + + org.apache.hbase + hbase-server + + + org.apache.hbase + hbase-hadoop-compat + + + org.apache.hbase + ${compat.module} + ${project.version} + + + org.apache.hbase + hbase-testing-util com.google.guava @@ -176,50 +192,13 @@ commons-lang - org.apache.hbase - hbase-shell - - - org.apache.hbase - hbase-server + org.cloudera.htrace + htrace-core - org.apache.hbase - hbase-server - test-jar - test + org.cloudera.htrace + htrace-zipkin - - org.apache.hbase - hbase-hadoop-compat - - - org.apache.hbase - hbase-hadoop-compat - ${project.version} - test-jar - test - - - org.apache.hbase - ${compat.module} - ${project.version} - - - org.apache.hbase - ${compat.module} - ${project.version} - test-jar - test - - - org.cloudera.htrace - htrace-core - - - org.cloudera.htrace - htrace-zipkin - diff --git hbase-shell/pom.xml hbase-shell/pom.xml index 56d86f2..8f56fde 100644 --- hbase-shell/pom.xml +++ hbase-shell/pom.xml @@ -177,18 +177,7 @@ org.apache.hbase - hbase-common - test-jar - - - org.apache.hbase - hbase-hadoop-compat - - - org.apache.hbase hbase-hadoop-compat - test-jar - test org.apache.hbase @@ -197,15 +186,7 @@ org.apache.hbase - hbase-server - test-jar - test - - - org.apache.hbase - ${compat.module} - ${project.version} - test-jar + hbase-testing-util test diff --git hbase-testing-util/pom.xml hbase-testing-util/pom.xml new file mode 100644 index 0000000..5623393 --- /dev/null +++ hbase-testing-util/pom.xml @@ -0,0 +1,245 @@ + + + + 4.0.0 + + hbase + org.apache.hbase + 0.97.0-SNAPSHOT + .. + + hbase-testing-util + HBase - Testing Util + HBase Testing Utilities. + + + + + org.apache.hbase + hbase-common + jar + compile + + + org.apache.hbase + hbase-common + test-jar + compile + + + org.apache.hbase + hbase-protocol + jar + compile + + + org.apache.hbase + hbase-client + jar + compile + + + org.apache.hbase + hbase-server + jar + compile + + + org.apache.hbase + hbase-server + test-jar + compile + + + org.apache.hbase + hbase-hadoop-compat + jar + compile + + + org.apache.hbase + hbase-hadoop-compat + test-jar + compile + + + org.apache.hbase + ${compat.module} + jar + compile + + + org.apache.hbase + ${compat.module} + test-jar + compile + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + + + + + + + hadoop-1.1 + + + + !hadoop.profile + + + + + org.apache.hadoop + hadoop-core + compile + + + org.apache.hadoop + hadoop-test + compile + + + + + hadoop-1.0 + + + hadoop.profile + 1.0 + + + + + org.apache.hadoop + hadoop-core + compile + + + org.apache.hadoop + hadoop-test + compile + + + + + + hadoop-2.0 + + + + hadoop.profile2.0 + + + + + org.apache.hadoop + hadoop-common + compile + + + org.apache.hadoop + hadoop-auth + compile + + + org.apache.hadoop + hadoop-client + compile + + + org.apache.hadoop + hadoop-mapreduce-client-core + compile + + + org.apache.hadoop + hadoop-mapreduce-client-jobclient + compile + + + org.apache.hadoop + hadoop-hdfs + compile + + + org.apache.hadoop + hadoop-hdfs + compile + + + org.apache.hadoop + hadoop-annotations + compile + + + org.apache.hadoop + hadoop-minicluster + compile + + + + + + hadoop-3.0 + + + hadoop.profile + 3.0 + + + + 3.0-SNAPSHOT + + + + org.apache.hadoop + hadoop-common + compile + + + org.apache.hadoop + hadoop-annotations + compile + + + org.apache.hadoop + hadoop-minicluster + compile + + + + + \ No newline at end of file diff --git hbase-thrift/pom.xml hbase-thrift/pom.xml index a31a0c0..1e94dca 100644 --- hbase-thrift/pom.xml +++ hbase-thrift/pom.xml @@ -144,11 +144,6 @@ org.apache.hbase - hbase-common - test-jar - - - org.apache.hbase hbase-protocol @@ -181,8 +176,7 @@ org.apache.hbase - hbase-server - test-jar + hbase-testing-util test @@ -191,22 +185,8 @@ org.apache.hbase - hbase-hadoop-compat - ${project.version} - test-jar - test - - - org.apache.hbase - ${compat.module} - ${project.version} - - - org.apache.hbase ${compat.module} ${project.version} - test-jar - test org.cloudera.htrace diff --git pom.xml pom.xml index 0b56d09..8dca13e 100644 --- pom.xml +++ pom.xml @@ -60,6 +60,7 @@ hbase-examples hbase-prefix-tree hbase-assembly + hbase-testing-util scm:svn:http://svn.apache.org/repos/asf/hbase/trunk @@ -1034,6 +1035,12 @@ test-jar test + + org.apache.hbase + hbase-testing-util + ${project.version} + test + org.apache.hbase hbase-prefix-tree -- 1.7.10.2 (Apple Git-33)