Merge tag jb8u212-b1586.4

Change-Id: I5190cfb569e64864978012a086ec4818d4eb4da3

5 files changed, 64 insertions, 36 deletions

diff --git a/.hgtags b/.hgtags
index 2f0d8e89..bfe80306 100644
--- a/.hgtags
+++ b/.hgtags
@@ -986,3 +986,54 @@ aa385e2ce23240f1466dbfcda5fd96ad325b109d jdk8u192-b25
 854c8339d414bc20aa3c7603ad273aef5d668cde jdk8u192-b12
 6aeb5e07e2bb8f64ee1d8f0651a2723f3a49e834 jdk8u192-b26
 b347bb8a4cab083701144cc4e1f438b46431fd44 jdk8u202-b01
+e8555da505ce7b81d620ea389c021313015f2715 jdk8u202-b02
+e9280b15cfa8da6be9c42a9cce793242db4e197a jdk8u202-b03
+eadc41e5d2a8f5cf41876b1ae9245d1c95c7f24a jdk8u202-b04
+05cd9eec8f9b5ae2011c586768c50ec0d20bb00b jdk8u202-b05
+b16b59c5f123fa516e71d5636e582ae6a935e974 jdk8u202-b06
+898989e3b02d0663a0a0386ce4f5397fe7867a79 jdk8u202-b07
+7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-b08
+7e3753cfb0766f2f404efad48758d6c0c6d493e9 jdk8u202-b25
+513bdfdab61ccae75ceb3df1d5e656d32e65e1dc jdk8u202-b26
+7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-ga
+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
+bf5c40b0e9d80c21a8aeecf73f0714b12a89f527 jdk8u201-b09
+cd4430c469bf768cbb68c6b3e9b99d061cb35e5b jdk8u201-b79
+5a876140bff867833dd33b7a610d9589803de894 jdk8u201-b25
+694869cbd8b05f17cbadb00b16da81c964f23547 jdk8u201-b26
+bf5c40b0e9d80c21a8aeecf73f0714b12a89f527 jdk8u201-ga
+b347bb8a4cab083701144cc4e1f438b46431fd44 jdk8u202-b01
+e8555da505ce7b81d620ea389c021313015f2715 jdk8u202-b02
+e9280b15cfa8da6be9c42a9cce793242db4e197a jdk8u202-b03
+eadc41e5d2a8f5cf41876b1ae9245d1c95c7f24a jdk8u202-b04
+05cd9eec8f9b5ae2011c586768c50ec0d20bb00b jdk8u202-b05
+b16b59c5f123fa516e71d5636e582ae6a935e974 jdk8u202-b06
+898989e3b02d0663a0a0386ce4f5397fe7867a79 jdk8u202-b07
+7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-b08
+7e3753cfb0766f2f404efad48758d6c0c6d493e9 jdk8u202-b25
+513bdfdab61ccae75ceb3df1d5e656d32e65e1dc jdk8u202-b26
+7aeae6eb62362bd676ed9f809d8fa1c12295a843 jdk8u202-ga
+8949d12e49e32711a0fb4079e2da7eb4f9ee426b jdk8u212-b00
+203712f71207bc1ed45ef9c3f4c11d367699e2d0 jdk8u212-b01
+8fa8a4821ec34b99c3dcfd5f6a67fba0813e7bbe jdk8u212-b02
+f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-b03
+32c18a79003ad846811955f7348ea73061e91c40 jdk8u212-b04
+f470f90fa4f757ea435ad48def6146f6a35bdee3 jdk8u212-ga
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index a1662fe0..22473560 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1096,33 +1096,6 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGE.
 --- end of LICENSE ---
 
-%% This notice is provided with respect to FontConfig 2.5, which may be 
-included with JRE 8, JDK 8, and OpenJDK 8 source distributions on
-Linux and Solaris.
-
---- begin of LICENSE ---
-
-Copyright ?? 2001,2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-the name of Keith Packard not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior permission.
-Keith Packard makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH
-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
---- end of LICENSE ---
-
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to freebXML Registry 3.0 & 3.1,
@@ -1668,13 +1641,13 @@ THE SOFTWARE.
 
 -------------------------------------------------------------------------------
 
-%% 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
diff --git a/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js
index 6c27e2a6..2acd1fe7 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 94d02aba..ac4d0524 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 9481e98e..66a5ca75 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]