OpenJDK / amber / amber
changeset 6883:bbd0cba11983
6984046: java/jar jar/pack source needs vendor rebranding changes (jdk7 only)
Summary: updated to use appropriate vendor name
Reviewed-by: ohair, dholmes
| author | sherman |
|---|---|
| date | Mon, 11 Oct 2010 22:32:55 -0700 |
| parents | 637546039be3 |
| children | 65b1fa0a0fae |
| files | jdk/src/share/classes/sun/tools/jar/CommandLine.java jdk/test/tools/jar/UpdateManifest.java |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/share/classes/sun/tools/jar/CommandLine.java Mon Oct 11 20:22:27 2010 -0700 +++ b/jdk/src/share/classes/sun/tools/jar/CommandLine.java Mon Oct 11 22:32:55 2010 -0700 @@ -36,7 +36,7 @@ /** * Various utility methods for processing Java tool command line arguments. * - * <p><b>This is NOT part of any API suppored by Sun Microsystems. If + * <p><b>This is NOT part of any API supported by Oracle. If * you write code that depends on this, you do so at your own risk. * This code and its internal interfaces are subject to change or * deletion without notice.</b>
--- a/jdk/test/tools/jar/UpdateManifest.java Mon Oct 11 20:22:27 2010 -0700 +++ b/jdk/test/tools/jar/UpdateManifest.java Mon Oct 11 22:32:55 2010 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -23,7 +23,7 @@ /** * @test - * @bug 6434207 6442687 + * @bug 6434207 6442687 6984046 * @summary Ensure that jar ufm actually updates the * existing jar file's manifest with contents of the * manifest file. @@ -87,7 +87,7 @@ if (!debug) manifestOrig.deleteOnExit(); PrintWriter pw = new PrintWriter(manifestOrig); pw.println("Manifest-Version: 1.0"); - pw.println("Created-By: 1.6.0-internal (Sun Microsystems Inc.)"); + pw.println("Created-By: 1.7.0-internal (Oracle Corporation)"); pw.println(""); pw.println(animal); pw.println(specTitle); @@ -109,7 +109,7 @@ if (!debug) manifestUpdate.deleteOnExit(); pw = new PrintWriter(manifestUpdate); final String createdBy = - "Created-By: 1.5.0-special (Sun Microsystems Inc.)"; + "Created-By: 1.7.0-special (Oracle Corporation)"; final String specVersion = "Specification-Version: 1.0.0.0"; pw.println(createdBy); // replaces line in the original