Author: norman
Date: Sat Jan 30 09:52:46 2010
New Revision: 904743
URL: http://svn.apache.org/viewvc?rev=904743&view=rev
Log:
Try to cleanup dependencies
Modified:
james/server/trunk/avalon-user-function/pom.xml
james/server/trunk/basic-user-function/pom.xml
james/server/trunk/common-util/pom.xml
james/server/trunk/core-api/pom.xml
james/server/trunk/core-function/pom.xml
james/server/trunk/core-library/pom.xml
james/server/trunk/domain-api/pom.xml
james/server/trunk/imapserver-function/pom.xml
james/server/trunk/mailets-function/pom.xml
james/server/trunk/management-library/pom.xml
james/server/trunk/pop3server-function/pom.xml
james/server/trunk/remotemanager-function/pom.xml
james/server/trunk/smtp-protocol-library/pom.xml
james/server/trunk/smtpserver-function/pom.xml
james/server/trunk/socket-api/pom.xml
james/server/trunk/spoolmanager-function/pom.xml
james/server/trunk/spring-deployment/pom.xml
james/server/trunk/user-library/pom.xml
Modified: james/server/trunk/avalon-user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/avalon-user-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -61,19 +61,15 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-common-util</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
@@ -86,19 +82,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
-
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>junit</groupId>
Modified: james/server/trunk/basic-user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/pom.xml (original)
+++ james/server/trunk/basic-user-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -41,23 +41,18 @@
<artifactId>james-server-user-library</artifactId>
<scope>compile</scope>
</dependency>
-
-
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-common-util</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
+ <artifactId>james-server-user-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: james/server/trunk/common-util/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/common-util/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/common-util/pom.xml (original)
+++ james/server/trunk/common-util/pom.xml Sat Jan 30 09:52:46 2010
@@ -34,10 +34,6 @@
<artifactId>oro</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: james/server/trunk/core-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/core-api/pom.xml (original)
+++ james/server/trunk/core-api/pom.xml Sat Jan 30 09:52:46 2010
@@ -37,11 +37,7 @@
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </dependency>
-
+
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
Modified: james/server/trunk/core-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -54,20 +54,19 @@
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
+
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
-
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
-
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
@@ -100,8 +99,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/server/trunk/core-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Sat Jan 30 09:52:46 2010
@@ -33,23 +33,12 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
- <!-- Probably used for RFC2822Headers -->
- <!-- Not needed at runtime because of compiler inlining constants -->
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-common-util</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- </dependency>
- -->
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
@@ -64,7 +53,19 @@
<artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
Modified: james/server/trunk/domain-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/domain-api/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/domain-api/pom.xml (original)
+++ james/server/trunk/domain-api/pom.xml Sat Jan 30 09:52:46 2010
@@ -30,12 +30,13 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
+ <artifactId>apache-mailet</artifactId>
</dependency>
<!-- javax.mail.URLname (Iterable<HostAddress> ?) -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/imapserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -59,11 +59,7 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve</artifactId>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -100,10 +96,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-imap-processor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-seda</artifactId>
</dependency>
@@ -121,6 +113,14 @@
</dependency>
<dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.db.torque</groupId>
<artifactId>runtime</artifactId>
</dependency>
Modified: james/server/trunk/mailets-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/mailets-function/pom.xml (original)
+++ james/server/trunk/mailets-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -84,7 +84,10 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-standard-mailets</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jspf</artifactId>
Modified: james/server/trunk/management-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/management-library/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/management-library/pom.xml (original)
+++ james/server/trunk/management-library/pom.xml Sat Jan 30 09:52:46 2010
@@ -58,6 +58,11 @@
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
Modified: james/server/trunk/pop3server-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/pom.xml (original)
+++ james/server/trunk/pop3server-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -74,7 +74,11 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-mina-socket-library</artifactId>
@@ -84,30 +88,31 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-common-util</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
Modified: james/server/trunk/remotemanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/pom.xml (original)
+++ james/server/trunk/remotemanager-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -74,7 +74,14 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-mina-socket-library</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -86,12 +93,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-common-util</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
Modified: james/server/trunk/smtp-protocol-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtp-protocol-library/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/smtp-protocol-library/pom.xml (original)
+++ james/server/trunk/smtp-protocol-library/pom.xml Sat Jan 30 09:52:46 2010
@@ -50,11 +50,11 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jspf</artifactId>
+ <artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
+ <artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Modified: james/server/trunk/smtpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -51,6 +51,10 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-socket-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
</dependency>
<dependency>
@@ -81,20 +85,16 @@
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jspf</artifactId>
</dependency>
- <dependency>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- <scope>runtime</scope>
- </dependency>
-
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -115,10 +115,9 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-common-util</artifactId>
- <type>test-jar</type>
+ <artifactId>james-server-user-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: james/server/trunk/socket-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/socket-api/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/socket-api/pom.xml (original)
+++ james/server/trunk/socket-api/pom.xml Sat Jan 30 09:52:46 2010
@@ -29,10 +29,6 @@
<name>Apache JAMES Server Socket API</name>
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
Modified: james/server/trunk/spoolmanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/pom.xml (original)
+++ james/server/trunk/spoolmanager-function/pom.xml Sat Jan 30 09:52:46 2010
@@ -81,12 +81,7 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-common-util</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-standard-mailets</artifactId>
Modified: james/server/trunk/spring-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/pom.xml (original)
+++ james/server/trunk/spring-deployment/pom.xml Sat Jan 30 09:52:46 2010
@@ -202,6 +202,14 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<scope>runtime</scope>
Modified: james/server/trunk/user-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=904743&r1=904742&r2=904743&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Sat Jan 30 09:52:46 2010
@@ -49,7 +49,10 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
<artifactId>${javax.mail.artifactId}</artifactId>
@@ -60,11 +63,19 @@
<artifactId>oro</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
