Update ASM to 6.1.1 in Maven POMs for -sourceLevel 10 support
Also fixes Eclipse classpath that still referenced ASM 6.0,
and clean up dependencies to unused ASM libs.
Bug: #9613
Bug-Link: https://github.com/gwtproject/gwt/issues/9613
Change-Id: I8fdada01bd9b3e5f00547deaf7954113dee9c42f
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath
index c7b2745..4e24779 100644
--- a/eclipse/dev/.classpath
+++ b/eclipse/dev/.classpath
@@ -34,6 +34,5 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.1.1/asm-commons-6.1.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.1.1/asm-tree-6.1.1.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.1.1/asm-util-6.1.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.1.1/asm-xml-6.1.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath
index 9f7b4c6..4e98014 100644
--- a/eclipse/user/.classpath
+++ b/eclipse/user/.classpath
@@ -63,8 +63,7 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20160315/sourcemap-rebased.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/org.eclipse.jdt.core_3.13.102-CUSTOM-GWT-20180415.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdtCompilerAdapter_3.13.102-CUSTOM-GWT-20180415.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.0/asm-6.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.0/asm-analysis-6.0.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.0/asm-commons-6.0.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.1.1/asm-6.1.1.jar"/>
+ <classpathentry kind="var" path="GWT_TOOLS/lib/objectweb/asm-6.1.1/asm-commons-6.1.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml
index e0ba652..aec1071 100644
--- a/maven/poms/gwt/pom-template.xml
+++ b/maven/poms/gwt/pom-template.xml
@@ -88,10 +88,18 @@
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
- <artifactId>asm-parent</artifactId>
- <version>6.0</version>
- <type>pom</type>
- <scope>import</scope>
+ <artifactId>asm</artifactId>
+ <version>6.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>6.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>6.1.1</version>
</dependency>
<dependency>
<groupId>colt</groupId>
diff --git a/user/build.xml b/user/build.xml
index a34b287..8dd3dd9 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -67,7 +67,6 @@
<pathelement location="${gwt.tools.lib}/objenesis/objenesis-1.2.jar"/>
<pathelement location="${gwt.tools.lib}/objectweb/asm-6.1.1/asm-6.1.1.jar"/>
<pathelement location="${gwt.tools.lib}/objectweb/asm-6.1.1/asm-commons-6.1.1.jar"/>
- <pathelement location="${gwt.tools.lib}/objectweb/asm-6.1.1/asm-util-6.1.1.jar"/>
<pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
<pathelement location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA-sources.jar"/>
<pathelement
