ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject [1/3] ant git commit: fix Bug 59556 - support "jdk" package for Java 7+
Date Thu, 23 Jun 2016 14:39:27 GMT
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 <vincent.privat@gmail.com>
Authored: Wed Jun 22 22:59:24 2016 +0200
Committer: Stefan Bodewig <bodewig@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(


Mime
View raw message