Author: rwhitcomb
Date: Fri Dec 6 23:00:02 2019
New Revision: 1870935
URL: http://svn.apache.org/viewvc?rev=1870935&view=rev
Log:
Update Ant version requirement to 1.10.2 so that we can use the
"<javaversion...>"
check to allow Java versions greater or equal to 9 also (builds are failing on
OpenJDK 11 because we didn't have the right version checks).
Modified:
pivot/trunk/build.xml
Modified: pivot/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1870935&r1=1870934&r2=1870935&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Fri Dec 6 23:00:02 2019
@@ -140,13 +140,13 @@ limitations under the License.
<fail>
<condition>
<not>
- <antversion atleast="1.9.0"/>
+ <antversion atleast="1.10.2"/>
</not>
</condition>
<![CDATA[
Error:
- Building Pivot requires Apache Ant 1.9 or greater. Please see the BUILD
+ Building Pivot requires Apache Ant 1.10.2 or greater. Please see the
BUILD
file for more information.
]]>
</fail>
@@ -163,8 +163,7 @@ limitations under the License.
<not>
<or>
<equals arg1="${ant.java.version}" arg2="1.8"/>
- <equals arg1="${ant.java.version}" arg2="9"/>
- <equals arg1="${ant.java.version}" arg2="10"/>
+ <javaversion atleast="9"/>
</or>
</not>
</condition>
