changeset 93:394f7143a522 jdk6-b34

7001720: copyright templates not rebranded Reviewed-by: mchung
author ohair
date Mon, 19 Jan 2015 09:16:01 +0000
parents eaadaad97eb5
children 254b79a1b03e
files make/templates/bsd-header make/templates/gpl-cp-header make/templates/gpl-header
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/templates/bsd-header	Wed Oct 08 19:12:48 2014 +0100
+++ b/make/templates/bsd-header	Mon Jan 19 09:16:01 2015 +0000
@@ -1,4 +1,4 @@
-Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
+Copyright (c) %YEARS% Oracle and/or its affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -26,3 +26,4 @@
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
--- a/make/templates/gpl-cp-header	Wed Oct 08 19:12:48 2014 +0100
+++ b/make/templates/gpl-cp-header	Mon Jan 19 09:16:01 2015 +0000
@@ -1,4 +1,4 @@
-Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) %YEARS% 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
@@ -20,3 +20,4 @@
 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
+
--- a/make/templates/gpl-header	Wed Oct 08 19:12:48 2014 +0100
+++ b/make/templates/gpl-header	Mon Jan 19 09:16:01 2015 +0000
@@ -1,4 +1,4 @@
-Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) %YEARS% 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
@@ -18,3 +18,4 @@
 Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 or visit www.oracle.com if you need additional information or have any
 questions.
+