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
diff --git a/build.xml b/build.xml
index d5bc437..730cc7b 100644
--- a/build.xml
+++ b/build.xml
@@ -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>
diff --git a/common.xml b/common.xml
index 0d091f8..8fbb19a 100644
--- a/common.xml
+++ b/common.xml
@@ -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"/>
diff --git a/core/pom.xml b/core/pom.xml
index 3773300..e420035 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -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>
diff --git a/extensions/assistedinject/.gitignore b/extensions/assistedinject/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/assistedinject/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/grapher/.gitignore b/extensions/grapher/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/grapher/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/jmx/.gitignore b/extensions/jmx/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/jmx/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/jndi/.gitignore b/extensions/jndi/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/jndi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/mini/.gitignore b/extensions/mini/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/mini/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/multibindings/.gitignore b/extensions/multibindings/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/multibindings/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/persist/.gitignore b/extensions/persist/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/persist/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/persist/pom.xml b/extensions/persist/pom.xml
index b3c4a34..1a903cb 100644
--- a/extensions/persist/pom.xml
+++ b/extensions/persist/pom.xml
@@ -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>
diff --git a/extensions/pom.xml b/extensions/pom.xml
index b758bcd..1298e5d 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -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>
diff --git a/extensions/service/.gitignore b/extensions/service/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/service/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/servlet/.gitignore b/extensions/servlet/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/servlet/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/spring/.gitignore b/extensions/spring/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/spring/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/struts2/.gitignore b/extensions/struts2/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/struts2/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/extensions/throwingproviders/.gitignore b/extensions/throwingproviders/.gitignore
deleted file mode 100644
index 84c048a..0000000
--- a/extensions/throwingproviders/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build/
diff --git a/lib/build/asm-4.2.jar b/lib/build/asm-4.2.jar
deleted file mode 100644
index 693913d..0000000
--- a/lib/build/asm-4.2.jar
+++ /dev/null
Binary files differ
diff --git a/lib/build/asm-5.0.jar b/lib/build/asm-5.0.jar
new file mode 100644
index 0000000..40502a6
--- /dev/null
+++ b/lib/build/asm-5.0.jar
Binary files differ