diff --git a/maven-plugin-tools-annotations/pom.xml b/maven-plugin-tools-annotations/pom.xml index 8e39a21..f58bc28 100644 --- a/maven-plugin-tools-annotations/pom.xml +++ b/maven-plugin-tools-annotations/pom.xml @@ -97,6 +97,10 @@ test + + org.easymock + easymock + diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoAnnotationVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoAnnotationVisitor.java index a273ce5..b2c82ed 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoAnnotationVisitor.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoAnnotationVisitor.java @@ -41,7 +41,7 @@ public class MojoAnnotationVisitor MojoAnnotationVisitor( Logger logger, String annotationClassName ) { - super( Opcodes.ASM4 ); + super( Opcodes.ASM5 ); this.logger = logger; this.annotationClassName = annotationClassName; } diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java index 88c96ee..44c50bb 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoClassVisitor.java @@ -53,7 +53,7 @@ public class MojoClassVisitor public MojoClassVisitor( Logger logger ) { - super( Opcodes.ASM4 ); + super( Opcodes.ASM5 ); this.logger = logger; } diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoFieldVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoFieldVisitor.java index 26bbac3..1ea3561 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoFieldVisitor.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/visitors/MojoFieldVisitor.java @@ -44,7 +44,7 @@ public class MojoFieldVisitor MojoFieldVisitor( Logger logger, String fieldName, String className ) { - super( Opcodes.ASM4 ); + super( Opcodes.ASM5 ); this.logger = logger; this.fieldName = fieldName; this.className = className; diff --git a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java index 6218848..c10a6de 100644 --- a/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java +++ b/maven-plugin-tools-annotations/src/test/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScannerTest.java @@ -19,8 +19,11 @@ package org.apache.maven.tools.plugin.extractor.annotations.scanner; * under the License. */ +import static org.easymock.EasyMock.*; + import java.io.File; +import org.codehaus.plexus.logging.Logger; import junit.framework.TestCase; public class DefaultMojoAnnotationsScannerTest @@ -32,4 +35,14 @@ public class DefaultMojoAnnotationsScannerTest { scanner.scanArchive( new File( "src/test/resources/java9-module.jar"), null, false ); } + + public void testJava8Annotations() throws Exception + { + Logger logger = createMock( Logger.class ); + expect( logger.isDebugEnabled() ).andReturn( false ); + replay( logger ); + scanner.enableLogging( logger ); + scanner.scanArchive( new File( "src/test/resources/java8-annotations.jar"), null, false ); + } + } diff --git a/maven-plugin-tools-annotations/src/test/resources/java8-annotations.jar b/maven-plugin-tools-annotations/src/test/resources/java8-annotations.jar new file mode 100644 index 0000000..3595594 Binary files /dev/null and b/maven-plugin-tools-annotations/src/test/resources/java8-annotations.jar differ