You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2019/12/07 00:16:35 UTC

svn commit: r1870942 - /pivot/jenkins/build.xml

Author: rwhitcomb
Date: Sat Dec  7 00:16:35 2019
New Revision: 1870942

URL: http://svn.apache.org/viewvc?rev=1870942&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/jenkins/build.xml

Modified: pivot/jenkins/build.xml
URL: http://svn.apache.org/viewvc/pivot/jenkins/build.xml?rev=1870942&r1=1870941&r2=1870942&view=diff
==============================================================================
--- pivot/jenkins/build.xml (original)
+++ pivot/jenkins/build.xml Sat Dec  7 00:16:35 2019
@@ -69,13 +69,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>
@@ -86,7 +86,7 @@ limitations under the License.
                     <not>
                         <or>
                             <equals arg1="${ant.java.version}" arg2="1.8"/>
-                            <equals arg1="${ant.java.version}" arg2="1.9"/>
+                            <javaversion atleast="9"/>
                         </or>
                     </not>
                 </condition>