Author: felixk
Date: Wed Sep 28 18:16:57 2011
New Revision: 1177000
URL: http://svn.apache.org/viewvc?rev=1177000&view=rev
Log:
DependencyManagement definitions go to modules root pom.xml
Modified:
james/mailbox/trunk/hbase/pom.xml
james/mailbox/trunk/pom.xml
Modified: james/mailbox/trunk/hbase/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/hbase/pom.xml?rev=1177000&r1=1176999&r2=1177000&view=diff
==============================================================================
--- james/mailbox/trunk/hbase/pom.xml (original)
+++ james/mailbox/trunk/hbase/pom.xml Wed Sep 28 18:16:57 2011
@@ -21,7 +21,8 @@
<parent>
<artifactId>apache-james-mailbox</artifactId>
<groupId>org.apache.james</groupId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
@@ -29,16 +30,6 @@
<name>Apache James HBase Mailbox</name>
<description>Apache James Mailbox implementation over HBase</description>
- <properties>
- <hbase.version>0.90.3</hbase.version>
- <hadoop.version>0.20-append-r1057313</hadoop.version>
- <commons-io.version>2.0.1</commons-io.version>
- <junit.version>4.8.2</junit.version>
- <log4j.version>1.2.16</log4j.version>
- <slf4j.version>1.6.1</slf4j.version>
- <target.jdk>1.6</target.jdk>
- </properties>
-
<repositories>
<repository>
<id>hadoop-non-releases</id>
@@ -52,64 +43,7 @@
</releases>
</repository>
</repositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>0.90.3</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase</artifactId>
- <version>${hbase.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>0.20-append-r1057313</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
-
+
<dependencies>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
Modified: james/mailbox/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/pom.xml?rev=1177000&r1=1176999&r2=1177000&view=diff
==============================================================================
--- james/mailbox/trunk/pom.xml (original)
+++ james/mailbox/trunk/pom.xml Wed Sep 28 18:16:57 2011
@@ -22,6 +22,7 @@
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
<version>1.6</version>
+ <relativePath></relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -771,6 +772,30 @@
END GERONIMO ANNOTATION
-->
+ <!--
+ START HBASE/HADOOP
+ -->
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${version.hbase}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase</artifactId>
+ <version>${version.hbase}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-test</artifactId>
+ <version>${version.hadoop}</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ END HBASE/HADOOP
+ -->
</dependencies>
</dependencyManagement>
@@ -804,6 +829,8 @@
<version.jmock>2.5.1</version.jmock>
<version.lucene>3.1.0</version.lucene>
<version.jackrabbit>2.2.0</version.jackrabbit>
+ <version.hbase>0.90.3</version.hbase>
+ <version.hadoop>0.20-append-r1057313</version.hadoop>
<target.jdk>1.6</target.jdk>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
