Strip version suffix from diffutils.

3 files changed, 13 insertions, 11 deletions

diff --git a/build.xml b/build.xml
index 7c133b2ed6..5b776d1abd 100644
--- a/build.xml
+++ b/build.xml
@@ -197,18 +197,13 @@ targets exercised:
         <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="3.2.2"/>
       </artifact:dependencies>
 
-      <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset">
+      <artifact:dependencies pathId="partest.extras.classpath" filesetId="partest.extras.fileset" versionsId="partest.extras.versions">
         <dependency groupId="com.googlecode.java-diff-utils" artifactId="diffutils" version="1.3.0"/>
       </artifact:dependencies>
 
       <!-- BND support -->
       <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
 
-      <!--<dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/>-->
-      <union id="dependency.fileset">
-        <resources refid="partest.extras.fileset"/>
-      </union>
-
       <!-- Download STARR via maven if `starr.version` is specified.
            Want to slow down STARR changes, using only released versions. -->
       <if><isset property="starr.version"/><then>
@@ -1159,10 +1154,11 @@ targets exercised:
 
   <!-- depend on quick.done so quick.bin is run when pack.done is -->
   <target name="pack.done" depends="quick.done, pack.bin">
-    <!-- copy maven dependencies -->
+    <!-- copy dependencies to build/pack/lib, it only takes a second so don't bother with uptodate checks -->
     <copy todir="${build-pack.dir}/lib">
-      <resources refid="dependency.fileset" />
-      <mapper type="flatten" />
+      <resources refid="partest.extras.fileset"/>
+      <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
+              from="${partest.extras.versions}" to="flatten"/>
     </copy>
 
     <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.compiler.path"/>
@@ -1694,8 +1690,14 @@ targets exercised:
         <include name="scala-partest.jar"/>
         <include name="scalap.jar"/>
       </fileset>
+    </copy>
+
+    <copy todir="${dist.dir}/lib">
       <resources refid="partest.extras.fileset"/>
+      <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper"
+              from="${partest.extras.versions}" to="flatten"/>
     </copy>
+
     <mkdir dir="${dist.dir}/bin"/>
     <!-- TODO - Stop being inefficient and don't copy OSGi bundles overtop other jars. -->
     <copy-bundle name="scala-library"/>
diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala
index dfa1187691..0ba34777a0 100644
--- a/src/partest/scala/tools/partest/nest/PathSettings.scala
+++ b/src/partest/scala/tools/partest/nest/PathSettings.scala
@@ -74,7 +74,7 @@ object PathSettings {
     }
 
   lazy val diffUtils: File =
-    findJar(buildPackLibDir.files, "diffutils-1.3.0") getOrElse sys.error(s"No diffutils-1.3.0.jar found in '$buildPackLibDir'.")
+    findJar(buildPackLibDir.files, "diffutils") getOrElse sys.error(s"No diffutils.jar found in '$buildPackLibDir'.")
 }
 
 class PathSettings() {
diff --git a/test/partest b/test/partest
index 57ca24a7a0..842d2903b7 100755
--- a/test/partest
+++ b/test/partest
@@ -53,7 +53,7 @@ if [ -z "$EXT_CLASSPATH" ] ; then
             fi
         done
     elif [ -f "$SCALA_HOME/build/pack/lib/scala-partest.jar" ] ; then
-        for lib in `echo "scala-partest scala-library scala-reflect scala-compiler diffutils-1.3.0"`; do
+        for lib in `echo "scala-partest scala-library scala-reflect scala-compiler diffutils"`; do
             ext="$SCALA_HOME/build/pack/lib/$lib.jar"
             if [ -z "$EXT_CLASSPATH" ] ; then
                 EXT_CLASSPATH="$ext"