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/06/23 14:39:27 UTC
[1/3] ant git commit: fix Bug 59556 - support "jdk" package for Java
7+
Repository: ant
Updated Branches:
refs/heads/master 2d86edf69 -> 9dee500e5
fix Bug 59556 - support "jdk" package for Java 7+
Patch based on Chris Hegarty (Oracle) work.
"jdk" package has been introduced in JDK7 but is not known from Ant.
"jdk.net.Sockets" has been chosen as test class because it is available in JDK7, JDK8 and JDK9.
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/fef3ea39
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/fef3ea39
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/fef3ea39
Branch: refs/heads/master
Commit: fef3ea39f8bd474add292bb6437df6cbd22e1ba7
Parents: 82b2e47
Author: Vincent Privat <vi...@gmail.com>
Authored: Wed Jun 22 22:59:24 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Jun 23 16:34:42 2016 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/fef3ea39/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 df77820..4f244da 100644
--- a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
+++ b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
@@ -430,6 +430,8 @@ public final class JavaEnvUtils {
case VERSION_1_9:
case VERSION_1_8:
case VERSION_1_7:
+ jrePackages.addElement("jdk");
+ // fall through
case VERSION_1_6:
case VERSION_1_5:
//In Java1.5, the apache stuff moved.
@@ -483,6 +485,8 @@ public final class JavaEnvUtils {
case VERSION_1_9:
case VERSION_1_8:
case VERSION_1_7:
+ tests.addElement("jdk.net.Sockets");
+ // fall through
case VERSION_1_6:
case VERSION_1_5:
tests.addElement(
[3/3] ant git commit: Merge branch '1.9.x'
Posted by bo...@apache.org.
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9dee500e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9dee500e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9dee500e
Branch: refs/heads/master
Commit: 9dee500e597ba2c985b7253a8d4b04629e4e0e55
Parents: 2d86edf a394a0b
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Jun 23 16:39:09 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Jun 23 16:39:09 2016 +0200
----------------------------------------------------------------------
CONTRIBUTORS | 2 ++
WHATSNEW | 5 +++++
contributors.xml | 8 ++++++++
src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 4 ++++
4 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/9dee500e/WHATSNEW
----------------------------------------------------------------------
[2/3] ant git commit: record fix for 59556 - closes #19
Posted by bo...@apache.org.
record fix for 59556 - closes #19
https://bz.apache.org/bugzilla/show_bug.cgi?id=59556
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/a394a0bd
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/a394a0bd
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/a394a0bd
Branch: refs/heads/master
Commit: a394a0bdf8e6240dc09023a8260059c57c158a00
Parents: fef3ea3
Author: Stefan Bodewig <bo...@apache.org>
Authored: Thu Jun 23 16:37:54 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Thu Jun 23 16:37:54 2016 +0200
----------------------------------------------------------------------
CONTRIBUTORS | 2 ++
WHATSNEW | 5 +++++
contributors.xml | 8 ++++++++
3 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/a394a0bd/CONTRIBUTORS
----------------------------------------------------------------------
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 249d436..1988638 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -51,6 +51,7 @@ Bruce Atherton
Cedomir Igaly
Charles Hudak
Charlie Hubbard
+Chris Hegarty
Chris Povirk
Christian Knorr
Christian Schmidt
@@ -403,6 +404,7 @@ Valentino Miazzo
Victor Toni
Vimil Saju
Vincent Legoll
+Vincent Privat
Vitold Sedyshev
Volker Leidl
Waldek Herka
http://git-wip-us.apache.org/repos/asf/ant/blob/a394a0bd/WHATSNEW
----------------------------------------------------------------------
diff --git a/WHATSNEW b/WHATSNEW
index b18bba5..bd90733 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -24,6 +24,11 @@ Fixed bugs:
NTFS filesystems and re-created archives more often than necessary.
Bugzilla Report 59562
+ * AntClassLoader didn't delegate to the parent loader for classes in
+ the "jdk" package or one of its subpackages. This hierarchy has
+ been introduced with Java 7.
+ Bugzilla Report 59556
+
Other changes:
--------------
http://git-wip-us.apache.org/repos/asf/ant/blob/a394a0bd/contributors.xml
----------------------------------------------------------------------
diff --git a/contributors.xml b/contributors.xml
index bf49ac3..1356f38 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -227,6 +227,10 @@
</name>
<name>
<first>Chris</first>
+ <last>Hegarty</last>
+ </name>
+ <name>
+ <first>Chris</first>
<last>Povirk</last>
</name>
<name>
@@ -1617,6 +1621,10 @@
<last>Legoll</last>
</name>
<name>
+ <first>Vincent</first>
+ <last>Privat</last>
+ </name>
+ <name>
<first>Vimil</first>
<last>Saju</last>
</name>