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/1c5a92fb Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/1c5a92fb Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/1c5a92fb Branch: refs/heads/master Commit: 1c5a92fb1f6bfe673ba5239185a8ce0a2ceda277 Parents: 1166420 79e9d10 Author: Stefan Bodewig <[email protected]> Authored: Sat Dec 9 20:08:10 2017 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Sat Dec 9 20:08:10 2017 +0100 ---------------------------------------------------------------------- WHATSNEW | 3 +++ manual/Tasks/javah.html | 3 ++- .../optional/javah/JavahAdapterFactory.java | 5 +++++ .../org/apache/tools/ant/util/JavaEnvUtils.java | 8 ++++++-- src/tests/antunit/taskdefs/optional/javah-test.xml | 16 ++++++++++++---- .../tools/ant/taskdefs/optional/JavahTest.java | 4 ++++ .../org/apache/tools/ant/util/JavaEnvUtilsTest.java | 11 +++++++++++ 7 files changed, 43 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/1c5a92fb/WHATSNEW ---------------------------------------------------------------------- diff --cc WHATSNEW index d191f9f,e855833..ce969f4 --- a/WHATSNEW +++ b/WHATSNEW @@@ -75,8 -52,11 +75,11 @@@ Other changes * added "javac10+" as new supported value for javac's compiler attribute. + * javah has been removed from Java 10. The task will now throw an + exception if you try to use it while running Java 10 or newer. + -Changes from Ant 1.9.8 TO Ant 1.9.9 -=================================== +Changes from Ant 1.10.0 TO Ant 1.10.1 +===================================== Fixed bugs: ----------- http://git-wip-us.apache.org/repos/asf/ant/blob/1c5a92fb/manual/Tasks/javah.html ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/1c5a92fb/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java ---------------------------------------------------------------------- diff --cc src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java index 2244e5b,d40e595..931131b --- a/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.java @@@ -85,18 -86,20 +85,23 @@@ public class JavahAdapterFactory if ((JavaEnvUtils.isKaffe() && choice == null) || Kaffeh.IMPLEMENTATION_NAME.equals(choice)) { return new Kaffeh(); - } else if ((JavaEnvUtils.isGij() && choice == null) + } + if ((JavaEnvUtils.isGij() && choice == null) || Gcjh.IMPLEMENTATION_NAME.equals(choice)) { return new Gcjh(); - } else if (JavaEnvUtils.isAtLeastJavaVersion("10") && - (choice == null || ForkingJavah.IMPLEMENTATION_NAME.equals(choice))) { + } ++ if (JavaEnvUtils.isAtLeastJavaVersion("10") && ++ (choice == null || ForkingJavah.IMPLEMENTATION_NAME.equals(choice))) { + throw new BuildException("javah does not exist under Java 10 and higher," + + " use the javac task with nativeHeaderDir instead"); - } else if ((JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9) - && choice == null) - || ForkingJavah.IMPLEMENTATION_NAME.equals(choice)) { ++ } + if (ForkingJavah.IMPLEMENTATION_NAME.equals(choice)) { return new ForkingJavah(); - } else if (SunJavah.IMPLEMENTATION_NAME.equals(choice)) { + } + if (SunJavah.IMPLEMENTATION_NAME.equals(choice)) { return new SunJavah(); - } else if (choice != null) { + } + if (choice != null) { return resolveClassName(choice, // Memory leak in line below log.getProject() http://git-wip-us.apache.org/repos/asf/ant/blob/1c5a92fb/src/main/org/apache/tools/ant/util/JavaEnvUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/1c5a92fb/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java ---------------------------------------------------------------------- diff --cc src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java index 28e1386,e26a7cb..57d45e5 --- a/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java +++ b/src/tests/junit/org/apache/tools/ant/util/JavaEnvUtilsTest.java @@@ -143,4 -144,14 +143,15 @@@ public class JavaEnvUtilsTest assertTrue("JAVA_1_9 is not considered equal to JAVA_9", JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_9)); } + + @Test + public void java10IsDetectedProperly() { + assumeTrue("10".equals(System.getProperty("java.specification.version"))); + assertEquals("10", JavaEnvUtils.getJavaVersion()); + assertEquals(100, JavaEnvUtils.getJavaVersionNumber()); + assertEquals(new DeweyDecimal("10"), JavaEnvUtils.getParsedJavaVersion()); + assertTrue(JavaEnvUtils.isJavaVersion("10")); + assertTrue(JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_9)); + } ++ }
