use new jarjar "keep" feature instead of manual zapping
git-svn-id: https://google-guice.googlecode.com/svn/trunk@311 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/build.xml b/build.xml
index 03c973e..b36eced 100644
--- a/build.xml
+++ b/build.xml
@@ -12,19 +12,15 @@
<target name="jar" depends="compile"
description="Build jar.">
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
- classpath="lib/build/jarjar-0.9.jar"/>
+ classpath="lib/build/jarjar-1.0rc3.jar"/>
<mkdir dir="${build.dir}/dist"/>
<jarjar jarfile="${build.dir}/dist/guice-${version}.jar">
<fileset dir="${build.dir}/classes"/>
<zipfileset src="lib/build/cglib-2.2_beta1.jar"/>
<zipfileset src="lib/build/asm-2.2.3.jar"/>
+ <keep pattern="com.google.**"/>
<rule pattern="net.sf.cglib.**" result="com.google.inject.cglib.@1"/>
<rule pattern="org.objectweb.asm.**" result="com.google.inject.asm.@1"/>
- <zap pattern="net.sf.cglib.beans.**"/>
- <zap pattern="net.sf.cglib.transform.**"/>
- <zap pattern="net.sf.cglib.util.**"/>
- <zap pattern="net.sf.cglib.reflect.*Delegate**"/>
- <zap pattern="net.sf.cglib.proxy.Mixin*"/>
</jarjar>
</target>
diff --git a/lib/build/jarjar-0.9.jar b/lib/build/jarjar-0.9.jar
deleted file mode 100644
index d83838c..0000000
--- a/lib/build/jarjar-0.9.jar
+++ /dev/null
Binary files differ
diff --git a/lib/build/jarjar-1.0rc3.jar b/lib/build/jarjar-1.0rc3.jar
new file mode 100644
index 0000000..e96eefc
--- /dev/null
+++ b/lib/build/jarjar-1.0rc3.jar
Binary files differ
