Author: bago
Date: Thu Aug 21 04:04:45 2008
New Revision: 687712
URL: http://svn.apache.org/viewvc?rev=687712&view=rev
Log:
Changed the way m2 depends on javamail.
Added support for building against geronimo implementation via maven profile
(-Pgeronimo)
Should help investigating on JAMES-850, too.
Modified:
james/server/trunk/avalon-spring-bridge-library/pom.xml
james/server/trunk/avalon-user-function/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/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/imapserver-function/pom.xml
james/server/trunk/javamail-util/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/management-library/pom.xml
james/server/trunk/nntpserver-function/pom.xml
james/server/trunk/phoenix-deployment-refactor/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/stage/pom.xml
james/server/trunk/torque-mailboxmanager-function/pom.xml
james/server/trunk/user-library/pom.xml
Modified: james/server/trunk/avalon-spring-bridge-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-spring-bridge-library/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/avalon-spring-bridge-library/pom.xml (original)
+++ james/server/trunk/avalon-spring-bridge-library/pom.xml Thu Aug 21 04:04:45
2008
@@ -32,7 +32,6 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
Modified: james/server/trunk/avalon-user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/avalon-user-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server Avalon User function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/core-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-api/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/core-api/pom.xml (original)
+++ james/server/trunk/core-api/pom.xml Thu Aug 21 04:04:45 2008
@@ -34,9 +34,8 @@
<artifactId>mailet</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/core-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-function/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/core-function/pom.xml (original)
+++ james/server/trunk/core-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -51,9 +51,8 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
Modified: james/server/trunk/core-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Thu Aug 21 04:04:45 2008
@@ -56,14 +56,12 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/experimental-activemq-function/pom.xml (original)
+++ james/server/trunk/experimental-activemq-function/pom.xml Thu Aug 21
04:04:45 2008
@@ -28,15 +28,13 @@
<artifactId>james-server-experimental-activemq-function</artifactId>
<name>Apache JAMES Server JMS Function</name>
<dependencies>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/pom.xml (original)
+++ james/server/trunk/fetchmail-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server FetchMail function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/imap-api/pom.xml (original)
+++ james/server/trunk/imap-api/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server IMAP Api</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/imap-codec-library/pom.xml (original)
+++ james/server/trunk/imap-codec-library/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server IMAP Codec Library</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/pom.xml (original)
+++ james/server/trunk/imap-mailbox-processor-function/pom.xml Thu Aug 21
04:04:45 2008
@@ -31,9 +31,8 @@
<name>Apache JAMES Server IMAP Mailbox Processor function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: james/server/trunk/imapserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -78,9 +78,8 @@
<artifactId>avalon-framework-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.avalon.cornerstone.connection</groupId>
Modified: james/server/trunk/javamail-util/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/javamail-util/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/javamail-util/pom.xml (original)
+++ james/server/trunk/javamail-util/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,14 +29,12 @@
<name>Apache JAMES Javamail Utilities</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/jcr-backend-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-backend-function/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/jcr-backend-function/pom.xml (original)
+++ james/server/trunk/jcr-backend-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -33,9 +33,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/mailbox-library/pom.xml (original)
+++ james/server/trunk/mailbox-library/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server Mailbox Manager Library</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
Modified: james/server/trunk/mailets-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/mailets-function/pom.xml (original)
+++ james/server/trunk/mailets-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,14 +29,12 @@
<name>Apache JAMES Server Mailets function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/management-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/management-library/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/management-library/pom.xml (original)
+++ james/server/trunk/management-library/pom.xml Thu Aug 21 04:04:45 2008
@@ -56,57 +56,17 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.connection</groupId>
- <artifactId>cornerstone-connection-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.connection</groupId>
- <artifactId>cornerstone-connection-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-api</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
<artifactId>cornerstone-datasources-api</artifactId>
@@ -115,38 +75,10 @@
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-datasource</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
- <artifactId>cornerstone-scheduler-api</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>dnsjava</groupId>
- <artifactId>dnsjava</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-pool-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.threads</groupId>
- <artifactId>cornerstone-threads-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.excalibur.components</groupId>
- <artifactId>excalibur-thread-api</artifactId>
- </dependency>
- -->
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
@@ -155,13 +87,6 @@
<groupId>mstor</groupId>
<artifactId>mstor</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -170,43 +95,5 @@
<groupId>mx4j</groupId>
<artifactId>mx4j-jmx</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-james-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.excalibur.components</groupId>
- <artifactId>excalibur-thread-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.sockets</groupId>
- <artifactId>cornerstone-sockets-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.cornerstone.datasources</groupId>
- <artifactId>cornerstone-datasources-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- -->
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/nntpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/pom.xml (original)
+++ james/server/trunk/nntpserver-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,14 +29,12 @@
<name>Apache JAMES Server NNTP function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/phoenix-deployment-refactor/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment-refactor/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment-refactor/pom.xml (original)
+++ james/server/trunk/phoenix-deployment-refactor/pom.xml Thu Aug 21 04:04:45
2008
@@ -211,9 +211,8 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
Modified: james/server/trunk/phoenix-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Thu Aug 21 04:04:45 2008
@@ -207,9 +207,8 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Thu Aug 21 04:04:45 2008
@@ -230,11 +230,23 @@
<groupId>org.apache.james</groupId>
<artifactId>mailet</artifactId>
<version>2.4-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailet-base</artifactId>
<version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -242,11 +254,23 @@
<version>1.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>standard-mailets</artifactId>
<version>1.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -254,6 +278,12 @@
<version>1.0-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -495,13 +525,21 @@
<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.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
@@ -973,32 +1011,23 @@
</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>
+
+ <profiles>
+ <profile>
+ <id>geronimo</id>
+ <properties>
+
<javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId>
+
<javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId>
+
<javax.activation.groupId>org.apache.geronimo.specs</javax.activation.groupId>
+
<javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId>
+ </properties>
+ </profile>
+ </profiles>
+ <properties>
+ <javax.activation.groupId>javax.activation</javax.activation.groupId>
+ <javax.activation.artifactId>activation</javax.activation.artifactId>
+ <javax.mail.groupId>javax.mail</javax.mail.groupId>
+ <javax.mail.artifactId>mail</javax.mail.artifactId>
+ </properties>
+
</project>
Modified: james/server/trunk/pop3server-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/pom.xml (original)
+++ james/server/trunk/pop3server-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server POP3 function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/pom.xml (original)
+++ james/server/trunk/remotemanager-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server RemoteManager function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server SMTP function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/pom.xml (original)
+++ james/server/trunk/spoolmanager-function/pom.xml Thu Aug 21 04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server SpoolManager function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/stage/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/pom.xml?rev=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/stage/pom.xml (original)
+++ james/server/trunk/stage/pom.xml Thu Aug 21 04:04:45 2008
@@ -181,12 +181,12 @@
<artifactId>apache-mime4j</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>${javax.activation.groupId}</groupId>
+ <artifactId>${javax.activation.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/pom.xml (original)
+++ james/server/trunk/torque-mailboxmanager-function/pom.xml Thu Aug 21
04:04:45 2008
@@ -29,9 +29,8 @@
<name>Apache JAMES Server Torque Mailbox Manager</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</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=687712&r1=687711&r2=687712&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Thu Aug 21 04:04:45 2008
@@ -46,9 +46,8 @@
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
