From fef3ea39f8bd474add292bb6437df6cbd22e1ba7 Mon Sep 17 00:00:00 2001 From: Vincent Privat Date: Wed, 22 Jun 2016 22:59:24 +0200 Subject: [PATCH] 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(