From fef3ea39f8bd474add292bb6437df6cbd22e1ba7 Mon Sep 17 00:00:00 2001
From: Vincent Privat <vincent.privat@gmail.com>
Date: Wed, 22 Jun 2016 22:59:24 +0200
Subject: [PATCH 1/2] 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.
---
 src/main/org/apache/tools/ant/util/JavaEnvUtils.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/org/apache/tools/ant/util/JavaEnvUtils.java b/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
index df7782086..4f244da31 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(

From a394a0bdf8e6240dc09023a8260059c57c158a00 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Thu, 23 Jun 2016 16:37:54 +0200
Subject: [PATCH 2/2] record fix for 59556 - closes #19

https://bz.apache.org/bugzilla/show_bug.cgi?id=59556
---
 CONTRIBUTORS     | 2 ++
 WHATSNEW         | 5 +++++
 contributors.xml | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 249d43677..1988638ee 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
diff --git a/WHATSNEW b/WHATSNEW
index b18bba5fb..bd90733d6 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:
 --------------
 
diff --git a/contributors.xml b/contributors.xml
index bf49ac3ed..1356f3801 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -225,6 +225,10 @@
     <first>Charlie</first>
     <last>Hubbard</last>
   </name>
+  <name>
+    <first>Chris</first>
+    <last>Hegarty</last>
+  </name>
   <name>
     <first>Chris</first>
     <last>Povirk</last>
@@ -1616,6 +1620,10 @@
     <first>Vincent</first>
     <last>Legoll</last>
   </name>
+  <name>
+    <first>Vincent</first>
+    <last>Privat</last>
+  </name>
   <name>
     <first>Vimil</first>
     <last>Saju</last>