From 52437ba35bfb46d87c8d67a6af88f6bd40c56971 Mon Sep 17 00:00:00 2001 From: Greg Knox Date: Sun, 18 Dec 2022 13:20:32 +1000 Subject: [PATCH 1/2] issue-104: skipJspc property (4.x branch) --- .../java/io/leonard/maven/plugins/jspc/JspcMojo.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java b/src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java index afdf766..fdd29f6 100755 --- a/src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java +++ b/src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java @@ -284,6 +284,12 @@ public class JspcMojo extends AbstractMojo { */ @Parameter(defaultValue = "true") private boolean strictQuoteEscaping; + + /** + * Set this to 'true' to bypass compilation of JSP sources. + */ + @Parameter(defaultValue = "false", property = "jspc.skip") + private boolean skipJspc; private Map resourcesCache = new ConcurrentHashMap<>(); @@ -313,7 +319,12 @@ public void execute() throws MojoExecutionException, MojoFailureException { getLog().info("compilerVersion=" + compilerVersion); getLog().info("compilerClass=" + compilerClass); getLog().info("strictQuoteEscaping=" + strictQuoteEscaping); + getLog().info("skip=" + skipJspc); } + if ( skipJspc ) { + getLog().info( "Not compiling jsp sources" ); + return; + } try { long start = System.currentTimeMillis(); @@ -738,3 +749,4 @@ private String getwebXmlFragmentFilename(int threadIndex) { return threads == 1 ? webXmlFragment : webXmlFragment + "." + threadIndex; } } + From 1fb6c708bcd016334c6d78f4dafdc6421955f130 Mon Sep 17 00:00:00 2001 From: Greg Knox Date: Tue, 20 Dec 2022 17:50:33 +1000 Subject: [PATCH 2/2] issue-104: skipJspc -> skip --- src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java b/src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java index fdd29f6..945b568 100755 --- a/src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java +++ b/src/main/java/io/leonard/maven/plugins/jspc/JspcMojo.java @@ -289,7 +289,7 @@ public class JspcMojo extends AbstractMojo { * Set this to 'true' to bypass compilation of JSP sources. */ @Parameter(defaultValue = "false", property = "jspc.skip") - private boolean skipJspc; + private boolean skip; private Map resourcesCache = new ConcurrentHashMap<>(); @@ -319,9 +319,9 @@ public void execute() throws MojoExecutionException, MojoFailureException { getLog().info("compilerVersion=" + compilerVersion); getLog().info("compilerClass=" + compilerClass); getLog().info("strictQuoteEscaping=" + strictQuoteEscaping); - getLog().info("skip=" + skipJspc); + getLog().info("skip=" + skip); } - if ( skipJspc ) { + if ( skip ) { getLog().info( "Not compiling jsp sources" ); return; }