From 82d37706ea0eee342ceee50d1982bbbbf38c6056 Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Thu, 30 Jan 2003 10:28:24 +0000 Subject: [PATCH] Make Create-By attribute in manifest compliant with spec by listing the java implementation version and vendor. Add an Ant-Version field to show the Ant version PR: 12219 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273926 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/org/apache/tools/ant/defaultManifest.mf | 2 +- src/main/org/apache/tools/ant/taskdefs/Manifest.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/org/apache/tools/ant/defaultManifest.mf b/src/main/org/apache/tools/ant/defaultManifest.mf index 1dc733da7..e3b3cba15 100644 --- a/src/main/org/apache/tools/ant/defaultManifest.mf +++ b/src/main/org/apache/tools/ant/defaultManifest.mf @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Created-By: Apache Ant @VERSION@ +Ant-Version: Apache Ant @VERSION@ diff --git a/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/src/main/org/apache/tools/ant/taskdefs/Manifest.java index c091a0816..e453223f6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2002 The Apache Software Foundation. All rights + * Copyright (c) 2001-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -729,7 +729,13 @@ public class Manifest { + defManifest); } try { - return new Manifest(new InputStreamReader(in, "ASCII")); + Manifest defaultManifest + = new Manifest(new InputStreamReader(in, "ASCII")); + Attribute createdBy = new Attribute("Created-By", + System.getProperty("java.vm.version") + " (" + + System.getProperty("java.vm.vendor") + ")" ); + defaultManifest.getMainSection().storeAttribute(createdBy); + return defaultManifest; } catch (UnsupportedEncodingException e) { return new Manifest(new InputStreamReader(in)); }