Repository: james-project Updated Branches: refs/heads/master 72af5b126 -> 538ed5382
JAMES-1593 drop geronimo_javamail support and use com.sun 1.5.4 implementation of javax.mail Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/538ed538 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/538ed538 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/538ed538 Branch: refs/heads/master Commit: 538ed5382d4f6927e7d5f694456d8637ed19af1b Parents: 3aec639 Author: Matthieu Baechler <matthieu.baech...@gmail.com> Authored: Fri Dec 11 17:51:17 2015 +0100 Committer: Matthieu Baechler <matthieu.baech...@gmail.com> Committed: Tue Feb 9 14:41:07 2016 +0100 ---------------------------------------------------------------------- mailbox/pom.xml | 17 ----------- mpt/impl/imap-mailbox/pom.xml | 11 ------- protocols/imap/pom.xml | 4 +-- protocols/pom.xml | 7 ++--- protocols/smtp/pom.xml | 6 ++-- .../smtp/AbstractStartTlsSMTPServerTest.java | 3 +- server/container/core/pom.xml | 4 +-- .../org/apache/james/core/MimeMessageTest.java | 12 -------- .../james/core/MimeMessageWrapperTest.java | 1 - server/container/spring/pom.xml | 4 +-- server/container/util/pom.xml | 4 +-- server/data/data-api/pom.xml | 4 +-- server/data/data-file/pom.xml | 4 +-- server/data/data-jcr/pom.xml | 4 +-- server/data/data-jdbc/pom.xml | 4 +-- server/data/data-library/pom.xml | 4 +-- server/data/data-memory/pom.xml | 5 ---- server/dns-service/dnsservice-library/pom.xml | 4 +-- server/mailet/mailetcontainer-api/pom.xml | 4 +-- server/mailet/mailetcontainer-camel/pom.xml | 4 +-- server/mailet/mailets/pom.xml | 4 +-- server/pom.xml | 30 +++++--------------- server/protocols/fetchmail/pom.xml | 4 +-- server/protocols/protocols-lmtp/pom.xml | 4 +-- server/protocols/protocols-pop3/pom.xml | 4 +-- server/protocols/protocols-smtp/pom.xml | 4 +-- server/queue/queue-activemq/pom.xml | 4 +-- server/queue/queue-api/pom.xml | 8 +++--- server/queue/queue-file/pom.xml | 4 +++ server/queue/queue-jms/pom.xml | 4 +-- 30 files changed, 61 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/pom.xml b/mailbox/pom.xml index f14f319..02ece56 100644 --- a/mailbox/pom.xml +++ b/mailbox/pom.xml @@ -116,7 +116,6 @@ <xml-apis.version>1.3.04</xml-apis.version> <geronimo-annotation-spec.version>1.1.1</geronimo-annotation-spec.version> <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version> - <geronimo-javamail-mail.version>1.8.3</geronimo-javamail-mail.version> <apache-mailet.version>2.5.1-SNAPSHOT</apache-mailet.version> <slf4j.version>1.7.7</slf4j.version> <junit.version>4.11</junit.version> @@ -269,11 +268,6 @@ <artifactId>geronimo-activation_1.1_spec</artifactId> <version>${geronimo-activation-spec.version}</version> </dependency> - <dependency> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>${geronimo-javamail-mail.version}</version> - </dependency> <!-- END Mail --> @@ -668,17 +662,6 @@ </dependency> </dependencies> </profile> - <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> - <version.javax.mail>1.6</version.javax.mail> - <version.activation>1.0.2</version.activation> - </properties> - </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/mpt/impl/imap-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml index 14247b3..8f7bb2c 100644 --- a/mpt/impl/imap-mailbox/pom.xml +++ b/mpt/impl/imap-mailbox/pom.xml @@ -110,17 +110,6 @@ <profiles> <profile> - <id>geronimo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId> - <javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId> - <javax.mail.version>1.6</javax.mail.version> - </properties> - </profile> - <profile> <id>cassandra</id> <build> <plugins> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/protocols/imap/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml index d6d897e..20e8586 100644 --- a/protocols/imap/pom.xml +++ b/protocols/imap/pom.xml @@ -59,8 +59,8 @@ <artifactId>apache-mime4j-dom</artifactId> </dependency> <dependency> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.4_mail</artifactId> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/protocols/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/pom.xml b/protocols/pom.xml index fb8408f..30104f9 100644 --- a/protocols/pom.xml +++ b/protocols/pom.xml @@ -59,7 +59,6 @@ <jmock.version>2.5.1</jmock.version> <jutf7.version>1.0.0</jutf7.version> <junit.version>4.10</junit.version> - <geronimo-javamail.version>1.8.3</geronimo-javamail.version> <slf4j.version>1.6.3</slf4j.version> <james-server-data-api.version>3.0.0-beta5-SNAPSHOT</james-server-data-api.version> <jsieve.version>0.6-SNAPSHOT</jsieve.version> @@ -247,9 +246,9 @@ <version>${mailbox.version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>${geronimo-javamail.version}</version> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.4</version> </dependency> <dependency> <groupId>org.mockito</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/protocols/smtp/pom.xml ---------------------------------------------------------------------- diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml index 9478a74..cd3c4ef 100644 --- a/protocols/smtp/pom.xml +++ b/protocols/smtp/pom.xml @@ -66,8 +66,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.4_mail</artifactId> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> <scope>test</scope> </dependency> </dependencies> @@ -115,4 +115,4 @@ </plugin> </plugins> </build> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractStartTlsSMTPServerTest.java ---------------------------------------------------------------------- diff --git a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractStartTlsSMTPServerTest.java b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractStartTlsSMTPServerTest.java index ce5ef21..626cb17 100644 --- a/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractStartTlsSMTPServerTest.java +++ b/protocols/smtp/src/test/java/org/apache/james/protocols/smtp/AbstractStartTlsSMTPServerTest.java @@ -35,7 +35,6 @@ import javax.mail.internet.MimeMessage; import org.apache.commons.net.smtp.SMTPReply; import org.apache.commons.net.smtp.SMTPSClient; -import org.apache.geronimo.javamail.transport.smtp.SMTPTransport; import org.apache.james.protocols.api.Encryption; import org.apache.james.protocols.api.Protocol; import org.apache.james.protocols.api.ProtocolServer; @@ -49,6 +48,8 @@ import org.apache.james.protocols.api.utils.TestUtils; import org.apache.james.protocols.smtp.utils.TestMessageHook; import org.junit.Test; +import com.sun.mail.smtp.SMTPTransport; + public abstract class AbstractStartTlsSMTPServerTest { protected SMTPSClient createClient() { http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/container/core/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/core/pom.xml b/server/container/core/pom.xml index c064ef3..98b8a55 100644 --- a/server/container/core/pom.xml +++ b/server/container/core/pom.xml @@ -72,8 +72,8 @@ <artifactId>javax.inject</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>${javax.activation.groupId}</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java index 07b6275..7bc2948 100644 --- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java +++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageTest.java @@ -170,18 +170,6 @@ public class MimeMessageTest { + "second part =E8=E8\r\n" + "------=_Part_0_XXXXXXXXXXX.XXXXXXXXXXX\r\n" + "Subject: test3\r\n" - // javamail 1.4.3 NOTES: - // this headers don't get added by version 1.4.3 - //which should be the right behavior anyway - //+"Content-Transfer-Encoding: 7bit\r\n" - //+"Content-Type: text/plain; charset=us-ascii\r\n" - - // geronimo javamail 1.4.3 NOTES: - // this headers are effectively added by geronimo javamail 1.4 version 1.8.3 - // which is the right behavior anyway - +"Content-Transfer-Encoding: 7bit\r\n" - +"Content-Type: text/plain; charset=us-ascii\r\n" - + "\r\n" + "third part\r\n" + "------=_Part_0_XXXXXXXXXXX.XXXXXXXXXXX--\r\n"; http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java ---------------------------------------------------------------------- diff --git a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java index de93115..10fe7e3 100644 --- a/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java +++ b/server/container/core/src/test/java/org/apache/james/core/MimeMessageWrapperTest.java @@ -313,7 +313,6 @@ public class MimeMessageWrapperTest extends MimeMessageFromStreamTest { assertEquals(body.length(), mw.getSize()); } - @Ignore("will be fixed on next commit") @Test public void jiraJames1593() throws MessagingException, IOException { Properties noProperties = new Properties(); http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/container/spring/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index 682e1d9..9bb6f27 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -126,8 +126,8 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>javax.inject</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/container/util/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/util/pom.xml b/server/container/util/pom.xml index 7fedfd2..22c9e96 100644 --- a/server/container/util/pom.xml +++ b/server/container/util/pom.xml @@ -35,8 +35,8 @@ <dependencies> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/data/data-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-api/pom.xml b/server/data/data-api/pom.xml index bd18828..88bfd56 100644 --- a/server/data/data-api/pom.xml +++ b/server/data/data-api/pom.xml @@ -44,8 +44,8 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/data/data-file/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-file/pom.xml b/server/data/data-file/pom.xml index b075dd6..0c9e4b2 100644 --- a/server/data/data-file/pom.xml +++ b/server/data/data-file/pom.xml @@ -71,8 +71,8 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.apache.james</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/data/data-jcr/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jcr/pom.xml b/server/data/data-jcr/pom.xml index 6e31068..dbb7bf5 100644 --- a/server/data/data-jcr/pom.xml +++ b/server/data/data-jcr/pom.xml @@ -67,8 +67,8 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>javax.inject</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/data/data-jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jdbc/pom.xml b/server/data/data-jdbc/pom.xml index 87278a4..be0d560 100644 --- a/server/data/data-jdbc/pom.xml +++ b/server/data/data-jdbc/pom.xml @@ -75,8 +75,8 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/data/data-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-library/pom.xml b/server/data/data-library/pom.xml index 13e06aa..259282e 100644 --- a/server/data/data-library/pom.xml +++ b/server/data/data-library/pom.xml @@ -67,8 +67,8 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>javax.inject</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/data/data-memory/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-memory/pom.xml b/server/data/data-memory/pom.xml index cd47aaf..e8fbcc1 100644 --- a/server/data/data-memory/pom.xml +++ b/server/data/data-memory/pom.xml @@ -47,11 +47,6 @@ <artifactId>guava</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> - </dependency> - - <dependency> <groupId>org.apache.james</groupId> <artifactId>james-server-data-library</artifactId> <type>test-jar</type> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/dns-service/dnsservice-library/pom.xml ---------------------------------------------------------------------- diff --git a/server/dns-service/dnsservice-library/pom.xml b/server/dns-service/dnsservice-library/pom.xml index f191efd..b8f1cd8 100644 --- a/server/dns-service/dnsservice-library/pom.xml +++ b/server/dns-service/dnsservice-library/pom.xml @@ -47,8 +47,8 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/mailet/mailetcontainer-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-api/pom.xml b/server/mailet/mailetcontainer-api/pom.xml index adbf90d..501d834 100644 --- a/server/mailet/mailetcontainer-api/pom.xml +++ b/server/mailet/mailetcontainer-api/pom.xml @@ -39,8 +39,8 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/mailet/mailetcontainer-camel/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailetcontainer-camel/pom.xml b/server/mailet/mailetcontainer-camel/pom.xml index 583ac46..9c3c9c4 100644 --- a/server/mailet/mailetcontainer-camel/pom.xml +++ b/server/mailet/mailetcontainer-camel/pom.xml @@ -85,8 +85,8 @@ <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.apache.camel</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/mailet/mailets/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml index 236ef3a..90fe7c9 100644 --- a/server/mailet/mailets/pom.xml +++ b/server/mailet/mailets/pom.xml @@ -112,8 +112,8 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.apache.james.jspf</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 19dfa16..a40b3f8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -127,10 +127,10 @@ <hadoop.version>1.1.1</hadoop.version> <hbase.version>0.94.27</hbase.version> <javax.inject.version>1</javax.inject.version> - <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> + <javax.mail.groupId>javax.mail</javax.mail.groupId> + <javax.mail.artifactId>javax.mail-api</javax.mail.artifactId> + <javax.activation.groupId>javax.activation</javax.activation.groupId> + <javax.activation.artifactId>activation</javax.activation.artifactId> <jackrabbit.version>2.5.2</jackrabbit.version> <jsieve.version>0.6-SNAPSHOT</jsieve.version> <mailbox.version>0.6-SNAPSHOT</mailbox.version> @@ -140,7 +140,7 @@ <geronimo-jms-spec.version>1.1.1</geronimo-jms-spec.version> <h2.version>1.3.170</h2.version> <apache-jspf-resolver.version>1.0.1-SNAPSHOT</apache-jspf-resolver.version> - <javamail.version>1.4.4</javamail.version> + <javamail.version>1.5.4</javamail.version> <javax-activation.version>1.1.1</javax-activation.version> <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version> <geronimo-javamail.version>1.8.3</geronimo-javamail.version> @@ -794,11 +794,9 @@ </exclusion> </exclusions> </dependency> - <!-- Declare javamail as provided to be able to easily switch --> - <!-- to different implementations (Geronimo) --> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> <version>${javamail.version}</version> <exclusions> <exclusion> @@ -823,11 +821,6 @@ <version>${geronimo-activation-spec.version}</version> </dependency> <dependency> - <groupId>org.apache.geronimo.javamail</groupId> - <artifactId>geronimo-javamail_1.4_mail</artifactId> - <version>${geronimo-javamail.version}</version> - </dependency> - <dependency> <groupId>commons-daemon</groupId> <artifactId>commons-daemon</artifactId> <version>${commons-daemon.version}</version> @@ -1487,15 +1480,6 @@ <profiles> <profile> - <id>oracle-javamail</id> - <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> - </profile> - <profile> <!-- run live tests, ie. ones that do not run stably enough in a CI environment (for example, karaf integration tests accessing external network resources) --> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/protocols/fetchmail/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/fetchmail/pom.xml b/server/protocols/fetchmail/pom.xml index 5e0aafc..e2df6fd 100644 --- a/server/protocols/fetchmail/pom.xml +++ b/server/protocols/fetchmail/pom.xml @@ -71,8 +71,8 @@ <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/protocols/protocols-lmtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-lmtp/pom.xml b/server/protocols/protocols-lmtp/pom.xml index bc0e4ab..766c622 100644 --- a/server/protocols/protocols-lmtp/pom.xml +++ b/server/protocols/protocols-lmtp/pom.xml @@ -105,8 +105,8 @@ <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>io.netty</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/protocols/protocols-pop3/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-pop3/pom.xml b/server/protocols/protocols-pop3/pom.xml index 650b823..077f0a8 100644 --- a/server/protocols/protocols-pop3/pom.xml +++ b/server/protocols/protocols-pop3/pom.xml @@ -63,8 +63,8 @@ <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>io.netty</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/protocols/protocols-smtp/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml index 569bd9f..13b0f0b 100644 --- a/server/protocols/protocols-smtp/pom.xml +++ b/server/protocols/protocols-smtp/pom.xml @@ -100,8 +100,8 @@ <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>${javax.activation.groupId}</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/queue/queue-activemq/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-activemq/pom.xml b/server/queue/queue-activemq/pom.xml index 28cca61..26c4503 100644 --- a/server/queue/queue-activemq/pom.xml +++ b/server/queue/queue-activemq/pom.xml @@ -86,8 +86,8 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.slf4j</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/queue/queue-api/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/pom.xml b/server/queue/queue-api/pom.xml index 885ea73..4a6aa50 100644 --- a/server/queue/queue-api/pom.xml +++ b/server/queue/queue-api/pom.xml @@ -39,6 +39,10 @@ <artifactId>apache-mailet-api</artifactId> </dependency> <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + </dependency> + <dependency> <groupId>org.apache.james</groupId> <artifactId>james-server-core</artifactId> <scope>test</scope> @@ -47,10 +51,6 @@ <groupId>org.apache.james</groupId> <artifactId>james-server-lifecycle-api</artifactId> </dependency> - <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/queue/queue-file/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml index b30fa9d..a77e99b 100644 --- a/server/queue/queue-file/pom.xml +++ b/server/queue/queue-file/pom.xml @@ -55,6 +55,10 @@ <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> </dependency> + <dependency> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> + </dependency> <!-- test dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/538ed538/server/queue/queue-jms/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml index 562f5aa..051264a 100644 --- a/server/queue/queue-jms/pom.xml +++ b/server/queue/queue-jms/pom.xml @@ -63,8 +63,8 @@ <artifactId>geronimo-jms_1.1_spec</artifactId> </dependency> <dependency> - <groupId>${javax.mail.groupId}</groupId> - <artifactId>${javax.mail.artifactId}</artifactId> + <groupId>com.sun.mail</groupId> + <artifactId>javax.mail</artifactId> </dependency> <dependency> <groupId>org.apache.geronimo.specs</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
