From 197e3063115d1175474a1502b2575dde180e0300 Mon Sep 17 00:00:00 2001 From: Robert Scholte Date: Fri, 26 Aug 2016 19:31:15 +0000 Subject: [PATCH] [MPLUGIN-312] maven-plugin-tools-annotations visitors fail scanning java8 annotations git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1757909 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugin-tools-annotations/pom.xml | 4 ++++ .../scanner/visitors/MojoAnnotationVisitor.java | 2 +- .../scanner/visitors/MojoClassVisitor.java | 2 +- .../scanner/visitors/MojoFieldVisitor.java | 2 +- .../DefaultMojoAnnotationsScannerTest.java | 13 +++++++++++++ .../src/test/resources/java8-annotations.jar | Bin 0 -> 539 bytes 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 maven-plugin-tools-annotations/src/test/resources/java8-annotations.jar 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 0000000000000000000000000000000000000000..35955942a86c3b7ba63dc4a7681ffd96d9d2b9b1 GIT binary patch literal 539 zcmWIWW@h1H00G-&Ql4N2lwbqWS&3zd7Wx5DH5_0yg0(a3Oc@y%P6DwQT#XkQ(5?RD5e#CGyBU+Kkbd;43t1!FSA(;hEcz!4-cCE(z+ycpkC0n3+6o-|YB zkB+#~jt|U#G(P%8X_Oh3KfCjJ$Kk&}|Ndet=yaCXJH)1SXw{n%9@^NTp8;dy_Jb-<+{rd7gK7 zxbO8nUb&XP|L1*4$ku-vbvdJcg6PkPJD%D(>sE5F=6#T??I3E}c5PYZ)u?xm4QF<3 zJjl8B+|tlX2Cti#`vZCl=DuT-mDforx$Z5xnRx|U%dREcdhY*ZdA)((;(d!u&UC%@ ztf`x9-(1j+(7Ncd`piw;sc-EAycwB9m~lr3BxVE{-a3L8dczW Y&?76rn-vt>3`{^+0i=6@QOm#p09LNPvj6}9 literal 0 HcmV?d00001