felipeal 2004/12/21 05:22:49
Modified: integration/maven plugin.jelly
integration/maven/xdocs changes.xml
Log:
CACTUS-161: proper use of maven.compile.target and maven.compile.target
properties
Revision Changes Path
1.41 +4 -2 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- plugin.jelly 10 Dec 2004 14:11:04 -0000 1.40
+++ plugin.jelly 21 Dec 2004 13:22:49 -0000 1.41
@@ -182,8 +182,6 @@
excludes="**/package.html"
debug="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.debug')}"
deprecation="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.deprecation')}"
-
target="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.target')}"
-
source="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.source')}"
optimize="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.optimize')}">
<ant:src path="${cactus.src.dir}"/>
@@ -212,6 +210,10 @@
<j:if
test="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.source')}">
<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')}">
+ <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')}">
1.57 +4 -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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- changes.xml 10 Dec 2004 14:12:53 -0000 1.56
+++ changes.xml 21 Dec 2004 13:22:49 -0000 1.57
@@ -8,6 +8,10 @@
<body>
<release version="1.7dev" date="in CVS">
+ <action dev="felipeal" type="fix" due-to="Brett Porter"
issue="CACTUS-161">
+ Proper use of <code>maven.compile.target</code> and
+ <code>maven.compile.source</code> properties.
+ </action>
<action dev="felipeal" type="add" issue="CACTUS-158">
Added <code>jvmArgs</code> property to the containers tasks.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
