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 2018/01/26 19:30:54 UTC
[1/2] ant git commit: Java9 tool location changes now show up on
Jenkins
Repository: ant
Updated Branches:
refs/heads/1.9.x 6fe6914f6 -> 5892ab045
Java9 tool location changes now show up on Jenkins
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f0322a2f
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f0322a2f
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f0322a2f
Branch: refs/heads/1.9.x
Commit: f0322a2f4bb15199a55942cc3e6d1a51a26922eb
Parents: 6fe6914
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Jan 26 20:30:10 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Jan 26 20:30:10 2018 +0100
----------------------------------------------------------------------
src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/f0322a2f/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
index cd479d5..db4e4af 100644
--- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
@@ -67,7 +67,11 @@ public class JavaEnvUtilsTest {
assertTrue(j + " is absolute", (new File(j)).isAbsolute());
String javaHomeParent = FILE_UTILS.normalize(javaHome + "/..").getAbsolutePath();
assertTrue(j + " is normalized and in the JDK dir", j.startsWith(javaHomeParent));
+ if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
+ assertTrue(j + " is normalized and not in the JRE dir", j.startsWith(javaHome));
+ } else {
assertTrue(j + " is normalized and not in the JRE dir", !j.startsWith(javaHome));
+ }
} catch (AssertionError e) {
// java.home is bogus
assertEquals("javac.exe", j);
[2/2] ant git commit: whitespace
Posted by bo...@apache.org.
whitespace
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/5892ab04
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/5892ab04
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/5892ab04
Branch: refs/heads/1.9.x
Commit: 5892ab045db81bd74b38ebc494c6ff50005924a7
Parents: f0322a2
Author: Stefan Bodewig <bo...@apache.org>
Authored: Fri Jan 26 20:30:35 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Fri Jan 26 20:30:35 2018 +0100
----------------------------------------------------------------------
src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/5892ab04/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
index db4e4af..aa71b0b 100644
--- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java
@@ -68,9 +68,9 @@ public class JavaEnvUtilsTest {
String javaHomeParent = FILE_UTILS.normalize(javaHome + "/..").getAbsolutePath();
assertTrue(j + " is normalized and in the JDK dir", j.startsWith(javaHomeParent));
if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)) {
- assertTrue(j + " is normalized and not in the JRE dir", j.startsWith(javaHome));
+ assertTrue(j + " is normalized and not in the JRE dir", j.startsWith(javaHome));
} else {
- assertTrue(j + " is normalized and not in the JRE dir", !j.startsWith(javaHome));
+ assertTrue(j + " is normalized and not in the JRE dir", !j.startsWith(javaHome));
}
} catch (AssertionError e) {
// java.home is bogus