shuber 2004/09/22 14:28:28 CEST
Modified files:
. plugin.jelly project.xml
Log:
Updated Jasper version to avoid file locking problem when precompiling JSPs.
Revision Changes Path
1.5 +3 -3 maven-jahiawar-plugin/plugin.jelly
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/plugin.jelly.diff?r1=1.4&r2=1.5&f=h
1.3 +2 -2 maven-jahiawar-plugin/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/maven-jahiawar-plugin/project.xml.diff?r1=1.2&r2=1.3&f=h
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/repository/maven-jahiawar-plugin/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 22 Sep 2004 10:18:23 -0000 1.4
+++ plugin.jelly 22 Sep 2004 12:28:28 -0000 1.5
@@ -17,7 +17,7 @@
<postGoal name="war:webapp">
<j:set var="precompileJsp" value="${maven.jahiawar.precompile.jsp}"/>
<j:if test="${precompileJsp == 'true'}">
- <attainGoal name="jahia:precompile-jsp"/>
+ <attainGoal name="jahia:precompile-jsp" />
<j:set var="target"
value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webapp.dir')}"/>
<util:available file="${maven.build.dir}/web-fragment.xml">
<util:loadText var="fragment" file="${maven.build.dir}/web-fragment.xml"/>
@@ -75,7 +75,7 @@
srcdir="${jspSource}"
uriroot="${warSource}"
uribase="/${pom.artifactId}"
- verbose="2"/>
+ verbose="2" />
<echo>Compiling generated JSP Java source...</echo>
<ant:javac
srcdir="${jspOutDir}"
@@ -83,7 +83,7 @@
debug="${maven.compile.debug}"
deprecation="${maven.compile.deprecation}"
optimize="${maven.compile.optimize}"
- classpathref="jspc.classpath"/>
+ classpathref="jspc.classpath" />
</goal>
<preGoal name="war:war">
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/maven-jahiawar-plugin/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 22 Sep 2004 10:18:23 -0000 1.2
+++ project.xml 22 Sep 2004 12:28:28 -0000 1.3
@@ -26,12 +26,12 @@
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-compiler</artifactId>
- <version>5.0.18</version>
+ <version>5.0.25</version>
</dependency>
<dependency>
<groupId>tomcat</groupId>
<artifactId>jasper-runtime</artifactId>
- <version>5.0.18</version>
+ <version>5.0.25</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
