From 98525aa613bf584907290afbf67cfd14119c0dba Mon Sep 17 00:00:00 2001
From: jstrachan <jstrachan@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 26 Apr 2003 09:56:23 +0000
Subject: [PATCH] Defaulted the compile target to 1.1. If a build is done on
 JDK 1.4 then it defaults to JDK 1.4, which means on some JVM's (e.g. IBM's
 JDK 1.3) the code won't work! Even if you're not using any JDK 1.4 features.
 The generated bytecode can contain some JDK 1.4 specific methods!

So as a safety measure, I've defaulted the target to 1.1 by default (which is the default setting for JDK 1.1, 1.2 and 1.3 anyway).

You can still overload this value on a project by project basis - this just prevents this possible bug hitting Maven users.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113388 13f79535-47bb-0310-9956-ffa450edef68
---
 java/plugin.jelly         | 7 ++-----
 java/plugin.properties    | 3 ++-
 java/xdocs/properties.xml | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/plugin.jelly b/java/plugin.jelly
index 247ed2c0..191f294e 100644
--- a/java/plugin.jelly
+++ b/java/plugin.jelly
@@ -45,11 +45,12 @@
         
     <j:choose>
       <j:when test="${sourcesPresent == 'true'}">
-        <ant:javac
+      	<ant:javac
           destdir="${maven.build.dest}"
           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"/>
@@ -97,10 +98,6 @@
             <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}">
             <ant:setProperty name="verbose" value="${maven.compile.verbose}" />
           </j:if>
diff --git a/java/plugin.properties b/java/plugin.properties
index 4670466d..b16dad0c 100644
--- a/java/plugin.properties
+++ b/java/plugin.properties
@@ -3,4 +3,5 @@
 # -------------------------------------------------------------------
 
 maven.jar.manifest = ${maven.conf.dir}/Manifest.mf
-maven.jar.mainclass = 
\ No newline at end of file
+maven.jar.mainclass = 
+maven.compile.target = 1.1
\ No newline at end of file
diff --git a/java/xdocs/properties.xml b/java/xdocs/properties.xml
index bc0177c6..5d6afdff 100644
--- a/java/xdocs/properties.xml
+++ b/java/xdocs/properties.xml
@@ -139,6 +139,8 @@
               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.
             </p>
           </td>
         </tr>