olamy closed pull request #13: [MPLUGIN-335] - Fix build and tests URL: https://github.com/apache/maven-plugin-tools/pull/13
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java index f5450977..66c846c5 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/extractor/annotations/scanner/DefaultMojoAnnotationsScanner.java @@ -224,6 +224,19 @@ private void analyzeClassStream( Map<String, MojoAnnotatedClass> mojoAnnotatedCl getLogger().isDebugEnabled() ? aiooe : null ); return; } + catch ( IllegalArgumentException iae ) + { + if ( iae.getMessage() == null ) + { + getLogger().warn( "Error analyzing class " + file + " in " + source + ": ignoring class", + getLogger().isDebugEnabled() ? iae : null ); + return; + } + else + { + throw iae; + } + } analyzeVisitors( mojoClassVisitor ); diff --git a/pom.xml b/pom.xml index 29d043b8..145276b2 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,7 @@ <antVersion>1.7.1</antVersion> <mavenInvokerPluginVersion>3.0.1</mavenInvokerPluginVersion> <maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path> + <asmVersion>5.0.2</asmVersion> </properties> <dependencyManagement> @@ -217,10 +218,12 @@ <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> + <version>${asmVersion}</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-commons</artifactId> + <version>${asmVersion}</version> </dependency> <dependency> @@ -426,20 +429,9 @@ </plugin> </plugins> </build> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - <version>6.1.1</version> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> - <version>6.1.1</version> - </dependency> - </dependencies> - </dependencyManagement> + <properties> + <asmVersion>6.1.1</asmVersion> + </properties> </profile> </profiles> </project> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services