we can always assume java5
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2bac4d00 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2bac4d00 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2bac4d00 Branch: refs/heads/master Commit: 2bac4d00111b0f2df6c8db54bfd591206b0d6ad3 Parents: 53fed9e Author: Stefan Bodewig <[email protected]> Authored: Mon Jul 25 15:49:17 2016 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Mon Jul 25 15:49:17 2016 +0200 ---------------------------------------------------------------------- src/etc/testcases/taskdefs/rmic/rmic.xml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/2bac4d00/src/etc/testcases/taskdefs/rmic/rmic.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml b/src/etc/testcases/taskdefs/rmic/rmic.xml index 757fca5..944cdcd 100644 --- a/src/etc/testcases/taskdefs/rmic/rmic.xml +++ b/src/etc/testcases/taskdefs/rmic/rmic.xml @@ -202,12 +202,6 @@ <available property="kaffe.present" classname="jkaffe.rmi.rmic.RMIC"/> <available property="rmic.present" classname="sun.rmi.rmic.Main"/> <available property="wlrmic.present" classname="weblogic.rmic"/> - <condition property="rmic5.present"> - <and> - <isset property="rmic.present"/> - <available classname="java.net.Proxy"/> - </and> - </condition> <condition property="rmic6.present"> <and> <isset property="rmic.present"/> @@ -434,41 +428,41 @@ <!-- This test stamps on the XML parser settings on java6, so it is disabled. --> - <target name="testXnew" if="rmic5.present" unless="rmic6.present" depends="init"> + <target name="testXnew" if="rmic.present" unless="rmic6.present" depends="init"> <base-rmic compiler="sun"> <compilerarg value="-Xnew"/> </base-rmic> <assertBaseCompiled/> </target> - <target name="testXnewDest" if="rmic5.present" unless="rmic6.present" depends="init"> + <target name="testXnewDest" if="rmic.present" unless="rmic6.present" depends="init"> <dest-rmic compiler="sun"> <compilerarg value="-Xnew"/> </dest-rmic> <assertBaseCompiledInDest/> </target> - <target name="testXnewForked" if="rmic5.present" depends="init"> + <target name="testXnewForked" if="rmic.present" depends="init"> <base-rmic compiler="forking"> <compilerarg value="-Xnew"/> </base-rmic> <assertBaseCompiled/> </target> - <target name="testXnewForkedDest" if="rmic5.present" depends="init"> + <target name="testXnewForkedDest" if="rmic.present" depends="init"> <dest-rmic compiler="forking"> <compilerarg value="-Xnew"/> </dest-rmic> <assertBaseCompiledInDest/> </target> - <target name="testXnewCompiler" if="rmic5.present" depends="init"> + <target name="testXnewCompiler" if="rmic.present" depends="init"> <base-rmic compiler="xnew"> </base-rmic> <assertBaseCompiled/> </target> - <target name="testXnewCompilerDest" if="rmic5.present" depends="init"> + <target name="testXnewCompilerDest" if="rmic.present" depends="init"> <dest-rmic compiler="xnew"> </dest-rmic> <assertBaseCompiledInDest/>
