Author: norman
Date: Mon Jun 7 19:43:09 2010
New Revision: 952388
URL: http://svn.apache.org/viewvc?rev=952388&view=rev
Log:
Cleanup poms to remove unused dependencies, add missed dependencies etc
Removed:
james/server/trunk/spoolmanager/src/test/java/org/apache/james/transport/LinearProcessorTest.java
Modified:
james/server/trunk/core-library/pom.xml
james/server/trunk/imapserver/pom.xml
james/server/trunk/jcr-store/pom.xml
james/server/trunk/mailets/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server/pom.xml
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
james/server/trunk/remotemanager/pom.xml
james/server/trunk/smtpserver/pom.xml
james/server/trunk/spoolmanager/pom.xml
Modified: james/server/trunk/core-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Mon Jun 7 19:43:09 2010
@@ -33,7 +33,10 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mailet-base</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-common-util</artifactId>
@@ -62,10 +65,6 @@
<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>
@@ -83,17 +82,16 @@
<artifactId>james-server-user-api</artifactId>
<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>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: james/server/trunk/imapserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/imapserver/pom.xml (original)
+++ james/server/trunk/imapserver/pom.xml Mon Jun 7 19:43:09 2010
@@ -29,11 +29,6 @@
<name>Apache JAMES Server IMAP</name>
<dependencies>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
</dependency>
@@ -46,13 +41,6 @@
<artifactId>james-server-common-util</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
- </dependency>
-
-
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.0_spec</artifactId>
@@ -112,15 +100,10 @@
<groupId>org.apache.db.torque</groupId>
<artifactId>runtime</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
+
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
</dependencies>
</project>
Modified: james/server/trunk/jcr-store/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-store/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/jcr-store/pom.xml (original)
+++ james/server/trunk/jcr-store/pom.xml Mon Jun 7 19:43:09 2010
@@ -78,14 +78,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -100,14 +94,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
Modified: james/server/trunk/mailets/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Mon Jun 7 19:43:09 2010
@@ -92,6 +92,10 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jspf</artifactId>
</dependency>
@@ -109,12 +113,6 @@
</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>apache-mailet-base</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon Jun 7 19:43:09 2010
@@ -644,6 +644,11 @@
</dependency>
<dependency>
<groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
<exclusions>
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Mon Jun 7 19:43:09 2010
@@ -74,16 +74,19 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
+ <artifactId>james-server-netty-socket</artifactId>
</dependency>
-
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-netty-socket</artifactId>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-james-imap-store</artifactId>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -120,11 +123,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-memory</artifactId>
<scope>test</scope>
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/core/WelcomeMessageHandler.java
Mon Jun 7 19:43:09 2010
@@ -19,14 +19,13 @@
package org.apache.james.pop3server.core;
-import org.apache.james.Constants;
import org.apache.james.pop3server.POP3Response;
import org.apache.james.pop3server.POP3Session;
import org.apache.james.protocols.api.ConnectHandler;
public class WelcomeMessageHandler implements ConnectHandler<POP3Session> {
/** POP3 Server identification string used in POP3 headers */
- private static final String softwaretype = "JAMES POP3 Server " +
Constants.SOFTWARE_VERSION;
+ private static final String softwaretype = "JAMES POP3 Server ";// +
Constants.SOFTWARE_VERSION;
/**
* @see
org.apache.james.pop3server.ConnectHandler#onConnect(org.apache.james.pop3server.POP3Session)
Modified: james/server/trunk/remotemanager/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/remotemanager/pom.xml (original)
+++ james/server/trunk/remotemanager/pom.xml Mon Jun 7 19:43:09 2010
@@ -74,13 +74,12 @@
<artifactId>james-server-netty-socket</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james.protocols</groupId>
- <artifactId>protocols-api</artifactId>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
+ <groupId>org.apache.james.protocols</groupId>
+ <artifactId>protocols-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -95,11 +94,7 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
- <scope>test</scope>
- </dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-library</artifactId>
Modified: james/server/trunk/smtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Mon Jun 7 19:43:09 2010
@@ -89,7 +89,10 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-jspf</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.jboss.netty</groupId>
+ <artifactId>netty</artifactId>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -133,23 +136,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/spoolmanager/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager/pom.xml?rev=952388&r1=952387&r2=952388&view=diff
==============================================================================
--- james/server/trunk/spoolmanager/pom.xml (original)
+++ james/server/trunk/spoolmanager/pom.xml Mon Jun 7 19:43:09 2010
@@ -53,7 +53,10 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-domain-api</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-common-util</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
@@ -76,14 +79,10 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
</dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
+
<dependency>
<groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <artifactId>commons-logging-api</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -94,18 +93,20 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-standard-mailets</artifactId>
+ <artifactId>james-server-core-library</artifactId>
+ <type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
- <type>test-jar</type>
+ <artifactId>apache-standard-mailets</artifactId>
+ <classifier>tests</classifier>
<scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
@@ -123,11 +124,5 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-core-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
