vmassol 2005/04/22 23:31:38
Modified: integration/maven plugin.jelly
integration/maven/xdocs changes.xml
Log:
CACTUS-205: Fixed the usage of the Java plugin properties that are used when
compiling the Cactus tests. They were ignored due to some invalid Jelly syntax.
Note: I haven't been able to test it yet as the maven plugin tests are failing
for some unknown issue ATM.
Revision Changes Path
1.46 +7 -7 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- plugin.jelly 30 Mar 2005 05:19:16 -0000 1.45
+++ plugin.jelly 23 Apr 2005 06:31:38 -0000 1.46
@@ -190,31 +190,31 @@
<ant:pathelement path="${maven.build.dest}"/>
</ant:classpath>
- <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.compilerargs')}">
+ <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.compilerargs')
!= null}">
<ant:compilerarg
line="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.compilerargs')}"/>
</j:if>
- <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.encoding')}">
+ <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.encoding')
!= null}">
<ant:setProperty name="encoding"
value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.encoding')}"/>
</j:if>
- <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.executable')}">
+ <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.executable')
!= null}">
<ant:setProperty name="executable"
value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.executable')}"/>
</j:if>
- <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.fork')}">
+ <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.fork')
!= null}">
<ant:setProperty name="fork"
value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.fork')}"/>
</j:if>
- <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.source')}">
+ <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.source')
!= null}">
<ant:setProperty name="source"
value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.source')}"/>
</j:if>
- <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.target')}">
+ <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.target')
!= null}">
<ant:setProperty name="target"
value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.target')}"/>
</j:if>
- <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.verbose')}">
+ <j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.verbose')
!= null}">
<ant:setProperty name="verbose"
value="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.verbose')}"/>
</j:if>
</ant:javac>
1.65 +5 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- changes.xml 30 Mar 2005 05:19:16 -0000 1.64
+++ changes.xml 23 Apr 2005 06:31:38 -0000 1.65
@@ -8,6 +8,11 @@
<body>
<release version="1.8dev" date="in CVS">
+ <action dev="vmassol" type="fix" issue="CACTUS-205">
+ Fixed the usage of the Java plugin properties that are used when
+ compiling the Cactus tests. They were ignored due to some invalid
+ Jelly syntax.
+ </action>
<action dev="felipeal" type="add" issue="CACTUS-201">
Goal <code>cactus:test</code> is not executed if property
<code>cactus.test.skip</code> (and not <code>maven.test.skip</code>
anymore) is set.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
