From d1b8c12ca7934138adfe07841287ef53f2aad411 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 | 12 +++++ hbase-common/pom.xml | 4 ++ hbase-hadoop2-compat/pom.xml | 12 +++-- hbase-rest/pom.xml | 110 ++++++++++++++++++++++++++++++++++++++++++ hbase-server/pom.xml | 16 +++++- hbase-thrift/pom.xml | 8 +++ pom.xml | 13 +++++ 7 files changed, 170 insertions(+), 5 deletions(-) diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 5e98975..dd93b6a 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -141,6 +141,10 @@ jackson-mapper-asl + org.jruby.jcodings + jcodings + + org.jruby.joni joni @@ -198,6 +202,10 @@ org.apache.hadoop + hadoop-auth + + + org.apache.hadoop hadoop-common @@ -257,6 +265,10 @@ org.apache.hadoop + hadoop-auth + + + org.apache.hadoop hadoop-common diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 96bdeeb..e1c6bdb 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 + diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index 277679e..059ef5c 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} @@ -153,10 +157,6 @@ limitations under the License. ${hadoop-two.version} - com.yammer.metrics - metrics-core - - commons-lang commons-lang @@ -168,6 +168,10 @@ limitations under the License. com.google.guava guava + + com.yammer.metrics + metrics-core + diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 4afa156..275f092 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 73f24b5..fa2eec5 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -342,6 +342,10 @@ guava + com.google.protobuf + protobuf-java + + commons-cli commons-cli @@ -366,6 +370,10 @@ commons-math + io.netty + netty + + log4j log4j @@ -426,7 +434,13 @@ org.cloudera.htrace htrace-core - + + + + org.hamcrest + hamcrest-core + test + diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 9854670..b7979a4 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -208,6 +208,14 @@ 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 a7e057c..97b0db2 100644 --- a/pom.xml +++ b/pom.xml @@ -998,6 +998,7 @@ 1.8 1.6.8 4.11 + 1.3 2.04 1.2.17 1.9.0 @@ -1012,6 +1013,7 @@ 1.3.1 3.6.6.Final 2.1.2 + 1.0.8 2.4 1.6 @@ -1334,6 +1336,11 @@ + org.jruby.jcodings + jcodings + ${jcodings.version} + + org.jruby.joni joni ${joni.version} @@ -1483,6 +1490,12 @@ ${junit.version} + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + + org.mockito mockito-all ${mockito-all.version} -- 1.7.10.2 (Apple Git-33)