diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 268e6dfd9..3f9ef5f7d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -105,6 +105,8 @@ Gautam Guliani Georges-Etienne Legendre Gero Vermaas Gerrit Riessen +Gilbert Rebhan +Gilles Scokart Glenn McAllister Glenn Twiggs Greg Nelson diff --git a/WHATSNEW b/WHATSNEW index d0b4d3bda..aa2e15183 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -141,6 +141,10 @@ Changes that could break older environments: set failOnError to false. Bugzilla Report 47362. + * Ant now uses the java.runtime.version instead of java.vm.version + system property for the Created-By Manifest attribute. + Bugzilla Report 47632. + Fixed bugs: ----------- diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index f10063e0d..058969b8d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -746,8 +746,8 @@ public class Manifest { insr = new InputStreamReader(in, "UTF-8"); Manifest defaultManifest = new Manifest(insr); Attribute createdBy = new Attribute("Created-By", - System.getProperty("java.vm.version") + " (" - + System.getProperty("java.vm.vendor") + ")"); + System.getProperty("java.runtime.version") + " (" + + System.getProperty("java.runtime.vendor") + ")"); defaultManifest.getMainSection().storeAttribute(createdBy); return defaultManifest; } catch (UnsupportedEncodingException e) {