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 2010/09/26 16:57:55 UTC
svn commit: r1001443 - in /james/server/trunk: core-library/
dnsservice-dnsjava/ domain-function/ domain-library/ fetchmail/ imapserver/
mail-jcr/ mailbox-adapter/ mailetcontainer-camel/ mailets/ pop3server/
queue-activemq/ remotemanager/ smtpserver/ s...
Author: norman
Date: Sun Sep 26 14:57:54 2010
New Revision: 1001443
URL: http://svn.apache.org/viewvc?rev=1001443&view=rev
Log:
start to cleanup maven dependencies
Modified:
james/server/trunk/core-library/pom.xml
james/server/trunk/dnsservice-dnsjava/pom.xml
james/server/trunk/domain-function/pom.xml
james/server/trunk/domain-library/pom.xml
james/server/trunk/fetchmail/pom.xml
james/server/trunk/imapserver/pom.xml
james/server/trunk/mail-jcr/pom.xml
james/server/trunk/mailbox-adapter/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/remotemanager/pom.xml
james/server/trunk/smtpserver/pom.xml
james/server/trunk/spoolmanager/pom.xml
james/server/trunk/user-function/pom.xml
Modified: james/server/trunk/core-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Sun Sep 26 14:57:54 2010
@@ -36,15 +36,6 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-common-util</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-spool-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/dnsservice-dnsjava/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/dnsservice-dnsjava/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/dnsservice-dnsjava/pom.xml (original)
+++ james/server/trunk/dnsservice-dnsjava/pom.xml Sun Sep 26 14:57:54 2010
@@ -78,10 +78,6 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</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>
@@ -103,6 +99,11 @@
<artifactId>dnsjava</artifactId>
</dependency>
<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: james/server/trunk/domain-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-function/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/domain-function/pom.xml (original)
+++ james/server/trunk/domain-function/pom.xml Sun Sep 26 14:57:54 2010
@@ -46,10 +46,6 @@
<artifactId>james-server-dnsservice-dnsjava</artifactId>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- </dependency>
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
</dependency>
@@ -58,25 +54,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
- <dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</dependency>
- <dependency>
- <groupId>javax.jcr</groupId>
- <artifactId>jcr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
@@ -125,12 +106,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
</dependencies>
<build>
Modified: james/server/trunk/domain-library/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/domain-library/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/domain-library/pom.xml (original)
+++ james/server/trunk/domain-library/pom.xml Sun Sep 26 14:57:54 2010
@@ -40,5 +40,13 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: james/server/trunk/fetchmail/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Sun Sep 26 14:57:54 2010
@@ -38,10 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
<dependency>
Modified: james/server/trunk/imapserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Sun Sep 26 14:57:54 2010
@@ -56,5 +56,9 @@
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: james/server/trunk/mail-jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mail-jcr/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/mail-jcr/pom.xml (original)
+++ james/server/trunk/mail-jcr/pom.xml Sun Sep 26 14:57:54 2010
@@ -48,38 +48,10 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</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-mail-library</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/mailbox-adapter/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/pom.xml (original)
+++ james/server/trunk/mailbox-adapter/pom.xml Sun Sep 26 14:57:54 2010
@@ -43,6 +43,10 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-maildir</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
</dependency>
</dependencies>
</project>
Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Sun Sep 26 14:57:54 2010
@@ -53,10 +53,6 @@
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-queue-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
</dependency>
Modified: james/server/trunk/mailets/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Sun Sep 26 14:57:54 2010
@@ -98,10 +98,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mail-api</artifactId>
</dependency>
<dependency>
@@ -157,7 +153,10 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailbox-api</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -178,12 +177,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </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=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Sun Sep 26 14:57:54 2010
@@ -34,20 +34,12 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-dnsservice-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-netty-socket</artifactId>
@@ -92,12 +84,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
<scope>test</scope>
</dependency>
Modified: james/server/trunk/queue-activemq/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/queue-activemq/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/queue-activemq/pom.xml (original)
+++ james/server/trunk/queue-activemq/pom.xml Sun Sep 26 14:57:54 2010
@@ -57,8 +57,8 @@
<artifactId>commons-logging-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
</dependency>
<dependency>
<groupId>${javax.mail.groupId}</groupId>
Modified: james/server/trunk/remotemanager/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/remotemanager/pom.xml (original)
+++ james/server/trunk/remotemanager/pom.xml Sun Sep 26 14:57:54 2010
@@ -50,10 +50,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
</dependency>
<dependency>
@@ -114,6 +110,11 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-mail-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
Modified: james/server/trunk/smtpserver/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Sun Sep 26 14:57:54 2010
@@ -47,11 +47,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-netty-socket</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
@@ -150,11 +146,5 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/spoolmanager/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/pom.xml (original)
+++ james/server/trunk/spoolmanager/pom.xml Sun Sep 26 14:57:54 2010
@@ -34,15 +34,15 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
+ <artifactId>james-server-spool-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- </dependency>
+ <artifactId>james-server-core-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
+ <artifactId>james-server-core-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -78,27 +78,9 @@
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
- <type>test-jar</type>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
- <type>test-jar</type>
- <scope>runtime</scope>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/user-function/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/user-function/pom.xml?rev=1001443&r1=1001442&r2=1001443&view=diff
==============================================================================
--- james/server/trunk/user-function/pom.xml (original)
+++ james/server/trunk/user-function/pom.xml Sun Sep 26 14:57:54 2010
@@ -74,10 +74,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org