changeset 2478:90c0d4abb1c3 jdk8u201-b09-aarch32-190124

Merge
author snazarki
date Thu, 24 Jan 2019 16:10:26 +0300
parents 910639f7d481 (current diff) bf5c40b0e9d8 (diff)
children 0bf48b07d42f
files .hgtags
diffstat 5 files changed, 37 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 25 14:53:52 2018 +0300
+++ b/.hgtags	Thu Jan 24 16:10:26 2019 +0300
@@ -971,6 +971,7 @@
 8d17ecb5f78af4377a0259725a7946af25387457 jdk8u181-b13-aarch32-180802
 3824009355133053ce6c714fff39d2e12dc67cde jdk8u181-b13
 4706dc5f752c0e364413e62f19f905a543d602be jdk8u191-b01
+9bae2c31c00bb6081026f7cb61aa50c726239a7a jdk8u201-b00
 9bae2c31c00bb6081026f7cb61aa50c726239a7a jdk8u191-b02
 1d23567f6ea387f9e047dd0d81f303b6371a27fb jdk8u191-b03
 c374c805e6fb531f05ffd5070a148633c6f0626a jdk8u191-b04
@@ -983,6 +984,8 @@
 3388cb0fad9c8654cd6499835cbc190c8dbf2441 jdk8u191-b25
 e6205ecef830a71d73a14d1f18765cf4c3ac7773 jdk8u191-b11
 d79e8e9fbe6366506ead7c8662bca11afb8ea089 jdk8u191-b12-aarch32-181022
+5a2c3b3dd9199561a1d4ba4a4b3bdfd7c6f69736 jdk8u191-b12
+a53a027482b082dbecbdae9bb469fcd957d73900 jdk8u191-b26
 5b549167a92971d6793079c702fa2fd79a987cbc jdk8u182-b00
 a57083d7fe9ac674c0841db6849140424bb16eef jdk8u192-b00
 bc4618963547efc17931174f57bea387f89cd5e9 jdk8u192-b01
@@ -998,3 +1001,24 @@
 aa385e2ce23240f1466dbfcda5fd96ad325b109d jdk8u192-b25
 9d6b5362a75ddef6ed30fe9892e95d7cfdff0ed8 jdk8u192-b11
 5ab84129c55484bf3f587dcfa980dc6c64fd2373 jdk8u192-b12-aarch32-181022
+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 Oct 25 14:53:52 2018 +0300
+++ b/THIRD_PARTY_README	Thu Jan 24 16:10:26 2019 +0300
@@ -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 Oct 25 14:53:52 2018 +0300
+++ b/src/jdk/nashorn/internal/runtime/resources/mozilla_compat.js	Thu Jan 24 16:10:26 2019 +0300
@@ -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 Oct 25 14:53:52 2018 +0300
+++ b/src/jdk/nashorn/internal/runtime/resources/parser.js	Thu Jan 24 16:10:26 2019 +0300
@@ -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 Oct 25 14:53:52 2018 +0300
+++ b/test/script/trusted/classfilter_mozilla_compat.js.EXPECTED	Thu Jan 24 16:10:26 2019 +0300
@@ -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]