You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/07/25 10:31:39 UTC
ant git commit: master requires Java8
Repository: ant
Updated Branches:
refs/heads/master a6d07c624 -> 84019606f
master requires Java8
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/84019606
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/84019606
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/84019606
Branch: refs/heads/master
Commit: 84019606f32111b3938f138a29d8e7ac40944425
Parents: a6d07c6
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Jul 25 12:31:22 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Jul 25 12:31:22 2016 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Project.java | 4 ++--
src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/84019606/src/main/org/apache/tools/ant/Project.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/Project.java b/src/main/org/apache/tools/ant/Project.java
index e916002..89dad39 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -930,8 +930,8 @@ public class Project implements ResourceFactory {
setPropertyInternal(MagicNames.ANT_JAVA_VERSION, javaVersion);
// sanity check
- if (!JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_5)) {
- throw new BuildException("Ant cannot work on Java prior to 1.5");
+ if (!JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_8)) {
+ throw new BuildException("Ant cannot work on Java prior to 1.8");
}
log("Detected Java version: " + javaVersion + " in: "
+ System.getProperty("java.home"), MSG_VERBOSE);
http://git-wip-us.apache.org/repos/asf/ant/blob/84019606/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 a551c0f..84e82fd 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -258,8 +258,8 @@ public final class JavaEnvUtils {
* Compares the current Java version to the passed in String -
* assumes the argument is one of the constants defined in this
* class.
- * Note that Ant now requires JDK 1.5+ so {@link #JAVA_1_0} through
- * {@link #JAVA_1_4} need no longer be tested for.
+ * Note that Ant now requires JDK 1.8+ so {@link #JAVA_1_0} through
+ * {@link #JAVA_1_7} need no longer be tested for.
* @param version the version to check against the current version.
* @return true if the version of Java is the same as the given version.
* @since Ant 1.5
@@ -273,8 +273,8 @@ public final class JavaEnvUtils {
* Compares the current Java version to the passed in String -
* assumes the argument is one of the constants defined in this
* class.
- * Note that Ant now requires JDK 1.5+ so {@link #JAVA_1_0} through
- * {@link #JAVA_1_4} need no longer be tested for.
+ * Note that Ant now requires JDK 1.8+ so {@link #JAVA_1_0} through
+ * {@link #JAVA_1_7} need no longer be tested for.
* @param version the version to check against the current version.
* @return true if the version of Java is the same or higher than the
* given version.