From 68b846a4c27361cce2b6d7e9c60ca697f980913e Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 29 Nov 2017 16:17:34 +0100
Subject: try to adapt to Java10+ rapidly changing major versions

---
 manual/Tasks/conditions.html | 39 +++++++++++++++++++++++++++++++++++++++
 manual/Tasks/javac.html      |  9 +++++----
 2 files changed, 44 insertions(+), 4 deletions(-)

(limited to 'manual/Tasks')

diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html
index 08d0bccec..35216cdff 100644
--- a/manual/Tasks/conditions.html
+++ b/manual/Tasks/conditions.html
@@ -1090,5 +1090,44 @@ is redundant and will be ignored.</p>
   &lt;file file="${file}"/&gt;
 &lt;/resourceexists&gt;
 </pre></blockquote>
+
+<h4><a name="javaversion">javaversion</a></h4>
+
+<p>Tests the version of the JVM executing Ant.  <em>Since Ant
+1.9.10</em></p>
+
+<table border="1" cellpadding="2" cellspacing="0">
+  <tr>
+    <td width="12%" valign="top"><b>Attribute</b></td>
+    <td width="78%" valign="top"><b>Description</b></td>
+    <td width="10%" valign="top"><b>Required</b></td>
+  </tr>
+  <tr>
+    <td valign="top">atleast</td>
+    <td valign="top">The version that this JVM is at least.
+      The format is major.minor.point. Starting with Java9 really
+      only the major number is determined.</td>
+    <td valign="top" align="center">No</td>
+    <td valign="top" rowspan="2" align="center">One of these.</td>
+  </tr>
+  <tr>
+    <td valign="top">exactly</td>
+    <td valign="top">The version that this JVM is exactly.
+      The format is <tt>major.minor.point</tt>. Starting with Java9 really
+      only the major number is determined.</td>
+    <td valign="top" align="center">No</td>
+  </tr>
+</table>
+
+  <p>
+    An example:
+  </p>
+
+<blockquote><pre>
+&lt;javaversion atleast=&quot;9&quot;/&gt;
+</pre></blockquote>
+
+<p>will evaluate to true if the current JVM is Java9 or above.</p>
+
 </body>
 </html>
diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html
index 68c6310d3..89ec0549f 100644
--- a/manual/Tasks/javac.html
+++ b/manual/Tasks/javac.html
@@ -78,9 +78,10 @@ attribute are:</a></p>
       <code>javac1.5</code> and
       <code>javac1.6</code> and
       <code>javac1.7</code> (<em>since Ant 1.8.2</em>) and
-      <code>javac1.8</code> (<em>since Ant 1.8.3</em>) and</li>
-      <code>javac1.9</code> (<em>since Ant 1.9.5</em>) and</li>
-      <code>javac9</code> (<em>since Ant 1.9.8</em>) can be used as aliases.</li>
+      <code>javac1.8</code> (<em>since Ant 1.8.3</em>) and
+      <code>javac1.9</code> (<em>since Ant 1.9.5</em>) and
+      <code>javac9</code> (<em>since Ant 1.9.8</em>) and
+      <code>javac10+</code> (<em>since Ant 1.9.10</em>) can be used as aliases.</li>
   <li><code>jikes</code> (the <a
     href="http://jikes.sourceforge.net/" target="_top">Jikes</a>
     compiler).</li>
@@ -525,7 +526,7 @@ invoking the compiler.</p>
   <tr>
     <td valign="top">release</td>
     <td valign="top">
-      Specify the value for the <code>--release</code> switch.Ignored
+      Specify the value for the <code>--release</code> switch. Ignored
       when running on JDK &lt; 9.<br>
       When set and running on JDK &gt;= 9 the source and target
       attributes as well as the bootclasspath will be ignored.
-- 
cgit v1.2.1