You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2021/10/30 10:26:01 UTC

[ant] branch master updated (dde3f73 -> ac5bce1)

This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git.


    from dde3f73  add new jakartamail artifact to Ivy as well
     new a5a593a  actually fetch javax.mail
     new ac5bce1  make javamail.complete (that we lost somewhere) accept JakartaMail

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml | 19 +++++++++++++++++++
 fetch.xml |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

[ant] 01/02: actually fetch javax.mail

Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit a5a593ac8d95afb3e879dbcffcbeb53780e700a3
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Oct 30 12:11:26 2021 +0200

    actually fetch javax.mail
---
 fetch.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fetch.xml b/fetch.xml
index 288700c..7376ca8 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -409,5 +409,5 @@ Set -Ddest=LOCATION on the command line
   <target name="all"
     description="load all the libraries (except jython)"
     depends="antunit,ivy,logging,junit,junitlauncher,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,
-      jakartamail,jspc,jai,xz,netrexx,junit-engine-vintage,junit-engine-jupiter"/>
+      javamail,jakartamail,jspc,jai,xz,netrexx,junit-engine-vintage,junit-engine-jupiter"/>
 </project>

[ant] 02/02: make javamail.complete (that we lost somewhere) accept JakartaMail

Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit ac5bce1ad68b239bdc06a4ac40b20f5d26d6269c
Author: Stefan Bodewig <bo...@apache.org>
AuthorDate: Sat Oct 30 12:25:25 2021 +0200

    make javamail.complete (that we lost somewhere) accept JakartaMail
---
 build.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/build.xml b/build.xml
index 7bbad00..cc184a3 100644
--- a/build.xml
+++ b/build.xml
@@ -521,6 +521,25 @@
                classname="com.oracle.truffle.js.scriptengine.GraalJSScriptEngine"
                classpathref="classpath" ignoresystemclasses="${ignoresystemclasses}"/>
 
+    <condition property="javaxmail.complete">
+      <and>
+        <available classname="javax.activation.DataHandler"/>
+        <available classname="javax.mail.Transport"/>
+      </and>
+    </condition>
+    <condition property="jakartamail.complete">
+      <and>
+        <available classname="jakarta.activation.DataHandler"/>
+        <available classname="jakarta.mail.Transport"/>
+      </and>
+    </condition>
+    <condition property="javamail.complete">
+      <or>
+        <isset property="javaxmail.complete"/>
+        <isset property="jakartamail.complete"/>
+      </or>
+    </condition>
+
     <condition property="tests.and.ant.share.classloader">
       <or>
         <equals arg1="${junit.fork}" arg2="true"/>