aboutsummaryrefslogtreecommitdiff
path: root/common.xml
diff options
context:
space:
mode:
authorSam Berlin <sameb@google.com>2013-12-07 12:47:34 -0500
committerSam Berlin <sameb@google.com>2013-12-07 12:54:01 -0500
commite8120035bb4b7472bf855ad33e8fda38c94fbbbc (patch)
treef025be8011dd7e74ef2bd7fd0184bc088045ad30 /common.xml
parentebe9f053ab2431f8f22f6d892cffadef4b10479c (diff)
downloadguice-e8120035bb4b7472bf855ad33e8fda38c94fbbbc.tar.gz
Update to asm 4.2, cglib 3.1. Fix .gitignore to only ignore /build, not every dir named 'build'.
Diffstat (limited to 'common.xml')
-rw-r--r--common.xml7
1 files changed, 3 insertions, 4 deletions
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>