--- build.xml~	2018-02-07 11:48:12.344520649 +0100

+++ build.xml	2018-02-07 11:56:28.314072462 +0100

@@ -383,9 +383,6 @@

     </condition>

     <property name="ignoresystemclasses" value="false"/>

     <available property="jdk9+" classname="java.lang.module.ModuleDescriptor"/>

-    <condition property="jdk10+">

-      <javaversion atleast="10"/>

-    </condition>

     <available property="kaffe" classname="kaffe.util.NotImplemented"/>

                classname="org.apache.harmony.luni.util.Base64"/>

@@ -1616,11 +1613,7 @@

   <target name="test-init" depends="probe-offline,check-optional-packages,dump-info">

     <mkdir dir="${build.junit.tmpdir}"/>

-    <condition property="sun.io.useCanonCaches" value="false">

-      <not>

-        <javaversion atleast="9"/>

-      </not>

-    </condition>

+    <property name="sun.io.useCanonCaches" value="false"/>

     <macrodef name="test-junit">

       <element name="junit-nested" implicit="true"/>

       <sequential>