ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1058854 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Date Fri, 14 Jan 2011 05:14:52 GMT
Author: bodewig
Date: Fri Jan 14 05:14:52 2011
New Revision: 1058854

URL: http://svn.apache.org/viewvc?rev=1058854&view=rev
Log:
the -source magic was broken for 1.5 and 1.6.  PR 50578

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1058854&r1=1058853&r2=1058854&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jan 14 05:14:52 2011
@@ -10,6 +10,10 @@ Fixed bugs:
  * Encoding of unicode escape sequences by the property file task
    Bugzilla Report 50515.
 
+ * The code that implicitly sets the -source switch if only -target is
+   in <javac> was broken for Java 5 and 6.
+   Bugzilla Report 50578.
+
 Other changes:
 --------------
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java?rev=1058854&r1=1058853&r2=1058854&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
Fri Jan 14 05:14:52 2011
@@ -361,7 +361,7 @@ public abstract class DefaultCompilerAda
                 setImplicitSourceSwitch((assumeJava15() || assumeJava16())
                                         ? "1.5 in JDK 1.5 and 1.6"
                                         : "1.7 in JDK 1.7",
-                                        cmd, s, t);
+                                        cmd, t, s);
             } else if (assumeJava17() && (t.equals("1.5") || t.equals("1.6"))) {
                 setImplicitSourceSwitch("1.7 in JDK 1.7", cmd, t, t);
             }



Mime
View raw message