Mercurial > hg > icedtea8-forest > nashorn
changeset 2482:3cb2fe2b1b7d icedtea-3.11.0 icedtea-3.12.0pre00
Merge jdk8u201-ga
author | andrew |
---|---|
date | Fri, 15 Feb 2019 06:44:23 +0000 |
parents | 3aa1896554b2 (current diff) bf5c40b0e9d8 (diff) |
children | cbc51619619c |
files | .hgtags |
diffstat | 5 files changed, 37 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jan 24 19:13:09 2019 +0000 +++ b/.hgtags Fri Feb 15 06:44:23 2019 +0000 @@ -1002,6 +1002,7 @@ 568538a9f1d8409f99013b07599f2c9845e28dd6 icedtea-3.10.0pre01 3824009355133053ce6c714fff39d2e12dc67cde jdk8u181-b13 4706dc5f752c0e364413e62f19f905a543d602be jdk8u191-b01 +9bae2c31c00bb6081026f7cb61aa50c726239a7a jdk8u201-b00 9bae2c31c00bb6081026f7cb61aa50c726239a7a jdk8u191-b02 1d23567f6ea387f9e047dd0d81f303b6371a27fb jdk8u191-b03 c374c805e6fb531f05ffd5070a148633c6f0626a jdk8u191-b04 @@ -1016,6 +1017,8 @@ 6cf21321f3674c4806cd2c911255f976f024db0d icedtea-3.10.0 6cf21321f3674c4806cd2c911255f976f024db0d icedtea-3.11.0pre00 287a6c783833005c9db86b7a7dfc85b52bfc36e1 icedtea-3.11.0pre01 +5a2c3b3dd9199561a1d4ba4a4b3bdfd7c6f69736 jdk8u191-b12 +a53a027482b082dbecbdae9bb469fcd957d73900 jdk8u191-b26 5b549167a92971d6793079c702fa2fd79a987cbc jdk8u182-b00 a57083d7fe9ac674c0841db6849140424bb16eef jdk8u192-b00 bc4618963547efc17931174f57bea387f89cd5e9 jdk8u192-b01 @@ -1031,3 +1034,24 @@ aa385e2ce23240f1466dbfcda5fd96ad325b109d jdk8u192-b25 9d6b5362a75ddef6ed30fe9892e95d7cfdff0ed8 jdk8u192-b11 88ceae600dc83c6adc7cf6a062eb623c4e587163 icedtea-3.11.0pre02 +854c8339d414bc20aa3c7603ad273aef5d668cde jdk8u192-b12 +6aeb5e07e2bb8f64ee1d8f0651a2723f3a49e834 jdk8u192-b26 +6c92477c026db1888e99c644e071d95609d9152d jdk8u181-b31 +81cd7926a046696e2e88e497d0299a97cffbcdf3 jdk8u181-b32 +bfdef7c905401b4f511ad087ba842853c00290a7 jdk8u181-b33 +7a321d516a54441bb94f1b1ab392e3902463aa72 jdk8u181-b34 +49f6984c82a5388cd83ed7f6d7f46c1cc77d763b jdk8u181-b35 +5d35a3a61a5b43429de380281e89cb7d9187497d jdk8u181-b36 +9a5ee25a4770c8990a5d2a194bf3f73726db978c jdk8u181-b37 +9be9b86d06c6934952df223903157a1269838c79 jdk8u201-b01 +43c64cf865d466241033959c5fbcc955cadc7766 jdk8u201-b02 +6bd999d631dd6057507362c44ce1b72f4581e5e4 jdk8u201-b03 +e81bdfaa81e08b542e3027e1fd5aa62ba029ed25 jdk8u201-b04 +95bf544c9cb654903f3c0ad00cf8dafab14a8091 jdk8u201-b74 +b27416532dba15d5e1968b73b0187a3599dd93a8 jdk8u201-b05 +112dfb97c1e4a0e7a35783dd446ace92af5e8c7f jdk8u201-b75 +9e720dd55a3aa57990fba8245b7e2a57aacc4aa9 jdk8u201-b06 +a430c68aabf0ede2fb9be32c710401523a6ddeac jdk8u201-b76 +8bf098c9d21b1b407a4655bdf683b83474a211b4 jdk8u201-b07 +38568172fbddb5177ff805ec1634da54c8ec2daa jdk8u201-b77 +03dc179691c8b481cf97869cdb65047515ec5b11 jdk8u201-b08
--- a/THIRD_PARTY_README Thu Jan 24 19:13:09 2019 +0000 +++ b/THIRD_PARTY_README Fri Feb 15 06:44:23 2019 +0000 @@ -1668,13 +1668,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to Little CMS 2.7, which may be +%% This notice is provided with respect to Little CMS 2.9, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- Little CMS -Copyright (c) 1998-2015 Marti Maria Saguer +Copyright (c) 1998-2011 Marti Maria Saguer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal
--- a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Thu Jan 24 19:13:09 2019 +0000 +++ b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js Fri Feb 15 06:44:23 2019 +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 Thu Jan 24 19:13:09 2019 +0000 +++ b/src/jdk/nashorn/internal/runtime/resources/parser.js Fri Feb 15 06:44:23 2019 +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 Thu Jan 24 19:13:09 2019 +0000 +++ b/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED Fri Feb 15 06:44:23 2019 +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]