You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2018/08/13 15:00:10 UTC
[1/2] ant git commit: Fix the ant-javamail pom too,
to use the right dependency
Repository: ant
Updated Branches:
refs/heads/master 063e112ed -> c9c41729a
Fix the ant-javamail pom too, to use the right dependency
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/94ef3d3b
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/94ef3d3b
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/94ef3d3b
Branch: refs/heads/master
Commit: 94ef3d3bf52a75e16bd4fa222b88f0387cdc8944
Parents: 4281299
Author: Jaikiran Pai <ja...@apache.org>
Authored: Mon Aug 13 20:26:37 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Mon Aug 13 20:26:37 2018 +0530
----------------------------------------------------------------------
src/etc/poms/ant-javamail/pom.xml | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/94ef3d3b/src/etc/poms/ant-javamail/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml
index 6213f99..3dd9993 100644
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@ -45,17 +45,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>javax.mail-api</artifactId>
+ <!-- This brings in the necessary dependencies.
+ See https://javaee.github.io/javamail/#Download_JavaMail_Release -->
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
<version>1.5.6</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1.1</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
<plugins>
[2/2] ant git commit: Merge 1.9.x branch into master
Posted by ja...@apache.org.
Merge 1.9.x branch into master
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c9c41729
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c9c41729
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c9c41729
Branch: refs/heads/master
Commit: c9c41729a6172a6072f06118b26ffbbe68d2c4b4
Parents: 063e112 94ef3d3
Author: Jaikiran Pai <ja...@apache.org>
Authored: Mon Aug 13 20:29:09 2018 +0530
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Mon Aug 13 20:29:09 2018 +0530
----------------------------------------------------------------------
src/etc/poms/ant-javamail/pom.xml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/c9c41729/src/etc/poms/ant-javamail/pom.xml
----------------------------------------------------------------------
diff --cc src/etc/poms/ant-javamail/pom.xml
index 5045720,3dd9993..024efd2
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@@ -45,12 -45,14 +45,14 @@@ xsi:schemaLocation="http://maven.apache
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>javax.mail-api</artifactId>
+ <!-- This brings in the necessary dependencies.
+ See https://javaee.github.io/javamail/#Download_JavaMail_Release -->
+ <groupId>com.sun.mail</groupId>
+ <artifactId>javax.mail</artifactId>
- <version>1.5.6</version>
+ <version>1.6.1</version>
<scope>compile</scope>
</dependency>
- </dependencies>
+ </dependencies>
<build>
<plugins>
<plugin>