Author: eric
Date: Thu Mar 1 12:31:05 2012
New Revision: 1295537
URL: http://svn.apache.org/viewvc?rev=1295537&view=rev
Log:
Upgrade to mailbox 0.4, imap 0.3, jsieve 0.5, hbase 0.90.4 and hadoop
0.20.205.0 (JAMES-1389)
Modified:
james/server/trunk/data-hbase/pom.xml
james/server/trunk/pom.xml
Modified: james/server/trunk/data-hbase/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-hbase/pom.xml?rev=1295537&r1=1295536&r2=1295537&view=diff
==============================================================================
--- james/server/trunk/data-hbase/pom.xml (original)
+++ james/server/trunk/data-hbase/pom.xml Thu Mar 1 12:31:05 2012
@@ -22,23 +22,17 @@
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>
-
<parent>
<artifactId>james-server</artifactId>
<groupId>org.apache.james</groupId>
<version>3.0-beta4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
- <groupId>org.apache.james</groupId>
<artifactId>james-server-data-hbase</artifactId>
-
<name>Apache James Server HBase Data Persistence</name>
-
<properties>
<junit.version>4.8.2</junit.version>
</properties>
-
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
@@ -69,14 +63,41 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -104,8 +125,14 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase</artifactId>
- <scope>test</scope>
<type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -113,7 +140,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1295537&r1=1295536&r2=1295537&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Mar 1 12:31:05 2012
@@ -94,17 +94,17 @@
<activemq.version>5.4.2</activemq.version>
<camel.version>2.5.0</camel.version>
<derby.version>10.7.1.1</derby.version>
- <hadoop.version>0.20-append-r1057313</hadoop.version>
- <hbase.version>0.90.3</hbase.version>
- <imap.version>0.3-SNAPSHOT</imap.version>
+ <hadoop.version>0.20.205.0</hadoop.version>
+ <hbase.version>0.90.4</hbase.version>
+ <imap.version>0.3</imap.version>
<jackrabbit.version>2.2.5</jackrabbit.version>
<james.server.version>${project.version}</james.server.version>
<javax.activation.groupId>javax.activation</javax.activation.groupId>
<javax.activation.artifactId>activation</javax.activation.artifactId>
<javax.mail.groupId>javax.mail</javax.mail.groupId>
<javax.mail.artifactId>mail</javax.mail.artifactId>
- <jsieve.version>0.5-SNAPSHOT</jsieve.version>
- <mailbox.version>0.4-SNAPSHOT</mailbox.version>
+ <jsieve.version>0.5</jsieve.version>
+ <mailbox.version>0.4</mailbox.version>
<productName>Apache-James Mail Server</productName>
<protocols.version>1.6.2</protocols.version>
<spring.version>3.1.0.RELEASE</spring.version>
@@ -1033,6 +1033,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>${hadoop.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-test</artifactId>
<scope>test</scope>
<version>${hadoop.version}</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
