From 485b860846e254ee7306b1d28cbd2350c25ff5a4 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 23 Apr 2014 06:12:48 +0000
Subject: [PATCH] [MPLUGIN-260] Plugin that uses annotations in Java 8 source
 can't generate descriptor

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1589343 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-plugin-tools-annotations/pom.xml                 |  6 +-----
 .../scanner/visitors/MojoAnnotationVisitor.java        | 10 ++++++----
 .../annotations/scanner/visitors/MojoClassVisitor.java |  4 +++-
 .../annotations/scanner/visitors/MojoFieldVisitor.java |  4 +++-
 maven-plugin-tools-generators/pom.xml                  |  4 ++--
 pom.xml                                                |  8 ++++----
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml
index 7ea96a5..5243547 100644
--- a/maven-plugin-tools-annotations/pom.xml
+++ b/maven-plugin-tools-annotations/pom.xml
@@ -74,13 +74,9 @@
       <artifactId>plexus-container-default</artifactId>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
     </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java
index 2cd42c9..a44c541 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java
@@ -19,18 +19,19 @@ package org.apache.maven.tools.plugin.annotations.scanner.visitors;
  * under the License.
  */
 
-import org.codehaus.plexus.logging.Logger;
-import org.objectweb.asm.AnnotationVisitor;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.codehaus.plexus.logging.Logger;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Opcodes;
+
 /**
  * @author Olivier Lamy
  * @since 3.0
  */
 public class MojoAnnotationVisitor
-    implements AnnotationVisitor
+    extends AnnotationVisitor
 {
     private Logger logger;
 
@@ -40,6 +41,7 @@ public class MojoAnnotationVisitor
 
     MojoAnnotationVisitor( Logger logger, String annotationClassName )
     {
+    	super(Opcodes.ASM4);
         this.logger = logger;
         this.annotationClassName = annotationClassName;
     }
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
index 798110d..31891db 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
@@ -28,6 +28,7 @@ import org.objectweb.asm.Attribute;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
 import java.util.ArrayList;
@@ -40,7 +41,7 @@ import java.util.Map;
  * @since 3.0
  */
 public class MojoClassVisitor
-    implements ClassVisitor
+    extends ClassVisitor
 {
     private Logger logger;
 
@@ -52,6 +53,7 @@ public class MojoClassVisitor
 
     public MojoClassVisitor( Logger logger )
     {
+    	super(Opcodes.ASM4);
         this.logger = logger;
     }
 
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java
index 58665b2..73e713b 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java
@@ -24,6 +24,7 @@ import org.codehaus.plexus.logging.Logger;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.Attribute;
 import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 
 /**
@@ -31,7 +32,7 @@ import org.objectweb.asm.Type;
  * @since 3.0
  */
 public class MojoFieldVisitor
-    implements FieldVisitor
+    extends FieldVisitor
 {
     private Logger logger;
 
@@ -43,6 +44,7 @@ public class MojoFieldVisitor
 
     MojoFieldVisitor( Logger logger, String fieldName, String className )
     {
+    	super(Opcodes.ASM4);
         this.logger = logger;
         this.fieldName = fieldName;
         this.className = className;
diff --git a/maven-plugin-tools-generators/pom.xml b/maven-plugin-tools-generators/pom.xml
index 55570c0..aa2fccc 100644
--- a/maven-plugin-tools-generators/pom.xml
+++ b/maven-plugin-tools-generators/pom.xml
@@ -89,11 +89,11 @@
     </dependency>
 
     <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
+      <groupId>org.ow2.asm</groupId>
       <artifactId>asm-commons</artifactId>
     </dependency>
 
diff --git a/pom.xml b/pom.xml
index 3fe2962..578a245 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,14 +297,14 @@
       </dependency>
 
       <dependency>
-        <groupId>asm</groupId>
+        <groupId>org.ow2.asm</groupId>
         <artifactId>asm</artifactId>
-        <version>3.3.1</version>
+        <version>5.0_BETA</version>
       </dependency>
       <dependency>
-        <groupId>asm</groupId>
+        <groupId>org.ow2.asm</groupId>
         <artifactId>asm-commons</artifactId>
-        <version>3.3.1</version>
+        <version>5.0_BETA</version>
       </dependency>
 
       <dependency>