From dev-return-84364-apmail-ant-dev-archive=ant.apache.org@ant.apache.org Tue Aug 04 20:41:34 2009 Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 52255 invoked from network); 4 Aug 2009 20:41:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Aug 2009 20:41:34 -0000 Received: (qmail 75118 invoked by uid 500); 4 Aug 2009 20:41:38 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 75011 invoked by uid 500); 4 Aug 2009 20:41:38 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 75001 invoked by uid 99); 4 Aug 2009 20:41:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 20:41:38 +0000 X-ASF-Spam-Status: No, hits=1.2 required=10.0 tests=SPF_HELO_PASS,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [212.227.126.171] (HELO moutng.kundenserver.de) (212.227.126.171) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 20:41:27 +0000 Received: from [192.168.178.2] (p4FEAA9C8.dip0.t-ipconnect.de [79.234.169.200]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0MKuxg-1MYQol0PeB-0008L4; Tue, 04 Aug 2009 22:41:07 +0200 Message-ID: <4A789CE2.4040702@schillbaer.de> Date: Tue, 04 Aug 2009 22:41:06 +0200 From: Gilbert Rebhan User-Agent: Thunderbird 2.0.0.22 (X11/20090605) MIME-Version: 1.0 To: Ant Developers List Subject: [PATCH] org/apache/tools/ant/taskdefs/Manifest Content-Type: multipart/mixed; boundary="------------050101040309020900010503" X-Provags-ID: V01U2FsdGVkX1+fJrTqGr97hE7DHMJE1t7Nz/GiLU/M7NZd0kM fCa04guuoa/a1og8WA8UzoOeIncucSEN0c7hOh6/nCHK4QASor 6dYxUzTJ9Mm+8WsMSt3Pg== X-Virus-Checked: Checked by ClamAV on apache.org --------------050101040309020900010503 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Hi, Env = WinXP, WindowsServer 2003, jdk1.6.0_14, ant171 after switching from Sun jdk 1.5.0_11 to jdk 1.6.0_14 i noticed that property java.vm.version has changed, so the Manifest class should use java.runtime.version for the value of Created-By entry in MANIFEST.MF jdk 1.5.0_11, Manifest looks like = Manifest-Version: 1.0 Ant-Version: Apache Ant 1.7.1 Created-By: 1.5.0_11-b03 (Sun Microsystems Inc.) ... jdk 1.5.0_11, java.vm.version property = 1.5.0_11-b03 jdk 1.5.0_11, java.runtime.version property = 1.5.0_11-b03 jdk 1.6.0_14, Manifest looks like = Manifest-Version: 1.0 Ant-Version: Apache Ant 1.7.1 Created-By: 14.0-b16 (Sun Microsystems Inc.) ... jdk 1.6.0_14, java.vm.version property = 14.0-b16 jdk 1.6.0_14, java.runtime.version property = 1.6.0_14-b08 ------- patch attached ------- @@ -746,7 +746,7 @@ 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.runtime.version") + " (" + System.getProperty("java.vm.vendor") + ")"); defaultManifest.getMainSection().storeAttribute(createdBy); return defaultManifest; Regards, Gilbert --------------050101040309020900010503 Content-Type: text/plain; name="Manifest.diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Manifest.diffs" @@ -746,7 +746,7 @@ 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.runtime.version") + " (" + System.getProperty("java.vm.vendor") + ")"); defaultManifest.getMainSection().storeAttribute(createdBy); return defaultManifest; --------------050101040309020900010503 Content-Type: text/plain; charset=us-ascii --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org --------------050101040309020900010503--