Update to asm 4.2, cglib 3.1. Fix .gitignore to only ignore /build, not every dir named 'build'.

8 files changed, 9 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index f4ceeb74..e46e249b 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 22e25681..d4a25588 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 eab449ff..d3aa19df 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 6d63075e..00000000
--- a/lib/build/asm-4.0.jar
+++ /dev/null
diff --git a/lib/build/asm-4.2.jar b/lib/build/asm-4.2.jar
new file mode 100644
index 00000000..693913dd
--- /dev/null
+++ b/lib/build/asm-4.2.jar
diff --git a/lib/build/asm-util-4.0.jar b/lib/build/asm-util-4.0.jar
deleted file mode 100644
index 0e105958..00000000
--- a/lib/build/asm-util-4.0.jar
+++ /dev/null
diff --git a/lib/build/cglib-3.0.jar b/lib/build/cglib-3.0.jar
deleted file mode 100644
index c4199f31..00000000
--- a/lib/build/cglib-3.0.jar
+++ /dev/null
diff --git a/lib/build/cglib-3.1.jar b/lib/build/cglib-3.1.jar
new file mode 100644
index 00000000..25a5df15
--- /dev/null
+++ b/lib/build/cglib-3.1.jar