You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2014/04/23 08:12:48 UTC
svn commit: r1589343 - in /maven/plugin-tools/trunk: ./
maven-plugin-tools-annotations/
maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/
maven-plugin-tools-generators/
Author: olamy
Date: Wed Apr 23 06:12:48 2014
New Revision: 1589343
URL: http://svn.apache.org/r1589343
Log:
[MPLUGIN-260] Plugin that uses annotations in Java 8 source can't generate descriptor
Modified:
maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java
maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
maven/plugin-tools/trunk/pom.xml
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml?rev=1589343&r1=1589342&r2=1589343&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/pom.xml Wed Apr 23 06:12:48 2014
@@ -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>
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java?rev=1589343&r1=1589342&r2=1589343&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoAnnotationVisitor.java Wed Apr 23 06:12:48 2014
@@ -19,18 +19,19 @@ package org.apache.maven.tools.plugin.an
* 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;
}
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java?rev=1589343&r1=1589342&r2=1589343&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java Wed Apr 23 06:12:48 2014
@@ -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;
}
Modified: maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java?rev=1589343&r1=1589342&r2=1589343&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoFieldVisitor.java Wed Apr 23 06:12:48 2014
@@ -24,6 +24,7 @@ import org.codehaus.plexus.logging.Logge
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;
Modified: maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml?rev=1589343&r1=1589342&r2=1589343&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-generators/pom.xml Wed Apr 23 06:12:48 2014
@@ -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>
Modified: maven/plugin-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=1589343&r1=1589342&r2=1589343&view=diff
==============================================================================
--- maven/plugin-tools/trunk/pom.xml (original)
+++ maven/plugin-tools/trunk/pom.xml Wed Apr 23 06:12:48 2014
@@ -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>