You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jh...@apache.org on 2015/02/23 16:08:24 UTC
[1/2] ant git commit: style
Repository: ant
Updated Branches:
refs/heads/master 32062cc59 -> 833af4b2b
style
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/ceb39e2a
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/ceb39e2a
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/ceb39e2a
Branch: refs/heads/master
Commit: ceb39e2a0a54dd11d4e1ea093844c3a6c59bebbc
Parents: 32062cc
Author: Jan Matèrne <jh...@apache.org>
Authored: Mon Feb 23 10:16:08 2015 +0100
Committer: Jan Matèrne <jh...@apache.org>
Committed: Mon Feb 23 10:16:08 2015 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Project.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/ceb39e2a/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 b7ab25b..08ae7ec 100644
--- a/src/main/org/apache/tools/ant/Project.java
+++ b/src/main/org/apache/tools/ant/Project.java
@@ -151,6 +151,7 @@ public class Project implements ResourceFactory {
/** Map from target names to targets (String to Target). */
private final Hashtable<String, Target> targets = new Hashtable<String, Target>();
+
/** Set of global filters. */
private final FilterSet globalFilterSet = new FilterSet();
{
[2/2] ant git commit: Java requires Java 1.5 since Ant 1.9.0 (07
March 2013)
Posted by jh...@apache.org.
Java requires Java 1.5 since Ant 1.9.0 (07 March 2013)
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/833af4b2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/833af4b2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/833af4b2
Branch: refs/heads/master
Commit: 833af4b2b616f04bfcebad37611d1b15ce91b2ab
Parents: ceb39e2
Author: Jan Matèrne <jh...@apache.org>
Authored: Mon Feb 23 16:08:09 2015 +0100
Committer: Jan Matèrne <jh...@apache.org>
Committed: Mon Feb 23 16:08:09 2015 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/Project.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/833af4b2/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 08ae7ec..3a0c4b8 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_4)) {
- throw new BuildException("Ant cannot work on Java prior to 1.4");
+ if (!JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_5)) {
+ throw new BuildException("Ant cannot work on Java prior to 1.5");
}
log("Detected Java version: " + javaVersion + " in: "
+ System.getProperty("java.home"), MSG_VERBOSE);