versioning plugins
diff --git a/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml b/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
index 7b29163..b4dc00f 100644
--- a/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
+++ b/ant/org.eclipse.ant.tests.core/buildfiles/buildAntTestsSupportJAR.xml
@@ -6,7 +6,6 @@
 	<target name="build" description="Removes all build artifacts, recreates the support jar, and refreshes this plugin's resources" depends="clean, lib/antTestsSupport.jar"/>
 
 	<target name="init" depends="properties">
-		<property name="version.suffix" value="_3.1.0"/>
 		<property name="temp.folder" value="${basedir}/temp.folder"/>
 		<property name="plugin.destination" value="${basedir}"/>
 		<property name="build.result.folder" value="${basedir}"/>
@@ -21,12 +20,19 @@
 		<delete dir="${destdir}"/>
 		<mkdir dir="${destdir}"/>
 		<!-- compile the source code -->
-		<javac target="1.1" destdir="${destdir}" failonerror="false" verbose="false" debug="on" includeAntRuntime="yes" bootclasspath="${bootclasspath}" 
-			classpath="${basedir}/../org.eclipse.core.runtime/bin;
-			${eclipse.home}/plugins/org.eclipse.core.runtime${version.suffix}.jar;
-			${basedir}/bin;
-			${eclipse.home}/plugins/org.eclipse.ant.core${version.suffix}.jar;
-			${basedir}/../org.eclipse.ant.core/bin">
+		<javac target="1.1" destdir="${destdir}" failonerror="false" verbose="false" debug="on" includeAntRuntime="yes" bootclasspath="${bootclasspath}">
+			<classpath>
+				<dirset dir="${basedir}">
+					<include name="../org.eclipse.core.runtime/bin"/>
+					<include name="bin"/>
+					<include name="../org.eclipse.ant.core/bin"/>
+				</dirset>
+				<fileset dir="${eclipse.home}/plugins">
+					<include name="org.eclipse.core.runtime*.jar"/>
+					<include name="org.eclipse.equinox.common*.jar"/>
+					<include name="org.eclipse.ant.core*.jar"/>
+				</fileset>
+			</classpath>
 			<src path="test support/"/>
 		</javac>
 		<mkdir dir="${build.result.folder}/lib"/>