Use package renamed ASM to avoid conflict.

jenkinsci · Mar 2, 2012 · b3f1bcb · b3f1bcb
1 parent 3ff0cc3
commit b3f1bcb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -78,11 +78,9 @@
       <version>r06</version>
     </dependency>
     <dependency>
-      <!-- optionally read in parameter names from the debug info -->
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>2.2.3</version>
-      <optional>true</optional>
+      <groupId>org.kohsuke</groupId>
+      <artifactId>asm3</artifactId>
+      <version>3.3.0</version>
     </dependency>
     <dependency>
       <!-- perhaps mark this dependency optional? -->

diff --git a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java
@@ -24,12 +24,11 @@
 package org.kohsuke.stapler;
 
 import org.apache.commons.io.IOUtils;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.commons.EmptyVisitor;
+import org.kohsuke.asm3.ClassReader;
+import org.kohsuke.asm3.Label;
+import org.kohsuke.asm3.MethodVisitor;
+import org.kohsuke.asm3.Type;
+import org.kohsuke.asm3.commons.EmptyVisitor;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -185,7 +184,7 @@ private static String[] loadParametersFromAsm(final Method m) throws IOException
                     else
                         return null; // ignore this method
                 }
-            }, false);
+            }, 0);
 
             // Indexes may not be sequential, but first set of local variables are method params
             int i = 0;
@@ -221,7 +220,7 @@ public MethodVisitor visitMethod(int access, String methodName, String desc, Str
                     else
                         return null; // ignore this method
                 }
-            }, false);
+            }, 0);
 
             // Indexes may not be sequential, but first set of local variables are method params
             int i = 0;