svn commit: r1728431 - /db/derby/code/trunk/build.xml

[ka...@apache.org]

Author: kahatlen
Date: Thu Feb  4 10:14:30 2016
New Revision: 1728431

URL: http://svn.apache.org/viewvc?rev=1728431&view=rev
Log:
DERBY-6860: Automatic download of junit.jar broken

Invoke the install_junit target before the setCompilerProperties
target. setCompilerProperties sets the junit property, and the
install_junit raises an error if the junit property is set and
points to a file that doesn't exist. install_junit must therefore
be invoked before the junit property is set in order to be able to
download junit.jar.

Modified:
    db/derby/code/trunk/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1728431&r1=1728430&r2=1728431&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Feb  4 10:14:30 2016
@@ -61,9 +61,7 @@
 <!--                       Initialize targets                             -->
 <!-- ==================================================================== -->
 
-  <target name="init" unless="init.done" depends="setCompilerProperties">
-
-    <antcall target="install_junit"/>
+  <target name="init" unless="init.done" depends="install_junit,setCompilerProperties">
     <tstamp/>
     <mkdir dir="${out.dir}"/>
     <antcall target="make-generated-dirs"/>