From 0bec3a7bf456841c03abe8e5735fc5407a56af9f Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Wed, 21 Jan 2015 15:12:57 -0600 Subject: [PATCH] HBASE-12898 ensure direct dependencies are declared. --- hbase-client/pom.xml | 27 ++++++++--- hbase-common/pom.xml | 4 ++ hbase-hadoop2-compat/pom.xml | 4 ++ hbase-it/pom.xml | 4 ++ hbase-rest/pom.xml | 110 ++++++++++++++++++++++++++++++++++++++++++ hbase-server/pom.xml | 22 +++++++++ hbase-thrift/pom.xml | 28 +++++++++++ pom.xml | 25 ++++++++++ 8 files changed, 217 insertions(+), 7 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 6d6dd42..3756ba3 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -89,12 +89,6 @@ org.apache.hbase hbase-common - - - com.google.guava - guava - - org.apache.hbase @@ -123,6 +117,14 @@ commons-logging + com.google.guava + guava + + + com.google.protobuf + protobuf-java + + io.netty netty-all @@ -139,6 +141,10 @@ jackson-mapper-asl + org.jruby.jcodings + jcodings + + org.jruby.joni joni @@ -197,11 +203,14 @@ com.google.code.findbugs jsr305 - 1.3.9 true org.apache.hadoop + hadoop-auth + + + org.apache.hadoop hadoop-common @@ -313,6 +322,10 @@ org.apache.hadoop + hadoop-auth + + + org.apache.hadoop hadoop-common diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 4ead42f..7413025 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -220,6 +220,10 @@ com.google.protobuf protobuf-java + + org.mortbay.jetty + jetty-util + org.htrace diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index d6d7993..2713bfd 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -143,6 +143,10 @@ limitations under the License. test + org.apache.commons + commons-math + + org.apache.hadoop hadoop-mapreduce-client-core ${hadoop-two.version} diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 06e55f4..c70f2a5 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -182,6 +182,10 @@ guava + com.yammer.metrics + metrics-core + + commons-logging commons-logging diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index e1ee730..93e1ef3 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -210,6 +210,10 @@ + com.google.guava + guava + + com.google.protobuf protobuf-java @@ -226,9 +230,59 @@ jersey-server + commons-cli + commons-cli + + + commons-httpclient + commons-httpclient + + + commons-lang + commons-lang + + + commons-logging + commons-logging + + javax.xml.bind jaxb-api + + org.codehaus.jackson + jackson-core-asl + + + org.codehaus.jackson + jackson-jaxrs + + + org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-sslengine + + + org.mortbay.jetty + jetty-util + + + org.mortbay.jetty + jsp-api-2.1 + + + org.mortbay.jetty + servlet-api-2.5 + + + + org.codehaus.jackson + jackson-mapper-asl + test + @@ -292,5 +346,61 @@ + + + + hadoop-2.0 + + + + !hadoop.profile + + + + + org.apache.hadoop + hadoop-mapreduce-client-core + test + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-auth + + + + + + hadoop-3.0 + + + hadoop.profile + 3.0 + + + + + org.apache.hadoop + hadoop-mapreduce-client-core + test + + + org.apache.hadoop + hadoop-common + + + org.apache.hadoop + hadoop-auth + + + diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index bbb93d2..9b5e534 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -313,6 +313,10 @@ commons-httpclient commons-httpclient + + commons-codec + commons-codec + commons-collections commons-collections @@ -349,6 +353,18 @@ guava + com.google.protobuf + protobuf-java + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + + commons-cli commons-cli @@ -438,6 +454,12 @@ com.lmax disruptor + + + org.hamcrest + hamcrest-core + test + diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index d70fa22..1bcaf92 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -170,10 +170,18 @@ guava + com.google.protobuf + protobuf-java + + commons-logging commons-logging + commons-net + commons-net + + commons-cli commons-cli @@ -217,6 +225,26 @@ org.mortbay.jetty + jetty + + + org.mortbay.jetty + jetty-sslengine + + + org.mortbay.jetty + jetty-util + + + org.mortbay.jetty + servlet-api-2.5 + + + org.mortbay.jetty + jsp-api-2.1 + + + org.mortbay.jetty jsp-2.1 compile diff --git a/pom.xml b/pom.xml index 80e97b3..0a59cb7 100644 --- a/pom.xml +++ b/pom.xml @@ -1002,11 +1002,13 @@ 2.6 1.2 2.2 + 3.1 3.3.0 3.2.1 3.1 2.2.0 12.0.1 + 1.3.9 1.8.8 5.5.23 2.2.2 @@ -1015,6 +1017,7 @@ 1.9 1.6.8 4.11 + 1.3 3.0.4 1.2.17 1.10.8 @@ -1029,6 +1032,7 @@ 1.3.3 4.0.23.Final 2.1.2 + 1.0.8 2.4 1.6 @@ -1245,6 +1249,11 @@ ${guava.version} + com.google.code.findbugs + jsr305 + ${jsr305.version} + + commons-collections commons-collections ${collections.version} @@ -1280,6 +1289,11 @@ ${commons-logging.version} + commons-net + commons-net + ${commons-net.version} + + org.apache.commons commons-math ${commons-math.version} @@ -1344,6 +1358,11 @@ + org.jruby.jcodings + jcodings + ${jcodings.version} + + org.jruby.joni joni ${joni.version} @@ -1493,6 +1512,12 @@ ${junit.version} + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + + org.mockito mockito-all ${mockito-all.version} -- 1.7.10.2 (Apple Git-33)