Mercurial > hg > icedtea8-forest > nashorn
changeset 2499:7aeae6eb6236 jdk8u202-b08 jdk8u202-ga
Merge
| author | aefimov |
|---|---|
| date | Fri, 14 Dec 2018 14:05:19 +0000 |
| parents | 685500708f2d (current diff) bf5c40b0e9d8 (diff) |
| children | fcfed1a75772 b4f849376f08 |
| files | .hgtags |
| diffstat | 4 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Dec 12 00:29:15 2018 -0800 +++ b/.hgtags Fri Dec 14 14:05:19 2018 +0000 @@ -1004,6 +1004,7 @@ a430c68aabf0ede2fb9be32c710401523a6ddeac jdk8u201-b76 8bf098c9d21b1b407a4655bdf683b83474a211b4 jdk8u201-b07 38568172fbddb5177ff805ec1634da54c8ec2daa jdk8u201-b77 +03dc179691c8b481cf97869cdb65047515ec5b11 jdk8u201-b08 b347bb8a4cab083701144cc4e1f438b46431fd44 jdk8u202-b01 e8555da505ce7b81d620ea389c021313015f2715 jdk8u202-b02 e9280b15cfa8da6be9c42a9cce793242db4e197a jdk8u202-b03
--- a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Wed Dec 12 00:29:15 2018 -0800 +++ b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Fri Dec 14 14:05:19 2018 +0000 @@ -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:29:15 2018 -0800 +++ b/src/jdk/nashorn/internal/runtime/resources/parser.js Fri Dec 14 14:05:19 2018 +0000 @@ -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:29:15 2018 -0800 +++ b/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED Fri Dec 14 14:05:19 2018 +0000 @@ -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]