You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/06/23 12:03:55 UTC
svn commit: r1138807 - in /james/server/trunk: dnsservice-dnsjava/ file/
imapserver/ jcr/ jdbc/ jpa/ lmtpserver/ mailetcontainer-camel/ mailets/
pop3server/ queue-activemq/ queue-jms/
Author: norman
Date: Thu Jun 23 10:03:54 2011
New Revision: 1138807
URL: http://svn.apache.org/viewvc?rev=1138807&view=rev
Log:
Cleanup dependencies. See JAMES-1280
Modified:
james/server/trunk/dnsservice-dnsjava/pom.xml
james/server/trunk/file/pom.xml
james/server/trunk/imapserver/pom.xml
james/server/trunk/jcr/pom.xml
james/server/trunk/jdbc/pom.xml
james/server/trunk/jpa/pom.xml
james/server/trunk/lmtpserver/pom.xml
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/mailets/pom.xml
james/server/trunk/pop3server/pom.xml
james/server/trunk/queue-activemq/pom.xml
james/server/trunk/queue-jms/pom.xml
Modified: james/server/trunk/dnsservice-dnsjava/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dnsservice-dnsjava/pom.xml Thu Jun 23 10:03:54 2011
@@ -80,11 +80,6 @@ Parent pom build failure prevents inheri
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
</dependency>
Modified: james/server/trunk/file/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/file/pom.xml (original)
+++ james/server/trunk/file/pom.xml Thu Jun 23 10:03:54 2011
@@ -62,15 +62,18 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -83,12 +86,14 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ -->
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-filesystem-api</artifactId>
Modified: james/server/trunk/imapserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Thu Jun 23 10:03:54 2011
@@ -41,8 +41,9 @@
<artifactId>apache-james-imap-message</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-processor</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
Modified: james/server/trunk/jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jcr/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/jcr/pom.xml (original)
+++ james/server/trunk/jcr/pom.xml Thu Jun 23 10:03:54 2011
@@ -31,10 +31,6 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
@@ -61,7 +57,15 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -83,22 +87,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-core</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
Modified: james/server/trunk/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jdbc/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/jdbc/pom.xml (original)
+++ james/server/trunk/jdbc/pom.xml Thu Jun 23 10:03:54 2011
@@ -65,16 +65,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
Modified: james/server/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/jpa/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/jpa/pom.xml (original)
+++ james/server/trunk/jpa/pom.xml Thu Jun 23 10:03:54 2011
@@ -109,16 +109,6 @@ Parent pom build failure prevents inheri
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
@@ -146,7 +136,7 @@ Parent pom build failure prevents inheri
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -157,12 +147,12 @@ Parent pom build failure prevents inheri
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
Modified: james/server/trunk/lmtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Thu Jun 23 10:03:54 2011
@@ -36,6 +36,18 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-library</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-queue-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.james.jspf</groupId>
+ <artifactId>apache-jspf-resolver</artifactId>
+ </exclusion>
</exclusions>
</dependency>
Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Thu Jun 23 10:03:54 2011
@@ -67,11 +67,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Thu Jun 23 10:03:54 2011
@@ -150,17 +150,12 @@ Parent pom build failure prevents inheri
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>${javax.activation.groupId}</groupId>
- <artifactId>${javax.activation.artifactId}</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.apache.james.jspf</groupId>
<artifactId>apache-jspf-resolver</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -188,12 +183,6 @@ Parent pom build failure prevents inheri
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-standard-mailets</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
Modified: james/server/trunk/pop3server/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Thu Jun 23 10:03:54 2011
@@ -30,14 +30,6 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-protocols-library</artifactId>
</dependency>
<dependency>
@@ -72,26 +64,23 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
</dependency>
- <!-- Test dependencies -->
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-memory</artifactId>
- <scope>test</scope>
+ <artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-store</artifactId>
- <scope>test</scope>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-maildir</artifactId>
+ <artifactId>apache-james-mailbox-memory</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-james-mailbox-store</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: james/server/trunk/queue-activemq/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue-activemq/pom.xml Thu Jun 23 10:03:54 2011
@@ -42,10 +42,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-lifecycle-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
@@ -108,11 +104,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
<build>
Modified: james/server/trunk/queue-jms/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-jms/pom.xml?rev=1138807&r1=1138806&r2=1138807&view=diff
==============================================================================
--- james/server/trunk/queue-jms/pom.xml (original)
+++ james/server/trunk/queue-jms/pom.xml Thu Jun 23 10:03:54 2011
@@ -73,11 +73,6 @@
<artifactId>activemq-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-nop</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org