Merge branch '1.9.x'

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

WHATSNEW

@@ -30,6 +30,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:
 --------------
 

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>

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(