Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 13962)
+++ trunk/build.xml	(revision 14019)
@@ -39,5 +39,4 @@
         <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
         <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
-        <property name="groovy.jar" location="${tools.dir}/groovy-all.jar"/>
         <property name="error_prone_ant.jar" location="${tools.dir}/error_prone_ant.jar"/>
         <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
@@ -75,4 +74,9 @@
             </not>
         </condition>
+        <path id="groovy.classpath">
+            <fileset dir="${tools.dir}/groovy">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
         <path id="test.classpath">
             <fileset dir="${test.dir}/lib">
@@ -80,5 +84,5 @@
             </fileset>
             <pathelement path="${dist.jar}"/>
-            <pathelement path="${groovy.jar}"/>
+            <pathelement path="${toString:groovy.classpath}"/>
             <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
         </path>
@@ -468,5 +472,5 @@
     </macrodef>
     <target name="test-compile" depends="test-init,dist">
-        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${groovy.jar}"/>
+        <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc" classpath="${toString:groovy.classpath}"/>
         <call-groovyc testfamily="unit">
             <cp-elements>
@@ -801,5 +805,5 @@
 
     <target name="taginfo" depends="dist">
-        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
+        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
         <property name="taginfoextract" value="scripts/TagInfoExtract.groovy"/>
         <property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>
@@ -810,5 +814,5 @@
 
     <target name="imageryindex" depends="init-properties">
-        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
+        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${toString:groovy.classpath};${tools.dir}/commons-cli-1.3.1.jar"/>
         <echo message="Checking editor imagery difference"/>
         <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.jar}">