[jarjar] Hopefully put back all of my changes

[mef]

commit 21470a0b8598f6ac79b5428a7a058eec6f47b22c
Author: Mary Ellen Foster <mefoster at gmail.com>
Date:   Fri Oct 1 12:31:04 2010 +0100

    Hopefully put back all of my changes

 jarjar-1.0-build_xml.patch        |   11 +++++++++++
 jarjar-AntJarProcessor-cast.patch |   11 +++++++++++
 jarjar-0.9.pom => jarjar.pom      |    4 ++--
 jarjar.spec                       |    2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/jarjar-1.0-build_xml.patch b/jarjar-1.0-build_xml.patch
new file mode 100644
index 0000000..24f2edd
--- /dev/null
+++ b/jarjar-1.0-build_xml.patch
@@ -0,0 +1,11 @@
+--- jarjar-1.0.orig/build.xml	2010-10-01 12:22:33.450739332 +0100
++++ jarjar-1.0/build.xml	2010-10-01 12:22:52.114022372 +0100
+@@ -14,7 +14,7 @@
+     <property name="compile.deprecation" value="false"/>
+     <property name="compile.optimize" value="false"/>
+ 
+-    <property name="version" value="snapshot"/>
++    <property name="version" value="1.0"/>
+     <property name="jarfile" value="dist/jarjar-${version}.jar"/>
+     <property name="jarfile.util" value="dist/jarjar-util-${version}.jar"/>
+     <property name="jarfile.mojo" value="dist/jarjar-plugin-${version}.jar"/>
diff --git a/jarjar-AntJarProcessor-cast.patch b/jarjar-AntJarProcessor-cast.patch
new file mode 100644
index 0000000..637094a
--- /dev/null
+++ b/jarjar-AntJarProcessor-cast.patch
@@ -0,0 +1,11 @@
+--- jarjar-1.0.orig/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java	2010-10-01 12:22:33.451738707 +0100
++++ jarjar-1.0/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java	2010-10-01 12:25:06.935738716 +0100
+@@ -84,7 +84,7 @@
+         String dir = file.substring(0, slash);
+         if (dirs.add(dir)) {
+           addParentDirs(dir, zOut);
+-          super.zipDir(null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER);
++          super.zipDir((File)null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER);
+         }
+       }
+     }
diff --git a/jarjar-0.9.pom b/jarjar.pom
similarity index 81%
rename from jarjar-0.9.pom
rename to jarjar.pom
index 14d5edf..5cd954d 100644
--- a/jarjar-0.9.pom
+++ b/jarjar.pom
@@ -2,12 +2,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>tonic</groupId>
   <artifactId>jarjar</artifactId>
-  <version>0.9</version>
+  <version>1.0</version>
   <distributionManagement>
     <relocation>
       <groupId>com.tonicsystems</groupId>
       <artifactId>jarjar</artifactId>
-      <version>0.9</version>
+      <version>1.0</version>
     </relocation>
   </distributionManagement>
 </project>
diff --git a/jarjar.spec b/jarjar.spec
index 579ab7e..dd521ee 100644
--- a/jarjar.spec
+++ b/jarjar.spec
@@ -37,7 +37,7 @@ URL:            http://code.google.com/p/jarjar/
 Group:          Development/Tools
 # svn export http://jarjar.googlecode.com/svn/tags/release-1-0/jarjar jarjar-1.0
 Source0:        jarjar-src-1.0.zip
-Source1:        jarjar-1.0.pom
+Source1:        jarjar.pom
 # Change version from "snapshot" to "1.0"
 Patch0:			jarjar-1.0-build_xml.patch
 # Add a cast to make a method unambiguous