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 bt...@apache.org on 2017/03/21 10:57:00 UTC
[6/6] james-project git commit: JAMES-1966 upgrade javax.mail to 1.5.4
JAMES-1966 upgrade javax.mail to 1.5.4
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7ceab1ef
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7ceab1ef
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7ceab1ef
Branch: refs/heads/master
Commit: 7ceab1ef365e28e55dedbe5a583ba9d75b68c740
Parents: 6b877e1
Author: Matthieu Baechler <ma...@gmail.com>
Authored: Thu Mar 16 09:38:48 2017 +0100
Committer: benwa <bt...@linagora.com>
Committed: Tue Mar 21 17:55:53 2017 +0700
----------------------------------------------------------------------
mailbox/api/pom.xml | 8 ++++----
.../james/mailbox/acl/UnionMailboxACLResolver.java | 1 -
mailbox/cassandra/pom.xml | 8 ++++----
mailbox/elasticsearch/pom.xml | 13 ++++---------
mailbox/hbase/pom.xml | 4 ++--
mailbox/jcr/pom.xml | 8 ++++----
mailbox/jpa/pom.xml | 4 ++--
mailbox/lucene/pom.xml | 4 ++--
mailbox/maildir/pom.xml | 8 ++++----
mailbox/memory/pom.xml | 8 ++++----
mailbox/pom.xml | 11 +++--------
mailbox/scanning-search/pom.xml | 5 -----
mailbox/store/pom.xml | 8 ++++----
mailbox/tool/pom.xml | 4 ++++
mailet/ai/pom.xml | 4 ++--
mailet/api/pom.xml | 4 ++--
mailet/base/pom.xml | 8 ++++----
mailet/crypto/pom.xml | 4 ++--
mailet/pom.xml | 7 +++----
mailet/standard/pom.xml | 8 ++++----
mpt/core/pom.xml | 8 ++++----
mpt/impl/imap-mailbox/core/pom.xml | 9 ++++-----
mpt/pom.xml | 13 +++++--------
protocols/imap/pom.xml | 5 ++---
protocols/pom.xml | 6 +++---
protocols/smtp/pom.xml | 4 ++--
server/pom.xml | 4 +---
27 files changed, 79 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/api/pom.xml b/mailbox/api/pom.xml
index 6be40ee..6917440 100644
--- a/mailbox/api/pom.xml
+++ b/mailbox/api/pom.xml
@@ -37,6 +37,10 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
@@ -45,10 +49,6 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
----------------------------------------------------------------------
diff --git a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
index c14d529..b89ff67 100644
--- a/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
+++ b/mailbox/api/src/main/java/org/apache/james/mailbox/acl/UnionMailboxACLResolver.java
@@ -38,7 +38,6 @@ import org.apache.james.mailbox.model.SimpleMailboxACL;
import org.apache.james.mailbox.model.SimpleMailboxACL.Rfc4314Rights;
import org.apache.james.mailbox.model.SimpleMailboxACL.SimpleMailboxACLEntryKey;
-import com.sun.mail.mbox.Mailbox;
/**
* An implementation which works with the union of the rights granted to the
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index 862fb98..5f3599c 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -156,12 +156,12 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml
index dd2698d..ca6f5ca 100644
--- a/mailbox/elasticsearch/pom.xml
+++ b/mailbox/elasticsearch/pom.xml
@@ -31,11 +31,6 @@
<description>Apache James Mailbox IMAP search implementation using ElasticSearch</description>
<name>Apache James :: Mailbox :: ElasticSearch</name>
- <properties>
- <javax.mail.groupId>javax.mail</javax.mail.groupId>
- <javax.mail.artifactId>mail</javax.mail.artifactId>
- </properties>
-
<profiles>
<profile>
<id>disable-build-for-older-jdk</id>
@@ -215,12 +210,12 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/hbase/pom.xml b/mailbox/hbase/pom.xml
index faffdc5..b37d25d 100644
--- a/mailbox/hbase/pom.xml
+++ b/mailbox/hbase/pom.xml
@@ -38,8 +38,8 @@
<version>11.0.2</version><!--$NO-MVN-MAN-VER$-->
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/jcr/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jcr/pom.xml b/mailbox/jcr/pom.xml
index 65abbe0..80b14ad 100644
--- a/mailbox/jcr/pom.xml
+++ b/mailbox/jcr/pom.xml
@@ -41,6 +41,10 @@
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
@@ -50,10 +54,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/jpa/pom.xml b/mailbox/jpa/pom.xml
index 6630dc5..5be3d75 100644
--- a/mailbox/jpa/pom.xml
+++ b/mailbox/jpa/pom.xml
@@ -51,8 +51,8 @@
<scope>test</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.jasypt</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/lucene/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index de0612d..af06b10 100644
--- a/mailbox/lucene/pom.xml
+++ b/mailbox/lucene/pom.xml
@@ -66,8 +66,8 @@
<artifactId>apache-mime4j-dom</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>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/maildir/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/maildir/pom.xml b/mailbox/maildir/pom.xml
index 9ef68e0..396bee3 100644
--- a/mailbox/maildir/pom.xml
+++ b/mailbox/maildir/pom.xml
@@ -49,6 +49,10 @@
<artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
@@ -66,10 +70,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/memory/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/memory/pom.xml b/mailbox/memory/pom.xml
index 71ba2cb..8ba5cec 100644
--- a/mailbox/memory/pom.xml
+++ b/mailbox/memory/pom.xml
@@ -33,10 +33,6 @@
<dependencies>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-api</artifactId>
</dependency>
@@ -71,6 +67,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 3a006a4..ef20813 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -82,12 +82,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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>
<javax.persistence.version>1.0.2</javax.persistence.version>
<javax.inject.version>1</javax.inject.version>
<apache-mime4j.version>0.8.0</apache-mime4j.version>
- <javax.mail.version>1.4.1</javax.mail.version>
<activation.version>1.1.1</activation.version>
<jmock.version>2.5.1</jmock.version>
<hbase.version>0.94.27</hbase.version>
@@ -243,12 +240,10 @@
<artifactId>apache-mime4j-james-utils</artifactId>
<version>${apache-mime4j.version}</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>${javax.mail.version}</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.4</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/scanning-search/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/scanning-search/pom.xml b/mailbox/scanning-search/pom.xml
index 5bed55c..895fc6e 100644
--- a/mailbox/scanning-search/pom.xml
+++ b/mailbox/scanning-search/pom.xml
@@ -31,11 +31,6 @@
<description>Apache James Mailbox IMAP search implementation using scanning</description>
<name>Apache James :: Mailbox :: Scanning</name>
- <properties>
- <javax.mail.groupId>javax.mail</javax.mail.groupId>
- <javax.mail.artifactId>mail</javax.mail.artifactId>
- </properties>
-
<profiles>
<profile>
<id>disable-build-for-older-jdk</id>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/store/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml
index 52d16de..688f688 100644
--- a/mailbox/store/pom.xml
+++ b/mailbox/store/pom.xml
@@ -62,12 +62,12 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailbox/tool/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tool/pom.xml b/mailbox/tool/pom.xml
index 6e7673a..a3683de 100644
--- a/mailbox/tool/pom.xml
+++ b/mailbox/tool/pom.xml
@@ -57,6 +57,10 @@
<artifactId>slf4j-simple</artifactId>
</dependency>
<dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailet/ai/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/ai/pom.xml b/mailet/ai/pom.xml
index e6dabc4..e53e80a 100644
--- a/mailet/ai/pom.xml
+++ b/mailet/ai/pom.xml
@@ -45,8 +45,8 @@
<artifactId>apache-mailet-base</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailet/api/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/api/pom.xml b/mailet/api/pom.xml
index 8b1d91b..69d5d85 100644
--- a/mailet/api/pom.xml
+++ b/mailet/api/pom.xml
@@ -37,8 +37,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailet/base/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index d15b8d7..8d7f8d0 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -58,12 +58,12 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailet/crypto/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/crypto/pom.xml b/mailet/crypto/pom.xml
index b9d9824..58c687b 100644
--- a/mailet/crypto/pom.xml
+++ b/mailet/crypto/pom.xml
@@ -40,8 +40,8 @@
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</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/7ceab1ef/mailet/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/pom.xml b/mailet/pom.xml
index 3985dda..3ec1ed3 100644
--- a/mailet/pom.xml
+++ b/mailet/pom.xml
@@ -39,7 +39,6 @@
<!-- Override the source descriptor -->
<sourceReleaseAssemblyDescriptor>project</sourceReleaseAssemblyDescriptor>
<plugin.mailetdocs.version>0.1</plugin.mailetdocs.version>
- <javax.version>1.4.4</javax.version>
<javax.inject.version>1</javax.inject.version>
<junit.version>4.10</junit.version>
<activation.version>1.1.1</activation.version>
@@ -106,9 +105,9 @@
<version>4.0.0</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javax.version}</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.4</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mailet/standard/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml
index f939e85..04ba9e5 100644
--- a/mailet/standard/pom.xml
+++ b/mailet/standard/pom.xml
@@ -58,12 +58,12 @@
<artifactId>amqp-client</artifactId>
</dependency>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mpt/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/core/pom.xml b/mpt/core/pom.xml
index 7e39d19..912c17e 100644
--- a/mpt/core/pom.xml
+++ b/mpt/core/pom.xml
@@ -59,6 +59,10 @@
<version>1.6.5</version>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -71,10 +75,6 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mpt/impl/imap-mailbox/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/pom.xml b/mpt/impl/imap-mailbox/core/pom.xml
index 4a7a8d1..6044fcb 100644
--- a/mpt/impl/imap-mailbox/core/pom.xml
+++ b/mpt/impl/imap-mailbox/core/pom.xml
@@ -78,6 +78,10 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -86,11 +90,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- <version>${javax.mail.version}</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index 08450d8..27b48bc 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -93,7 +93,6 @@
<hadoop.version>1.0.1</hadoop.version>
<hbase.version>0.94.27</hbase.version>
<jackrabbit-core.version>2.5.2</jackrabbit-core.version>
- <javax.mail.version>1.4.1</javax.mail.version>
<jmock.version>2.6.0</jmock.version>
<junit.version>4.11</junit.version>
<log4j.version>1.2.16</log4j.version>
@@ -102,8 +101,6 @@
<assertj-1.version>1.7.1</assertj-1.version>
<assertj-3.version>3.2.0</assertj-3.version>
- <javax.mail.groupId>javax.mail</javax.mail.groupId>
- <javax.mail.artifactId>mail</javax.mail.artifactId>
<logback.version>1.1.7</logback.version>
</properties>
@@ -453,6 +450,11 @@
<version>${guice.version}</version>
</dependency>
<dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.4</version>
+ </dependency>
+ <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
@@ -469,11 +471,6 @@
<version>${jackrabbit-core.version}</version>
</dependency>
<dependency>
- <groupId>${javax.mail.groupId}</groupId>
- <artifactId>${javax.mail.artifactId}</artifactId>
- <version>${javax.mail.version}</version>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj-3.version}</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/protocols/imap/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/imap/pom.xml b/protocols/imap/pom.xml
index c2a0fcb..114dd70 100644
--- a/protocols/imap/pom.xml
+++ b/protocols/imap/pom.xml
@@ -63,10 +63,9 @@
<artifactId>metrics-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/protocols/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/pom.xml b/protocols/pom.xml
index 33f566c..157ceb8 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -259,9 +259,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4.4</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
+ <version>1.5.4</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/protocols/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/protocols/smtp/pom.xml b/protocols/smtp/pom.xml
index d3cbbde..2fc5612 100644
--- a/protocols/smtp/pom.xml
+++ b/protocols/smtp/pom.xml
@@ -84,8 +84,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/7ceab1ef/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 62f2bed..84f4401 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -129,8 +129,6 @@
<hadoop.version>1.1.1</hadoop.version>
<hbase.version>0.94.27</hbase.version>
<javax.inject.version>1</javax.inject.version>
- <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>
@@ -973,7 +971,7 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
- <version>${javamail.version}</version>
+ <version>1.5.4</version>
<exclusions>
<exclusion>
<groupId>javax.activation</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org