HBASE-2452 Fix our Maven dependencies

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@936062 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-04-20 21:10:44 +00:00
parent 446583b0b1
commit 0f17cbf487
8 changed files with 289 additions and 167 deletions

View File

@ -516,6 +516,7 @@ Release 0.21.0 - Unreleased
HBASE-2430 Disable frag display in trunk, let HBASE-2165 replace it
HBASE-1892 [performance] make hbase splits run faster
HBASE-2456 deleteChangedReaderObserver spitting warnings after HBASE-2248
HBASE-2452 Fix our Maven dependencies (Lars Francke via Stack)
NEW FEATURES
HBASE-1961 HBase EC2 scripts

View File

@ -2,16 +2,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>hbase-contrib</artifactId>
<packaging>pom</packaging>
<name>HBase Contrib</name>
<parent>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
<version>0.21.0-SNAPSHOT</version>
</parent>
<artifactId>hbase-contrib</artifactId>
<packaging>pom</packaging>
<name>HBase Contrib</name>
<modules>
<!-- Commenting out for the moment. This is being rewritten. Will then pick up new WALEdit hlog value
<module>mdc_replication</module>
@ -20,4 +20,5 @@
<module>stargate</module>
<module>transactional</module>
</modules>
</project>

View File

@ -3,24 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>hbase-contrib-stargate-core</artifactId>
<packaging>jar</packaging>
<name>HBase Contrib - Stargate Core</name>
<parent>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-contrib-stargate</artifactId>
<version>0.21.0-SNAPSHOT</version>
</parent>
<properties>
<jsr311.version>1.1.1</jsr311.version>
<protobuf.version>2.3.0</protobuf.version>
<jersey.version>1.1.5.1</jersey.version>
<json.version>20090211</json.version>
<hsqldb.version>1.8.0.10</hsqldb.version>
<commons-httpclient.version>3.0.1</commons-httpclient.version>
</properties>
<artifactId>hbase-contrib-stargate-core</artifactId>
<packaging>jar</packaging>
<name>HBase Contrib - Stargate Core</name>
<build>
<plugins>
@ -45,32 +36,27 @@
</plugins>
</build>
<properties>
<commons-httpclient.version>3.1</commons-httpclient.version>
<jaxb-api.version>2.1</jaxb-api.version>
<jersey.version>1.1.5.1</jersey.version>
<jsr311.version>1.1.1</jsr311.version>
<protobuf.version>2.3.0</protobuf.version>
<stax-api>1.0.1</stax-api>
<hsqldb.version>1.8.0.10</hsqldb.version>
</properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hbase-core</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hbase-core</artifactId>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<version>${hadoop.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>${jsr311.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
@ -81,21 +67,85 @@
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>${commons-httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>${jsr311.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<!--
It is unfortunately neccessary to keep hbase-core before hadoop-core.
For an explanation see the pom.xml from hbase-core.
-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hbase-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
</dependency>
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
<version>1.0.1</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hbase-core</artifactId>
<classifier>tests</classifier>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<version>${hadoop.version}</version>
</dependency>
</dependencies>
</project>

View File

@ -3,15 +3,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>hbase-contrib-stargate</artifactId>
<packaging>pom</packaging>
<name>HBase Contrib - Stargate</name>
<parent>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-contrib</artifactId>
<version>0.21.0-SNAPSHOT</version>
</parent>
<artifactId>hbase-contrib-stargate</artifactId>
<packaging>pom</packaging>
<name>HBase Contrib - Stargate</name>
<modules>
<module>core</module>
<module>war</module>

View File

@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>hbase-contrib-stargate-war</artifactId>
<packaging>war</packaging>
<name>HBase Contrib - Stargate WAR</name>
<parent>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-contrib-stargate</artifactId>
<version>0.21.0-SNAPSHOT</version>
</parent>
<artifactId>hbase-contrib-stargate-war</artifactId>
<packaging>war</packaging>
<name>HBase Contrib - Stargate WAR</name>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>

View File

@ -26,10 +26,29 @@
</build>
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<!--
It is unfortunately neccessary to keep hbase-core before hadoop-core.
For an explanation see the pom.xml from hbase-core.
-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hbase-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hbase-core</artifactId>

View File

@ -13,11 +13,7 @@
<version>0.21.0-SNAPSHOT</version>
</parent>
<!-- TODO still need Repositories defined-->
<build>
<!-- TODO this may affect the contrib dependency resolution, commenting out for now
<finalName>hbase-${project.version}</finalName>
-->
<resources>
<resource>
<directory>src/main/resources</directory>
@ -154,30 +150,81 @@
</plugins>
</build>
<properties>
<commons-lang.version>2.5</commons-lang.version>
<commons-math.version>2.1</commons-math.version>
<jasper.version>5.5.23</jasper.version>
<jruby.version>1.4.0</jruby.version>
<slf4j.version>1.5.8</slf4j.version>
<thrift.version>0.2.0</thrift.version>
</properties>
<dependencies>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
<!--
This is highly dubious!
We need SLF4J >= 1.5.6 and Thrift depends on that version.
hadoop-core on the other hand depends on SLF4J 1.4.3 (even though it is optional)
and Mavens dependency resolution mechanism choses the 'nearest' dependency in case
of a conflict of dependencies on the same level. The nearest is always the one
that was defined first in the pom:
http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html
That's why we've added an explicit dependency to SFL4J-API even though we don't need it.
Make sure to check the version of SLF4J Hadoop and Thrift depend on when you upgrade
one of them.
-->
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>thrift</artifactId>
<version>${thrift.version}</version>
<exclusions>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
@ -191,7 +238,6 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@ -208,31 +254,17 @@
<artifactId>jasper-runtime</artifactId>
<version>${jasper.version}</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
<version>${jasper.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop.version}</version>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>${jruby.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>thrift</artifactId>
<version>${thrift.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@ -241,42 +273,8 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons-lang.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
</dependency>
<!--
TODO mention to Hbase team to tell the avro team about this problem,
hbase-core depends on hadoop, which then:
[INFO] | \- org.apache.hadoop:avro:jar:1.2.0:compile
[INFO] | +- org.slf4j:slf4j-simple:jar:1.5.8:compile
[INFO] | | \- org.slf4j:slf4j-api:jar:1.5.2:compile
see: https://forum.hibernate.org/viewtopic.php?p=2400801 and http://old.nabble.com/org.slf4j.impl.StaticLoggerBinder.SINGLETON-td20987705.html
upgrading to 1.5.6 will fix this
-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
<version>${jruby.version}</version>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
</dependency>
</dependencies>
</project>

98
pom.xml
View File

@ -149,31 +149,11 @@
<name>Michael Stack</name>
<email>stack@apache.org</email>
<timezone>-8</timezone>
<organization>Powerset</organization>
<organizationUrl>http://www.powerset.com/</organizationUrl>
<organization>StumbleUpon</organization>
<organizationUrl>http://www.stumbleupon.com/</organizationUrl>
</developer>
</developers>
<properties>
<compileSource>1.6</compileSource>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>0.20.2-with-200-826</hadoop.version>
<log4j.version>1.2.15</log4j.version>
<jetty.version>6.1.14</jetty.version>
<jasper.version>5.5.12</jasper.version>
<commons-lang.version>2.4</commons-lang.version>
<commons-math.version>2.0</commons-math.version>
<commons-cli.version>1.2</commons-cli.version>
<zookeeper.version>3.3.0</zookeeper.version>
<!-- TODO specify external repositories - Note the following 1 resource (thrift) is not downloadable from a public repository, you'll need to place this manually by using 'mvn install:file' or use something like Nexus as a repository manager -->
<thrift.version>0.2.0</thrift.version>
<jruby.version>1.4.0</jruby.version>
<slf4j.version>1.5.8</slf4j.version>
<jopt.version>3.2</jopt.version>
</properties>
<repositories>
<repository>
<id>java.net</id>
@ -303,8 +283,62 @@
</plugins>
</build>
<properties>
<compileSource>1.6</compileSource>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<hadoop.version>0.20.2-with-200-826</hadoop.version>
<commons-cli.version>1.2</commons-cli.version>
<commons-logging.version>1.1.1</commons-logging.version>
<jetty.version>6.1.14</jetty.version>
<junit.version>4.8.1</junit.version>
<log4j.version>1.2.15</log4j.version>
<zookeeper.version>3.3.0</zookeeper.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
<exclusions>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hbase-core</artifactId>
@ -317,6 +351,19 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
<version>${jetty.version}</version>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
@ -324,9 +371,10 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
<version>${jopt.version}</version>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>