Mercurial > hg > icedtea8-forest > nashorn
changeset 2481:bf5c40b0e9d8 jdk8u201-b09 jdk8u201-ga
8215257: OpenJDK 8 mozilla_compat.js, parser.js missing the Classpath exception license text
Reviewed-by: coffeys
| author | rpatil |
|---|---|
| date | Thu, 13 Dec 2018 21:40:16 -1200 |
| parents | e9a53cb7ea94 |
| children | 3cb2fe2b1b7d 7aeae6eb6236 cd4430c469bf |
| files | src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js src/jdk/nashorn/internal/runtime/resources/parser.js test/script/trusted/classfilter_mozilla_compat.js.EXPECTED |
| diffstat | 3 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Wed Dec 12 00:00:42 2018 -0800 +++ b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Thu Dec 13 21:40:16 2018 -1200 @@ -1,10 +1,12 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, 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 * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. + * 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. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--- a/src/jdk/nashorn/internal/runtime/resources/parser.js Wed Dec 12 00:00:42 2018 -0800 +++ b/src/jdk/nashorn/internal/runtime/resources/parser.js Thu Dec 13 21:40:16 2018 -1200 @@ -1,10 +1,12 @@ /* - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2018, 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 * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. + * 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. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
--- a/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED Wed Dec 12 00:00:42 2018 -0800 +++ b/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED Thu Dec 13 21:40:16 2018 -1200 @@ -1,12 +1,12 @@ class javax.script.ScriptContext$$NashornJavaAdapter -TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 39 +TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 41 class jdk.nashorn.javaadapters.java.util.ArrayList class jdk.nashorn.javaadapters.java.util.ArrayList [JavaClass java.lang.Integer] -TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 373 at column number 16 +TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 375 at column number 16 [JavaClass java.util.HashSet] [JavaClass java.util.HashSet] [JavaClass java.lang.Integer] -ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 67 +ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 69 [JavaClass java.util.HashMap] [JavaClass java.util.HashMap]