This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch pzygielo-mwar-430 in repository https://gitbox.apache.org/repos/asf/maven-war-plugin.git
commit 7e36ebf292fc01c2ddd55804cd23f9c2732b3f0d Author: Piotrek Żygieło <pzygi...@users.noreply.github.com> AuthorDate: Thu Jun 4 18:11:18 2020 +0200 [MWAR-430] Extract method to check for class --- src/main/java/org/apache/maven/plugins/war/WarMojo.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/war/WarMojo.java b/src/main/java/org/apache/maven/plugins/war/WarMojo.java index 7d7ea42..e731a39 100644 --- a/src/main/java/org/apache/maven/plugins/war/WarMojo.java +++ b/src/main/java/org/apache/maven/plugins/war/WarMojo.java @@ -327,9 +327,14 @@ public class WarMojo private static boolean hasWebServletAnnotationClassInClasspath( ClassLoader loader ) { + return hasClassInClasspath( loader, "javax.servlet.annotation.WebServlet" ); + } + + private static boolean hasClassInClasspath( ClassLoader loader, String clazz ) + { try { - Class.forName( "javax.servlet.annotation.WebServlet", false, loader ); + Class.forName( clazz, false, loader ); return true; } catch ( ClassNotFoundException e )