vmassol 2004/10/07 11:45:35
Modified: java plugin.jelly plugin.properties
java/xdocs changes.xml properties.xml
Log:
Make it work with any version of the JDK. fixes MPJAVA-22.
Revision Changes Path
1.30 +4 -1 maven-plugins/java/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/java/plugin.jelly,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- plugin.jelly 6 Jul 2004 12:37:18 -0000 1.29
+++ plugin.jelly 7 Oct 2004 18:45:35 -0000 1.30
@@ -48,7 +48,6 @@
excludes="**/package.html"
debug="${maven.compile.debug}"
deprecation="${maven.compile.deprecation}"
- target="${maven.compile.target}"
optimize="${maven.compile.optimize}">
<ant:src>
<ant:path refid="maven.compile.src.set"/>
@@ -115,6 +114,10 @@
<j:if test="${context.getVariable('maven.compile.source') != null}">
<ant:setProperty name="source" value="${maven.compile.source}" />
+ </j:if>
+
+ <j:if test="${context.getVariable('maven.compile.target') != null}">
+ <ant:setProperty name="target" value="${maven.compile.target}" />
</j:if>
<j:if test="${context.getVariable('maven.compile.verbose') != null}">
1.11 +0 -2 maven-plugins/java/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/java/plugin.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.properties 12 Jun 2004 23:38:35 -0000 1.10
+++ plugin.properties 7 Oct 2004 18:45:35 -0000 1.11
@@ -17,5 +17,3 @@
# -------------------------------------------------------------------
# P L U G I N P R O P E R T I E S
# -------------------------------------------------------------------
-
-maven.compile.target = 1.1
1.14 +1 -0 maven-plugins/java/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/java/xdocs/changes.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- changes.xml 6 Jul 2004 12:37:18 -0000 1.13
+++ changes.xml 7 Oct 2004 18:45:35 -0000 1.14
@@ -26,6 +26,7 @@
</properties>
<body>
<release version="1.5-SNAPSHOT" date="in CVS">
+ <action dev="vmassol" type="fix" issue="MPJAVA-22">Make it work by default
with any version of the JDK</action>
<action dev="brett" type="update">Deprecate dependency handle</action>
<action dev="dion" type="update">Use assert taglib for tests</action>
</release>
1.14 +1 -3 maven-plugins/java/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/java/xdocs/properties.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- properties.xml 12 Jun 2004 23:38:35 -0000 1.13
+++ properties.xml 7 Oct 2004 18:45:35 -0000 1.14
@@ -176,9 +176,7 @@
<p>
Corresponds to the <code>target</code> attribute for the ant
<a href="http://ant.apache.org/manual/CoreTasks/javac.html";>javac</a>
- task.
- This value defaults to 1.1 so that builds on JDK 1.4 or later stil
work on
- earlier JVMs.
+ task. This value defaults to the Ant task default value.
</p>
</td>
</tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
