diff --git a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js index 6c27e2a6fbc52e1dfe19c4ceb3a62fd2d616182c..2acd1fe71a8dd213cc97baaaa334adfaff109c75 100644 --- a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js +++ b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js @@ -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 diff --git a/src/jdk/nashorn/internal/runtime/resources/parser.js b/src/jdk/nashorn/internal/runtime/resources/parser.js index 94d02aba67b495171506956cedc3d49353cbd092..ac4d0524377f3d17fc8fe89b8e40ef74febee1fd 100644 --- a/src/jdk/nashorn/internal/runtime/resources/parser.js +++ b/src/jdk/nashorn/internal/runtime/resources/parser.js @@ -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 diff --git a/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED b/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED index 9481e98e18288910db5bc8979ce9d2f1438a8a84..66a5ca75bed66194f646e67bbbc67e2e64f8fd77 100644 --- a/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED +++ b/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED @@ -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]