From d6482dedc557dd567931fcb4226bdc91dd6a5837 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Thu, 18 Nov 2010 22:55:44 +0000
Subject: [PATCH] Maven Ant tasks do provide properties for dependencies. Yay!

---
 build.xml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 9b84066..fbcaeb6 100644
--- a/build.xml
+++ b/build.xml
@@ -115,16 +115,6 @@
       <available file="${java.home}/lib/rt.jar"/>
     </condition>
 
-    <!-- we have to do some jockeying to get our Maven dependencies somewhere
-         that Proguard can process them; unfortunately the Maven ant task
-         doesn't provide a property for each dependency like Ivy does -->
-    <artifact:dependencies filesetId="compile.fileset" pomRefId="pom" useScope="compile"/>
-    <mkdir dir="${deploy.dir}/proguard"/>
-    <copy todir="${deploy.dir}/proguard">
-      <fileset refid="compile.fileset"/>
-      <mapper type="flatten"/>
-    </copy>
-
     <!-- we put these guys in the test classpath though really we just want a
          tools classpath -->
     <artifact:dependencies pathId="proguard.classpath">
@@ -133,14 +123,14 @@
     <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>
     <proguard>
       <injar path="${getdown.jar}"/>
-      <injar path="${deploy.dir}/proguard/jregistrykey-1.0.jar" filter="!META-INF/**"/>
-      <injar path="${deploy.dir}/proguard/samskivert-1.0.jar" filter="!META-INF/**, 
+      <injar path="${jregistrykey:jregistrykey:jar}" filter="!META-INF/**"/>
+      <injar path="${com.samskivert:samskivert:jar}" filter="!META-INF/**, 
         !**/Log4JLogger*,!**/*.java,com/samskivert/Log.class,**/samskivert/io/**,
         **/samskivert/swing/**,**/samskivert/text/**,**/samskivert/util/**"/>
-      <injar path="${deploy.dir}/proguard/commons-codec-1.4.jar" filter="!META-INF/**"/>
+      <injar path="${commons-codec:commons-codec:jar}" filter="!META-INF/**"/>
       <outjar path="${deploy.dir}/getdown-pro${version.suff}.jar"/>
       <libraryjar name="${rt.jar}"/>
-      <libraryjar name="${deploy.dir}/proguard/ant-1.7.1.jar"/>
+      <libraryjar name="${org.apache.ant:ant:jar}"/>
 
       <keep name="com.threerings.getdown.launcher.Getdown">
         <method access="static" name="main"/>