Repository: hbase Updated Branches: refs/heads/0.98 077f9ea4b -> bcfd6b20e
HBASE-12898 ensure direct dependencies are declared. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bcfd6b20 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bcfd6b20 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bcfd6b20 Branch: refs/heads/0.98 Commit: bcfd6b20e6d38bc796a68d3fd27e4e5aaf7e1907 Parents: 077f9ea Author: Sean Busbey <bus...@apache.org> Authored: Wed Jan 21 15:12:57 2015 -0600 Committer: Sean Busbey <bus...@apache.org> Committed: Thu Jan 22 15:16:23 2015 -0600 ---------------------------------------------------------------------- hbase-client/pom.xml | 12 ++++ hbase-common/pom.xml | 4 ++ hbase-hadoop2-compat/pom.xml | 12 ++-- hbase-rest/pom.xml | 123 ++++++++++++++++++++++++++++++++++++++ hbase-server/pom.xml | 15 ++++- hbase-thrift/pom.xml | 8 +++ pom.xml | 12 ++++ 7 files changed, 181 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/bcfd6b20/hbase-client/pom.xml ---------------------------------------------------------------------- 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 @@ <artifactId>jackson-mapper-asl</artifactId> </dependency> <dependency> + <groupId>org.jruby.jcodings</groupId> + <artifactId>jcodings</artifactId> + </dependency> + <dependency> <groupId>org.jruby.joni</groupId> <artifactId>joni</artifactId> </dependency> @@ -198,6 +202,10 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <exclusions> <exclusion> @@ -257,6 +265,10 @@ <dependencies> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/hbase/blob/bcfd6b20/hbase-common/pom.xml ---------------------------------------------------------------------- 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 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/hbase/blob/bcfd6b20/hbase-hadoop2-compat/pom.xml ---------------------------------------------------------------------- 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. <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + </dependency> + <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <version>${hadoop-two.version}</version> @@ -153,10 +157,6 @@ limitations under the License. <version>${hadoop-two.version}</version> </dependency> <dependency> - <groupId>com.yammer.metrics</groupId> - <artifactId>metrics-core</artifactId> - </dependency> - <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> @@ -168,6 +168,10 @@ limitations under the License. <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.yammer.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/hbase/blob/bcfd6b20/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 4afa156..dc7d344 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -210,6 +210,10 @@ </dependency> <!-- REST dependencies --> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> </dependency> @@ -226,9 +230,58 @@ <artifactId>jersey-server</artifactId> </dependency> <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-core-asl</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-jaxrs</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-sslengine</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-util</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-api-2.1</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </dependency> + <!-- test dependencies --> + <dependency> + <groupId>org.codehaus.jackson</groupId> + <artifactId>jackson-mapper-asl</artifactId> + </dependency> </dependencies> <profiles> <!-- Skip the tests in this module --> @@ -292,5 +345,75 @@ </plugins> </build> </profile> + <!-- Hadoop-specific dependencies --> + <!-- profile against Hadoop 1.1.x. --> + <profile> + <id>hadoop-1.1</id> + <activation> + <property> + <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> + <!--h1--><name>hadoop.profile</name><value>1.1</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-core</artifactId> + </dependency> + </dependencies> + </profile> + <!-- profile for building against Hadoop 2.0.x + This is the default. + --> + <profile> + <id>hadoop-2.0</id> + <activation> + <property> + <!--Below formatting for dev-support/generate-hadoopX-poms.sh--> + <!--h2--><name>!hadoop.profile</name> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + </dependency> + </dependencies> + </profile> + <!-- + profile for building against Hadoop 3.0.0. Activate using: + mvn -Dhadoop.profile=3.0 + --> + <profile> + <id>hadoop-3.0</id> + <activation> + <property> + <name>hadoop.profile</name> + <value>3.0</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + </dependency> + </dependencies> + </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/hbase/blob/bcfd6b20/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 73f24b5..1539df4 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -342,6 +342,10 @@ <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> @@ -366,6 +370,10 @@ <artifactId>commons-math</artifactId> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty</artifactId> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> @@ -426,7 +434,12 @@ <dependency> <groupId>org.cloudera.htrace</groupId> <artifactId>htrace-core</artifactId> - </dependency> + </dependency> + <!-- Test dependencies --> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + </dependency> </dependencies> <profiles> <!-- Skip the tests in this module --> http://git-wip-us.apache.org/repos/asf/hbase/blob/bcfd6b20/hbase-thrift/pom.xml ---------------------------------------------------------------------- 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 @@ </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jsp-api-2.1</artifactId> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> <artifactId>jsp-2.1</artifactId> <scope>compile</scope> </dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/bcfd6b20/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a7e057c..0681f29 100644 --- a/pom.xml +++ b/pom.xml @@ -998,6 +998,7 @@ <jersey.version>1.8</jersey.version> <jruby.version>1.6.8</jruby.version> <junit.version>4.11</junit.version> + <hamcrest.version>1.3</hamcrest.version> <htrace.version>2.04</htrace.version> <log4j.version>1.2.17</log4j.version> <mockito-all.version>1.9.0</mockito-all.version> @@ -1012,6 +1013,7 @@ <jettison.version>1.3.1</jettison.version> <netty.version>3.6.6.Final</netty.version> <joni.version>2.1.2</joni.version> + <jcodings.version>1.0.8</jcodings.version> <!-- Plugin Dependencies --> <maven.assembly.version>2.4</maven.assembly.version> <maven.antrun.version>1.6</maven.antrun.version> @@ -1334,6 +1336,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.jruby.jcodings</groupId> + <artifactId>jcodings</artifactId> + <version>${jcodings.version}</version> + </dependency> + <dependency> <groupId>org.jruby.joni</groupId> <artifactId>joni</artifactId> <version>${joni.version}</version> @@ -1483,6 +1490,11 @@ <version>${junit.version}</version> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrest.version}</version> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>${mockito-all.version}</version>
