stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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
master
Olivier Lamy 2014-04-23 06:12:48 +00:00
parent e020e993df
commit 485b860846
6 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-plugin-tools-annotations/pom.xml
View File

@ -74,13 +74,9 @@
<artifactId>plexus-container-default</artifactId> <artifactId>plexus-container-default</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
</dependency> </dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>

10
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java
View File

@ -19,18 +19,19 @@ package org.apache.maven.tools.plugin.annotations.scanner.visitors;
* under the License. * under the License.
*/ */
import org.codehaus.plexus.logging.Logger;
import org.objectweb.asm.AnnotationVisitor;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.codehaus.plexus.logging.Logger;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.Opcodes;
/** /**
* @author Olivier Lamy * @author Olivier Lamy
* @since 3.0 * @since 3.0
*/ */
public class MojoAnnotationVisitor public class MojoAnnotationVisitor
implements AnnotationVisitor extends AnnotationVisitor
{ {
private Logger logger; private Logger logger;
@ -40,6 +41,7 @@ public class MojoAnnotationVisitor
MojoAnnotationVisitor( Logger logger, String annotationClassName ) MojoAnnotationVisitor( Logger logger, String annotationClassName )
{ {
super(Opcodes.ASM4);
this.logger = logger; this.logger = logger;
this.annotationClassName = annotationClassName; this.annotationClassName = annotationClassName;
} }

4
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
View File

@ -28,6 +28,7 @@ import org.objectweb.asm.Attribute;
import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
import java.util.ArrayList; import java.util.ArrayList;
@ -40,7 +41,7 @@ import java.util.Map;
* @since 3.0 * @since 3.0
*/ */
public class MojoClassVisitor public class MojoClassVisitor
implements ClassVisitor extends ClassVisitor
{ {
private Logger logger; private Logger logger;
@ -52,6 +53,7 @@ public class MojoClassVisitor
public MojoClassVisitor( Logger logger ) public MojoClassVisitor( Logger logger )
{ {
super(Opcodes.ASM4);
this.logger = logger; this.logger = logger;
} }

4
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java
View File

@ -24,6 +24,7 @@ import org.codehaus.plexus.logging.Logger;
import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.Attribute; import org.objectweb.asm.Attribute;
import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type; import org.objectweb.asm.Type;
/** /**
@ -31,7 +32,7 @@ import org.objectweb.asm.Type;
* @since 3.0 * @since 3.0
*/ */
public class MojoFieldVisitor public class MojoFieldVisitor
implements FieldVisitor extends FieldVisitor
{ {
private Logger logger; private Logger logger;
@ -43,6 +44,7 @@ public class MojoFieldVisitor
MojoFieldVisitor( Logger logger, String fieldName, String className ) MojoFieldVisitor( Logger logger, String fieldName, String className )
{ {
super(Opcodes.ASM4);
this.logger = logger; this.logger = logger;
this.fieldName = fieldName; this.fieldName = fieldName;
this.className = className; this.className = className;

4
maven-plugin-tools-generators/pom.xml
View File

@ -89,11 +89,11 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId> <artifactId>asm-commons</artifactId>
</dependency> </dependency>

8
pom.xml
View File

@ -297,14 +297,14 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>3.3.1</version> <version>5.0_BETA</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId> <artifactId>asm-commons</artifactId>
<version>3.3.1</version> <version>5.0_BETA</version>
</dependency> </dependency>
<dependency> <dependency>