Author: bago
Date: Tue Jun 24 08:04:45 2008
New Revision: 671202
URL: http://svn.apache.org/viewvc?rev=671202&view=rev
Log:
Move real javamail dependency to the parent pom, to make it easier to switch to
alternative implementations. (related to JAMES-845)
Documented how to use geronimo in the main pom.
Modified:
james/server/trunk/avalon-user-function/pom.xml
james/server/trunk/core-library/pom.xml
james/server/trunk/experimental-activemq-function/pom.xml
james/server/trunk/fetchmail-function/pom.xml
james/server/trunk/imap-api/pom.xml
james/server/trunk/imap-codec-library/pom.xml
james/server/trunk/imap-mailbox-processor-function/pom.xml
james/server/trunk/imapmailbox-library/pom.xml
james/server/trunk/imapserver-function/pom.xml
james/server/trunk/jcr-backend-function/pom.xml
james/server/trunk/mailbox-library/pom.xml
james/server/trunk/mailets-function/pom.xml
james/server/trunk/nntpserver-function/pom.xml
james/server/trunk/phoenix-deployment/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server-function/pom.xml
james/server/trunk/remotemanager-function/pom.xml
james/server/trunk/smtpserver-function/pom.xml
james/server/trunk/spoolmanager-function/pom.xml
james/server/trunk/torque-mailboxmanager-function/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=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/avalon-user-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/core-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Tue Jun 24 08:04:45 2008
@@ -46,10 +46,12 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
Modified: james/server/trunk/experimental-activemq-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-activemq-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/experimental-activemq-function/pom.xml (original)
+++ james/server/trunk/experimental-activemq-function/pom.xml Tue Jun 24
08:04:45 2008
@@ -31,10 +31,12 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>mailet</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/fetchmail-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/pom.xml (original)
+++ james/server/trunk/fetchmail-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/imap-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-api/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/imap-api/pom.xml (original)
+++ james/server/trunk/imap-api/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: james/server/trunk/imap-codec-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/pom.xml (original)
+++ james/server/trunk/imap-codec-library/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/imap-mailbox-processor-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/pom.xml (original)
+++ james/server/trunk/imap-mailbox-processor-function/pom.xml Tue Jun 24
08:04:45 2008
@@ -33,6 +33,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: james/server/trunk/imapmailbox-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapmailbox-library/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/imapmailbox-library/pom.xml (original)
+++ james/server/trunk/imapmailbox-library/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
Modified: james/server/trunk/imapserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -69,6 +69,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.avalon.cornerstone.connection</groupId>
Modified: james/server/trunk/jcr-backend-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-backend-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/jcr-backend-function/pom.xml (original)
+++ james/server/trunk/jcr-backend-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -35,6 +35,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/mailbox-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-library/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/mailbox-library/pom.xml (original)
+++ james/server/trunk/mailbox-library/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified: james/server/trunk/mailets-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/mailets-function/pom.xml (original)
+++ james/server/trunk/mailets-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,10 +31,12 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/nntpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/pom.xml (original)
+++ james/server/trunk/nntpserver-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,10 +31,12 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/phoenix-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Tue Jun 24 08:04:45 2008
@@ -241,10 +241,12 @@
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Jun 24 08:04:45 2008
@@ -417,15 +417,19 @@
<artifactId>apache-mime4j</artifactId>
<version>0.4-SNAPSHOT</version>
</dependency>
+ <!-- Declare javamail as provided to be able to easily switch -->
+ <!-- to different implementations (Geronimo) -->
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
@@ -860,4 +864,30 @@
</dependency>
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <!-- To build JAMES against geronimo this should be uncommented -->
+ <!-- and the second block commented. -->
+ <!--
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
</project>
Modified: james/server/trunk/pop3server-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/pom.xml (original)
+++ james/server/trunk/pop3server-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/remotemanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/pom.xml (original)
+++ james/server/trunk/remotemanager-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/smtpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/spoolmanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/pom.xml (original)
+++ james/server/trunk/spoolmanager-function/pom.xml Tue Jun 24 08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/torque-mailboxmanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/pom.xml (original)
+++ james/server/trunk/torque-mailboxmanager-function/pom.xml Tue Jun 24
08:04:45 2008
@@ -31,6 +31,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/user-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=671202&r1=671201&r2=671202&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Tue Jun 24 08:04:45 2008
@@ -44,6 +44,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
