You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/11/12 23:32:26 UTC
[jspwiki] 02/09: ensure JSPs remain well-formed or else break the
build
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit c77fb09a2a001f734289e5fa1559dd1aa89b0b76
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue Nov 13 00:21:19 2018 +0100
ensure JSPs remain well-formed or else break the build
---
jspwiki-war/pom.xml | 12 +++++++++++-
pom.xml | 33 ++++++++++++++++++++++++++-------
2 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/jspwiki-war/pom.xml b/jspwiki-war/pom.xml
index e5b0893..72d01c6 100644
--- a/jspwiki-war/pom.xml
+++ b/jspwiki-war/pom.xml
@@ -59,13 +59,23 @@
<build>
<finalName>JSPWiki</finalName>
<plugins>
+ <plugin>
+ <groupId>io.leonard.maven.plugins</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <dependencies>
+ <dependency> <!-- so jspwiki custom taglibs can be seen by the jsp compiler -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jspwiki-main</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/)
Merge and compress CSS and JS files using the WRO4J.
- use UglifyJS for JS compression
- use Less as advanced CSS preprocessor
-->
-
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index ebdd5a4..a2e351d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,7 @@
<plugin.surefire.version>2.22.0</plugin.surefire.version>
<plugin.war.version>3.2.2</plugin.war.version>
<plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>
+ <plugin.jspc.version>2.4.6</plugin.jspc.version>
<plugin.checksum.version>1.7</plugin.checksum.version>
<plugin.jslint.version>1.0.1</plugin.jslint.version>
<plugin.cargo.version>1.6.10</plugin.cargo.version>
@@ -579,18 +580,31 @@
</configuration>
</plugin>
- <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/)
- Merge and compress CSS and JS files using the WRO4J.
- - use UglifyJS for JS compression
- - use Less as advanced CSS preprocessor
- -->
-
<plugin>
<groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
<artifactId>inmemdb-maven-plugin</artifactId>
<version>${plugin.inmemdb.version}</version>
</plugin>
-
+
+ <plugin>
+ <groupId>io.leonard.maven.plugins</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <version>${plugin.jspc.version}</version>
+ <configuration>
+ <generatedClasses>${project.build.directory}/ignore</generatedClasses> <!-- only check JSPs are well-formed -->
+ <keepSources>true</keepSources>
+ <stopAtFirstError>false</stopAtFirstError>
+ </configuration>
+ <executions>
+ <execution>
+ <id>check-jsps-are-well-formed</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
@@ -609,6 +623,11 @@
</configuration>
</plugin>
+ <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/)
+ Merge and compress CSS and JS files using the WRO4J.
+ - use UglifyJS for JS compression
+ - use Less as advanced CSS preprocessor
+ -->
<plugin>
<groupId>ro.isdc.wro4j</groupId>
<artifactId>wro4j-maven-plugin</artifactId>