Update to asm 4.2, cglib 3.1. Fix .gitignore to only ignore /build, not every dir named 'build'.
diff --git a/.gitignore b/.gitignore
index f4ceeb7..e46e249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-build/
-target/
-bin/
+/build/
+/target/
+/bin/
.project
.classpath
.settings/
diff --git a/build.xml b/build.xml
index 22e2568..d4a2558 100644
--- a/build.xml
+++ b/build.xml
@@ -250,16 +250,13 @@
<arg value="-DNO_AOP" />
</munge>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-4.0.jar"/>]]></replacetoken>
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-4.2.jar"/>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/asm-util-4.0.jar"/>]]></replacetoken>
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"/>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar"/>]]></replacetoken>
- </replace>
- <replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar">
+ <replacetoken><![CDATA[<zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar">
<include name="LICENSE"/>
<include name="NOTICE"/>
</zipfileset>]]></replacetoken>
diff --git a/common.xml b/common.xml
index eab449f..d3aa19d 100644
--- a/common.xml
+++ b/common.xml
@@ -148,9 +148,8 @@
classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
<fileset dir="${build.dir}/classes"/>
- <zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar"/>
- <zipfileset src="${common.basedir}/lib/build/asm-4.0.jar"/>
- <zipfileset src="${common.basedir}/lib/build/asm-util-4.0.jar"/>
+ <zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar"/>
+ <zipfileset src="${common.basedir}/lib/build/asm-4.2.jar"/>
<zipfileset src="${common.basedir}/lib/build/guava-11.0.1.jar"/>
<rule pattern="net.sf.cglib.*" result="com.google.inject.internal.cglib.$@1"/>
<rule pattern="net.sf.cglib.**.*" result="com.google.inject.internal.cglib.@1.$@2"/>
@@ -172,7 +171,7 @@
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
classpath="${common.basedir}/lib/build/jarjar-1.1.jar"/>
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
- <zipfileset src="${common.basedir}/lib/build/cglib-3.0.jar">
+ <zipfileset src="${common.basedir}/lib/build/cglib-3.1.jar">
<include name="LICENSE"/>
<include name="NOTICE"/>
</zipfileset>
diff --git a/lib/build/asm-4.0.jar b/lib/build/asm-4.0.jar
deleted file mode 100644
index 6d63075..0000000
--- a/lib/build/asm-4.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/build/asm-4.2.jar b/lib/build/asm-4.2.jar
new file mode 100644
index 0000000..693913d
--- /dev/null
+++ b/lib/build/asm-4.2.jar
Binary files differ
diff --git a/lib/build/asm-util-4.0.jar b/lib/build/asm-util-4.0.jar
deleted file mode 100644
index 0e10595..0000000
--- a/lib/build/asm-util-4.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/build/cglib-3.0.jar b/lib/build/cglib-3.0.jar
deleted file mode 100644
index c4199f3..0000000
--- a/lib/build/cglib-3.0.jar
+++ /dev/null
Binary files differ
diff --git a/lib/build/cglib-3.1.jar b/lib/build/cglib-3.1.jar
new file mode 100644
index 0000000..25a5df1
--- /dev/null
+++ b/lib/build/cglib-3.1.jar
Binary files differ