From bfb4b06b30ac10d90736ac9644afe6ec1f320efb Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Tue, 4 Dec 2012 16:23:03 -0800
Subject: [PATCH] Bump Proguard to 4.8 to make things work with Java 7.

---
 build.xml |  2 +-
 pom.xml   | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 1f844c7..87b4bfc 100644
--- a/build.xml
+++ b/build.xml
@@ -111,7 +111,7 @@
     </condition>
     <!-- set up the proguard task -->
     <artifact:dependencies pathId="proguard.classpath">
-      <dependency groupId="net.sf.proguard" artifactId="proguard" version="4.4"/>
+      <dependency groupId="net.sf.proguard" artifactId="proguard-anttask" version="4.8"/>
     </artifact:dependencies>
     <taskdef resource="proguard/ant/task.properties" classpathref="proguard.classpath"/>
 
diff --git a/pom.xml b/pom.xml
index c1771c4..1f0a9a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,9 +121,10 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>com.pyx4me</groupId>
+        <!-- TODO: return to stock groupId when they make it work with 4.5+: com.pyx4me -->
+        <groupId>com.github.wvengen</groupId>
         <artifactId>proguard-maven-plugin</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.6</version>
         <executions>
          <execution>
            <phase>package</phase>
@@ -133,13 +134,13 @@
         <dependencies>
           <dependency>
             <groupId>net.sf.proguard</groupId>
-            <artifactId>proguard</artifactId>
-            <version>4.4</version>
+            <artifactId>proguard-base</artifactId>
+            <version>4.8</version>
             <scope>runtime</scope>
           </dependency>
         </dependencies>
         <configuration>
-          <proguardVersion>4.4</proguardVersion>
+          <proguardVersion>4.8</proguardVersion>
           <outputDirectory>${project.build.directory}</outputDirectory>
           <outjar>${project.build.finalName}.jar</outjar>
           <injar>${project.build.finalName}.jar</injar>