From ce9939a605e156c81d02e21037d830ded530c70f Mon Sep 17 00:00:00 2001 From: katleman Date: Fri, 12 Apr 2013 15:22:33 -0700 Subject: [PATCH] 8012048: JDK8 b85 source with GPL header errors Reviewed-by: iris, mduigou, jjg --- .../classes/com/sun/crypto/provider/GaloisCounterMode.java | 2 +- src/share/classes/java/util/function/DoublePredicate.java | 2 +- src/share/classes/java/util/function/IntPredicate.java | 2 +- src/share/classes/java/util/function/LongPredicate.java | 2 +- src/share/classes/java/util/function/ObjIntConsumer.java | 2 +- .../classes/java/util/function/ToDoubleBiFunction.java | 2 +- test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh | 2 +- test/java/lang/reflect/Method/IsDefaultTest.java | 2 +- test/java/net/URLConnection/RequestProperties.java | 2 +- test/java/util/Optional/BasicDouble.java | 6 +++--- test/javax/swing/text/html/7189299/bug7189299.java | 2 +- test/sun/management/jdp/JdpTest.sh | 2 +- test/sun/misc/URLClassPath/JarLoaderTest.java | 2 +- test/sun/util/calendar/zi/ZoneInfoFile.java | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java b/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java index a2c6cfd82..2f8b584e2 100644 --- a/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java +++ b/src/share/classes/com/sun/crypto/provider/GaloisCounterMode.java @@ -6,7 +6,7 @@ * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code.S + * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or diff --git a/src/share/classes/java/util/function/DoublePredicate.java b/src/share/classes/java/util/function/DoublePredicate.java index e132f9b74..48f450482 100644 --- a/src/share/classes/java/util/function/DoublePredicate.java +++ b/src/share/classes/java/util/function/DoublePredicate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, 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 diff --git a/src/share/classes/java/util/function/IntPredicate.java b/src/share/classes/java/util/function/IntPredicate.java index 17cc49c75..4351c75ff 100644 --- a/src/share/classes/java/util/function/IntPredicate.java +++ b/src/share/classes/java/util/function/IntPredicate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, 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 diff --git a/src/share/classes/java/util/function/LongPredicate.java b/src/share/classes/java/util/function/LongPredicate.java index ca542a412..65f3e6952 100644 --- a/src/share/classes/java/util/function/LongPredicate.java +++ b/src/share/classes/java/util/function/LongPredicate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, 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 diff --git a/src/share/classes/java/util/function/ObjIntConsumer.java b/src/share/classes/java/util/function/ObjIntConsumer.java index fa63af5cf..33f900101 100644 --- a/src/share/classes/java/util/function/ObjIntConsumer.java +++ b/src/share/classes/java/util/function/ObjIntConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, 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 diff --git a/src/share/classes/java/util/function/ToDoubleBiFunction.java b/src/share/classes/java/util/function/ToDoubleBiFunction.java index 8826e12da..a4a03e61b 100644 --- a/src/share/classes/java/util/function/ToDoubleBiFunction.java +++ b/src/share/classes/java/util/function/ToDoubleBiFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, 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 diff --git a/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh b/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh index 4cf633282..4935a0cf0 100644 --- a/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh +++ b/test/java/lang/System/MacJNUEncoding/MacJNUEncoding.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 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 diff --git a/test/java/lang/reflect/Method/IsDefaultTest.java b/test/java/lang/reflect/Method/IsDefaultTest.java index 64cb5c2df..1dd67aeb8 100644 --- a/test/java/lang/reflect/Method/IsDefaultTest.java +++ b/test/java/lang/reflect/Method/IsDefaultTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 diff --git a/test/java/net/URLConnection/RequestProperties.java b/test/java/net/URLConnection/RequestProperties.java index af549e22e..40946a6f0 100644 --- a/test/java/net/URLConnection/RequestProperties.java +++ b/test/java/net/URLConnection/RequestProperties.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2013, 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 diff --git a/test/java/util/Optional/BasicDouble.java b/test/java/util/Optional/BasicDouble.java index 741137c38..841dd459e 100644 --- a/test/java/util/Optional/BasicDouble.java +++ b/test/java/util/Optional/BasicDouble.java @@ -3,17 +3,17 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2.0 only, as + * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2.0 for more details (a copy is included in the LICENSE file that + * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). * * You should have received a copy of the GNU General Public License version - * 2.0 along with this work; if not, write to the Free Software Foundation, + * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA diff --git a/test/javax/swing/text/html/7189299/bug7189299.java b/test/javax/swing/text/html/7189299/bug7189299.java index 70d2057c8..83862122e 100644 --- a/test/javax/swing/text/html/7189299/bug7189299.java +++ b/test/javax/swing/text/html/7189299/bug7189299.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 diff --git a/test/sun/management/jdp/JdpTest.sh b/test/sun/management/jdp/JdpTest.sh index dfdea7c19..f42bbdace 100644 --- a/test/sun/management/jdp/JdpTest.sh +++ b/test/sun/management/jdp/JdpTest.sh @@ -1,6 +1,6 @@ #!/bin/sh -x -# Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2012, 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 diff --git a/test/sun/misc/URLClassPath/JarLoaderTest.java b/test/sun/misc/URLClassPath/JarLoaderTest.java index cd9cbc88b..24a8ea80e 100644 --- a/test/sun/misc/URLClassPath/JarLoaderTest.java +++ b/test/sun/misc/URLClassPath/JarLoaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 diff --git a/test/sun/util/calendar/zi/ZoneInfoFile.java b/test/sun/util/calendar/zi/ZoneInfoFile.java index f0dda48c0..ae3e38d98 100644 --- a/test/sun/util/calendar/zi/ZoneInfoFile.java +++ b/test/sun/util/calendar/zi/ZoneInfoFile.java @@ -5,7 +5,7 @@ * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Class-path" exception as provided + * particular file as subject to the "Classpath" exception as provided * by Oracle in the LICENSE file that accompanied this code. * * This code is distributed in the hope that it will be useful, but WITHOUT -- GitLab