8215257: OpenJDK 8 mozilla_compat.js, parser.js missing the Classpath exception license text jdk8u201-b09 jdk8u201-ga

Thu, 13 Dec 2018 21:40:16 -1200

author
rpatil
date
Thu, 13 Dec 2018 21:40:16 -1200
changeset 2447
bf5c40b0e9d8
parent 2446
e9a53cb7ea94
child 2448
7aeae6eb6236
child 2453
cd4430c469bf

8215257: OpenJDK 8 mozilla_compat.js, parser.js missing the Classpath exception license text
Reviewed-by: coffeys

src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js file | annotate | diff | comparison | revisions
src/jdk/nashorn/internal/runtime/resources/parser.js file | annotate | diff | comparison | revisions
test/script/trusted/classfilter_mozilla_compat.js.EXPECTED file | annotate | diff | comparison | revisions
     1.1 --- a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js	Wed Dec 12 00:00:42 2018 -0800
     1.2 +++ b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js	Thu Dec 13 21:40:16 2018 -1200
     1.3 @@ -1,10 +1,12 @@
     1.4  /*
     1.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10   * under the terms of the GNU General Public License version 2 only, as
    1.11 - * published by the Free Software Foundation.
    1.12 + * published by the Free Software Foundation.  Oracle designates this
    1.13 + * particular file as subject to the "Classpath" exception as provided
    1.14 + * by Oracle in the LICENSE file that accompanied this code.
    1.15   *
    1.16   * This code is distributed in the hope that it will be useful, but WITHOUT
    1.17   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     2.1 --- a/src/jdk/nashorn/internal/runtime/resources/parser.js	Wed Dec 12 00:00:42 2018 -0800
     2.2 +++ b/src/jdk/nashorn/internal/runtime/resources/parser.js	Thu Dec 13 21:40:16 2018 -1200
     2.3 @@ -1,10 +1,12 @@
     2.4  /*
     2.5 - * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
     2.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8   *
     2.9   * This code is free software; you can redistribute it and/or modify it
    2.10   * under the terms of the GNU General Public License version 2 only, as
    2.11 - * published by the Free Software Foundation.
    2.12 + * published by the Free Software Foundation.  Oracle designates this
    2.13 + * particular file as subject to the "Classpath" exception as provided
    2.14 + * by Oracle in the LICENSE file that accompanied this code.
    2.15   *
    2.16   * This code is distributed in the hope that it will be useful, but WITHOUT
    2.17   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
     3.1 --- a/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED	Wed Dec 12 00:00:42 2018 -0800
     3.2 +++ b/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED	Thu Dec 13 21:40:16 2018 -1200
     3.3 @@ -1,12 +1,12 @@
     3.4  class javax.script.ScriptContext$$NashornJavaAdapter
     3.5 -TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 39
     3.6 +TypeError: Java.extend needs at least one type argument. in nashorn:mozilla_compat.js at line number 41
     3.7  class jdk.nashorn.javaadapters.java.util.ArrayList
     3.8  class jdk.nashorn.javaadapters.java.util.ArrayList
     3.9  [JavaClass java.lang.Integer]
    3.10 -TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 373 at column number 16
    3.11 +TypeError: [object JavaPackage] is not a Java class in nashorn:mozilla_compat.js at line number 375 at column number 16
    3.12  [JavaClass java.util.HashSet]
    3.13  [JavaClass java.util.HashSet]
    3.14  [JavaClass java.lang.Integer]
    3.15 -ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 67
    3.16 +ReferenceError: "Integer" is not defined in nashorn:mozilla_compat.js at line number 69
    3.17  [JavaClass java.util.HashMap]
    3.18  [JavaClass java.util.HashMap]

mercurial