Browse Source

the -source magic was broken for 1.5 and 1.6. PR 50578

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1058854 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 14 years ago
parent
commit
5084636a18
2 changed files with 5 additions and 1 deletions
  1. +4
    -0
      WHATSNEW
  2. +1
    -1
      src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java

+ 4
- 0
WHATSNEW View File

@@ -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:
--------------



+ 1
- 1
src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java View File

@@ -361,7 +361,7 @@ public abstract class DefaultCompilerAdapter
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);
}


Loading…
Cancel
Save