Revision: b6c35cd58a1e
Author: Sam Berlin <[email protected]>
Date: Thu Mar 20 20:56:37 2014 UTC
Log: Update the opensource jars to asm 5.0, fix up the POMs & ant
scripts.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=63496902
http://code.google.com/p/google-guice/source/detail?r=b6c35cd58a1e
Added:
/lib/build/asm-5.0.jar
Deleted:
/extensions/assistedinject/.gitignore
/extensions/grapher/.gitignore
/extensions/jmx/.gitignore
/extensions/jndi/.gitignore
/extensions/mini/.gitignore
/extensions/multibindings/.gitignore
/extensions/persist/.gitignore
/extensions/service/.gitignore
/extensions/servlet/.gitignore
/extensions/spring/.gitignore
/extensions/struts2/.gitignore
/extensions/throwingproviders/.gitignore
/lib/build/asm-4.2.jar
Modified:
/build.xml
/common.xml
/core/pom.xml
/extensions/persist/pom.xml
/extensions/pom.xml
=======================================
--- /dev/null
+++ /lib/build/asm-5.0.jar Thu Mar 20 20:56:37 2014 UTC
Binary file, no diff available.
=======================================
--- /extensions/assistedinject/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/grapher/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/jmx/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/jndi/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/mini/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/multibindings/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/persist/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/service/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/servlet/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/spring/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/struts2/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /extensions/throwingproviders/.gitignore Thu Feb 13 18:55:32 2014 UTC
+++ /dev/null
@@ -1,1 +0,0 @@
-/build/
=======================================
--- /lib/build/asm-4.2.jar Sat Dec 7 17:47:34 2013 UTC
+++ /dev/null
Binary file, no diff available.
=======================================
--- /build.xml Thu Feb 13 18:37:24 2014 UTC
+++ /build.xml Thu Mar 20 20:56:37 2014 UTC
@@ -205,7 +205,7 @@
<param name="-hdf"/> <param name="project.name"/> <param
name="Guice"/>
<param name="-since"/> <param name="lib/build/guice-1.0.xml"/>
<param name="Guice_1.0" />
<param name="-since"/> <param name="lib/build/guice-2.0.xml"/>
<param name="Guice_2.0" />
- <param name="-since"/> <param name="lib/build/guice-3.0.xml"/>
<param name="Guice_3.0" />
+ <param name="-since"/> <param name="lib/build/guice-3.0.xml"/>
<param name="Guice_3.0" />
<param name="-apiversion" value="Guice_${new.api}"/>
<param name="-assetsdir" value="javadoc/assets"/>
<param name="-apixml" value="build/docs/guice-${new.api}.xml"/>
@@ -252,7 +252,7 @@
<arg value="-DNO_AOP" />
</munge>
<replace file="build/no_aop/common.xml" value="">
- <replacetoken><![CDATA[<zipfileset
src="${common.basedir}/lib/build/asm-4.2.jar"/>]]></replacetoken>
+ <replacetoken><![CDATA[<zipfileset
src="${common.basedir}/lib/build/asm-5.0.jar"/>]]></replacetoken>
</replace>
<replace file="build/no_aop/common.xml" value="">
<replacetoken><![CDATA[<zipfileset
src="${common.basedir}/lib/build/cglib-3.1.jar"/>]]></replacetoken>
=======================================
--- /common.xml Thu Feb 13 18:37:24 2014 UTC
+++ /common.xml Thu Mar 20 20:56:37 2014 UTC
@@ -145,7 +145,7 @@
<jarjar jarfile="${build.dir}/${ant.project.name}-with-deps.jar">
<fileset dir="${build.dir}/classes"/>
<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/asm-5.0.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"/>
<rule pattern="org.objectweb.asm.*"
result="com.google.inject.internal.asm.$@1"/>
=======================================
--- /core/pom.xml Thu Feb 13 18:37:24 2014 UTC
+++ /core/pom.xml Thu Mar 20 20:56:37 2014 UTC
@@ -36,6 +36,18 @@
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>5.0</version>
<optional>true</optional>
</dependency>
<dependency>
=======================================
--- /extensions/persist/pom.xml Thu Feb 13 18:37:24 2014 UTC
+++ /extensions/persist/pom.xml Thu Mar 20 20:56:37 2014 UTC
@@ -44,18 +44,5 @@
<version>2.0.0</version>
<scope>test</scope>
</dependency>
- <!-- These are present for IDEs which will not be pulling in the
jarjar'ed value. -->
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-util</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
=======================================
--- /extensions/pom.xml Thu Feb 13 18:37:24 2014 UTC
+++ /extensions/pom.xml Thu Mar 20 20:56:37 2014 UTC
@@ -63,6 +63,18 @@
<artifactId>cglib</artifactId>
<version>3.1</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>5.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
--
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/d/optout.
