update some comments
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/db225497 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/db225497 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/db225497 Branch: refs/heads/master Commit: db2254973cd2e77b5e8d5a938adb09927f531472 Parents: e09e4bb Author: Stefan Bodewig <[email protected]> Authored: Thu Feb 12 21:15:52 2015 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Thu Feb 12 21:15:52 2015 +0100 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/taskdefs/Javac.java | 6 +++--- src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/db225497/src/main/org/apache/tools/ant/taskdefs/Javac.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index 75a35cf..3d77f7c 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -202,8 +202,8 @@ public class Javac extends MatchingTask { * must make sure that your version of jikes supports the -source * switch.</p> * - * <p>Legal values are 1.3, 1.4, 1.5, and 5 - by default, no - * -source argument will be used at all.</p> + * <p>Legal values are 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, and 5, 6, 7, 8 and 9 + * - by default, no -source argument will be used at all.</p> * * @param v Value to assign to source. */ @@ -606,7 +606,7 @@ public class Javac extends MatchingTask { /** * Sets the target VM that the classes will be compiled for. Valid * values depend on the compiler, for jdk 1.4 the valid values are - * "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "5", "6", "7" and "8". + * "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "5", "6", "7", "8", "9". * @param target the target VM */ public void setTarget(final String target) { http://git-wip-us.apache.org/repos/asf/ant/blob/db225497/src/main/org/apache/tools/ant/util/JavaEnvUtils.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java index c91bf76..2f27cfe 100644 --- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java +++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java @@ -385,6 +385,8 @@ public final class JavaEnvUtils { // fall back to JRE bin directory, also catches JDK 1.0 and 1.1 // where java.home points to the root of the JDK and Mac OS X where // the whole directory layout is different from Sun's + // and also catches JDK 1.9 (and probably later) which + // merged JDK and JRE dirs return getJreExecutable(command); } }
