Revision: e8120035bb4b
Author: Sam Berlin <[email protected]>
Date: Sat Dec 7 17:47:34 2013 UTC
Log: Update to asm 4.2, cglib 3.1. Fix .gitignore to only ignore
/build, not every dir named 'build'.
http://code.google.com/p/google-guice/source/detail?r=e8120035bb4b
Added:
/lib/build/asm-4.2.jar
/lib/build/cglib-3.1.jar
Deleted:
/lib/build/asm-4.0.jar
/lib/build/asm-util-4.0.jar
/lib/build/cglib-3.0.jar
Modified:
/.gitignore
/build.xml
/common.xml
=======================================
--- /dev/null
+++ /lib/build/asm-4.2.jar Sat Dec 7 17:47:34 2013 UTC
Binary file, no diff available.
=======================================
--- /dev/null
+++ /lib/build/cglib-3.1.jar Sat Dec 7 17:47:34 2013 UTC
Binary file, no diff available.
=======================================
--- /lib/build/asm-4.0.jar Thu May 16 00:32:52 2013 UTC
+++ /dev/null
Binary file, no diff available.
=======================================
--- /lib/build/asm-util-4.0.jar Thu May 16 00:32:52 2013 UTC
+++ /dev/null
Binary file, no diff available.
=======================================
--- /lib/build/cglib-3.0.jar Thu May 16 00:32:52 2013 UTC
+++ /dev/null
Binary file, no diff available.
=======================================
--- /.gitignore Mon Jul 29 16:16:41 2013 UTC
+++ /.gitignore Sat Dec 7 17:47:34 2013 UTC
@@ -1,6 +1,6 @@
-build/
-target/
-bin/
+/build/
+/target/
+/bin/
.project
.classpath
.settings/
=======================================
--- /build.xml Fri Dec 6 22:07:07 2013 UTC
+++ /build.xml Sat Dec 7 17:47:34 2013 UTC
@@ -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>
=======================================
--- /common.xml Fri Dec 6 22:07:07 2013 UTC
+++ /common.xml Sat Dec 7 17:47:34 2013 UTC
@@ -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>
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/google-guice-dev.
For more options, visit https://groups.google.com/groups/opt_out.
