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 bbb4434922b76e4d7252140e4e03129fc20f6ef2 Author: Piotrek Żygieło <pzygi...@users.noreply.github.com> AuthorDate: Thu Jun 4 18:11:12 2020 +0200 [MWAR-430] Extract method to check for Servlet 3.0+ --- src/main/java/org/apache/maven/plugins/war/WarMojo.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 261ef04..7d7ea42 100644 --- a/src/main/java/org/apache/maven/plugins/war/WarMojo.java +++ b/src/main/java/org/apache/maven/plugins/war/WarMojo.java @@ -321,6 +321,12 @@ public class WarMojo urls[i] = new File( classpathElements.get( i ) ).toURI().toURL(); } ClassLoader loader = new URLClassLoader( urls, Thread.currentThread().getContextClassLoader() ); + + return hasWebServletAnnotationClassInClasspath( loader ); + } + + private static boolean hasWebServletAnnotationClassInClasspath( ClassLoader loader ) + { try { Class.forName( "javax.servlet.annotation.WebServlet", false, loader );