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 <bode...@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"/>

Reply via email to