Repository: hbase Updated Branches: refs/heads/branch-1.0 11dbbcdee -> 99b0f4446
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/99b0f444 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/99b0f444 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/99b0f444 Branch: refs/heads/branch-1.0 Commit: 99b0f444626fdaf0a9faa6c7e84609abeba01c7f Parents: 11dbbcd 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 14:38:42 2015 -0600 ---------------------------------------------------------------------- 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/99b0f444/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 2041e4d..1a67abc 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -89,12 +89,6 @@ <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> - <exclusions> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.apache.hbase</groupId> @@ -123,6 +117,14 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> </dependency> @@ -139,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> @@ -197,11 +203,14 @@ <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> - <version>1.3.9</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-auth</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <exclusions> <exclusion> @@ -313,6 +322,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/99b0f444/hbase-common/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index ad7217d..1b5e06c 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> <!-- tracing Dependencies --> <dependency> <groupId>org.htrace</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/99b0f444/hbase-hadoop2-compat/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index b59f726..7c1c6ee 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> http://git-wip-us.apache.org/repos/asf/hbase/blob/99b0f444/hbase-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 04766b3..36474ab 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -182,6 +182,10 @@ <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.yammer.metrics</groupId> + <artifactId>metrics-core</artifactId> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/99b0f444/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 6da61bd..bf537a7 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,59 @@ <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> + <scope>test</scope> + </dependency> </dependencies> <profiles> <!-- Skip the tests in this module --> @@ -292,5 +346,61 @@ </plugins> </build> </profile> + <!-- Hadoop-specific dependencies --> + <!-- 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> + <scope>test</scope> + </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> + <scope>test</scope> + </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/99b0f444/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 06ffc07..e7986c6 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -313,6 +313,10 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> @@ -349,6 +353,18 @@ <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-core</artifactId> + </dependency> + <dependency> + <groupId>com.sun.jersey</groupId> + <artifactId>jersey-server</artifactId> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> @@ -438,6 +454,12 @@ <groupId>com.lmax</groupId> <artifactId>disruptor</artifactId> </dependency> + <!-- Test dependencies --> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> <profiles> <!-- Skip the tests in this module --> http://git-wip-us.apache.org/repos/asf/hbase/blob/99b0f444/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 469f78f..ae2744e 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -170,10 +170,18 @@ <artifactId>guava</artifactId> </dependency> <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + </dependency> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> @@ -217,6 +225,26 @@ </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>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/99b0f444/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 406aca2..a4dbb9a 100644 --- a/pom.xml +++ b/pom.xml @@ -1002,11 +1002,13 @@ <commons-lang.version>2.6</commons-lang.version> <commons-logging.version>1.2</commons-logging.version> <commons-math.version>2.2</commons-math.version> + <commons-net.version>3.1</commons-net.version> <disruptor.version>3.3.0</disruptor.version> <collections.version>3.2.1</collections.version> <httpclient.version>3.1</httpclient.version> <metrics-core.version>2.2.0</metrics-core.version> <guava.version>12.0.1</guava.version> + <jsr305.version>1.3.9</jsr305.version> <jackson.version>1.8.8</jackson.version> <jasper.version>5.5.23</jasper.version> <jaxb-api.version>2.2.2</jaxb-api.version> @@ -1015,6 +1017,7 @@ <jersey.version>1.9</jersey.version> <jruby.version>1.6.8</jruby.version> <junit.version>4.11</junit.version> + <hamcrest.version>1.3</hamcrest.version> <htrace.version>3.0.4</htrace.version> <log4j.version>1.2.17</log4j.version> <mockito-all.version>1.10.8</mockito-all.version> @@ -1029,6 +1032,7 @@ <jettison.version>1.3.3</jettison.version> <netty.version>4.0.23.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> @@ -1245,6 +1249,11 @@ <version>${guava.version}</version> </dependency> <dependency> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + <version>${jsr305.version}</version> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>${collections.version}</version> @@ -1280,6 +1289,11 @@ <version>${commons-logging.version}</version> </dependency> <dependency> + <groupId>commons-net</groupId> + <artifactId>commons-net</artifactId> + <version>${commons-net.version}</version> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-math</artifactId> <version>${commons-math.version}</version> @@ -1344,6 +1358,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> @@ -1493,6 +1512,12 @@ <version>${junit.version}</version> </dependency> <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-core</artifactId> + <version>${hamcrest.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>${mockito-all.version}</version>
