build.xml
changeset 32951 1b784e90fb3c
parent 32949 fdf8a7a2c2aa
child 32953 1883fd64e522
--- a/build.xml	Tue Oct 17 10:12:47 2017 +0200
+++ b/build.xml	Tue Oct 17 11:26:47 2017 +0200
@@ -98,6 +98,15 @@
  
   <available file=".hg" property="is.hg" />
 
+  <condition property="j9.module.args" value="--add-modules=java.activation,java.xml.ws.annotation" else="">
+    <not>
+      <or>
+        <equals arg1="${ant.java.version}" arg2="1.7"/>
+        <equals arg1="${ant.java.version}" arg2="1.8"/>
+      </or>
+    </not>
+  </condition>
+
   <condition property="calculate.core.rev">
    <istrue value="${calculate.core.revision}"/>
   </condition>
@@ -545,7 +554,7 @@
         </fileset>
       </classpath>
       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
-      <arg value="--add-modules=java.activation,java.xml.ws.annotation" />
+      <arg value="${j9.module.args}"/>
     </javadoc>
   </target>