dion 2003/07/22 23:32:50
Modified: src/plugins-build/java plugin.jelly
Log:
Work around jelly bug when null value is provided
Revision Changes Path
1.18 +8 -6 maven/src/plugins-build/java/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/java/plugin.jelly,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- plugin.jelly 10 Jun 2003 10:13:54 -0000 1.17
+++ plugin.jelly 23 Jul 2003 06:32:49 -0000 1.18
@@ -122,12 +122,14 @@
<goal name="java:jar-resources"
description="Copy any resources that must be present in the deployed JAR
file">
-
- <j:if test="${!pom.build.resources.isEmpty()}">
- <resources:copy
- resources="${pom.build.resources}"
- todir="${maven.build.dest}"
- />
+ <j:set var="build" value="${pom.build}"/>
+ <j:if test="${!empty(build)}">
+ <j:if test="${!pom.build.resources.isEmpty()}">
+ <resources:copy
+ resources="${pom.build.resources}"
+ todir="${maven.build.dest}"
+ />
+ </j:if>
</j:if>
</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
