changeset 3631:74e32084dce9

Merge
author asaha
date Fri, 22 Dec 2017 13:47:42 -0800
parents 47a91ecb0b87 034738d4f1d2
children cd66dcc99a6a
files .hgtags
diffstat 3 files changed, 105 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Dec 04 10:33:18 2017 -0500
+++ b/.hgtags	Fri Dec 22 13:47:42 2017 -0800
@@ -668,6 +668,8 @@
 6116c6644be0c85556931aaeb9b4f2dbc9c79157 jdk8u112-b15
 ee37eafc48cb6fb20cb6c1e31cfecfe1ccc800da jdk8u112-b16
 de1c3df992adb0c704005583210d1ed6dac758cd jdk8u112-b31
+c94fd1b737d005962ba62fa03106de791692f39c jdk8u112-b32
+721ea56edf4196b37a081ac47206202d7560e16c jdk8u112-b33
 5710d574a99aeff3600c49a4aed34fa1b373f7b8 jdk8u121-b00
 ab5d32d8cf5f6d81482692f801385a869b2d83c1 jdk8u121-b01
 e260d46661d2da3ede78aae434d5420acce99950 jdk8u121-b02
@@ -682,6 +684,12 @@
 b634abfcd98fb8b201da9208e398ea17cabd2b32 jdk8u121-b11
 7fc347da372c8c4e5530a7fa32084b5dbc4ee8b6 jdk8u121-b12
 f634736433d9fc1cffbdc55611f97ecb2cd44059 jdk8u121-b13
+1dc3121986c615c2ac1f5e7d6705b197c5dfcae6 jdk8u121-b31
+970edd6f01b76e916cf223fbc53dcef085a0255b jdk8u121-b32
+edc3e462837bcc5916a2aace14e6b137ba88d4b6 jdk8u121-b33
+ae7a4fec2fd96e417285536967aa8eff6442df23 jdk8u121-b34
+8bcb0ed6a82367e0a40c9cda20720b34441f7846 jdk8u121-b35
+176bae232abb77c08c4dcafba5a44e4dac941127 jdk8u121-b36
 8b331e7199f74a2dea8a8a866f0d7f1977f146ee jdk8u131-b00
 0d04068f82fe680c65619e08ef012ead7483873b jdk8u131-b01
 452448c6347af8f7bd827dd4632ac06c991a15b8 jdk8u131-b02
@@ -694,6 +702,10 @@
 2f2c4931d13c44bb6a0f808809e723de0677e302 jdk8u131-b09
 676a07884de49a7c60379da8ac892fe1403de6b6 jdk8u131-b10
 5162417b51bdf68b95696198181f2e662a14ff8a jdk8u131-b11
+12f40d1f41c2cea8b61d046796a753000e61196f jdk8u131-b31
+508e7f6446deede595bbdbdc6d6cf9fc1ae8e728 jdk8u131-b32
+df2b65224ab78a312559ae3054aeb3ef73abaf9e jdk8u131-b33
+08a21473de54fd89fd53a01351cad954f60d2652 jdk8u131-b34
 1175fac90fdbbd864f7b1f306397644d26eb9781 jdk8u141-b00
 bb163efa3276e129c69bad28299a6283b869caa3 jdk8u141-b01
 5864e3781953daa69efd54b329a358a568229268 jdk8u141-b02
@@ -712,6 +724,14 @@
 027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15
 4c355f7002c36bb626b42d5c1d42ea91d77ba5d6 jdk8u144-b00
 816907853a15d9b22a87032d07327a400f8568b3 jdk8u144-b01
+716e712f0db45c8231208bc70ab4d2a8a40c4d3a jdk8u141-b31
+09c2459991619ef7061ad2bc66373ed29f500acf jdk8u141-b32
+4c355f7002c36bb626b42d5c1d42ea91d77ba5d6 jdk8u144-b00
+816907853a15d9b22a87032d07327a400f8568b3 jdk8u144-b01
+e678eb754806df4be677ee27fe235968124faa6a jdk8u144-b31
+b648127ee8c6b24376a95080eb0d2676007844d0 jdk8u144-b32
+ab9162feb67c00f5074bbaf3882d171b0cf16dad jdk8u144-b33
+e8b3bd888e5219ea7ed92cf160598b9ea9215916 jdk8u144-b34
 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
 f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01
 732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02
@@ -752,8 +772,77 @@
 752a7260bb1977979243aa8dd9a588787237662e jdk8u152-b14
 8c2463d627e3cf513522ba32bf71624c880beb91 jdk8u152-b15
 97dfb267d417415aca378f62b97dbf7a12a93f8a jdk8u152-b16
+4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
+f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01
+732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02
+a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03
+d0a51eb7da2995e864af5dc4d010aef0cb3f9e38 jdk8u151-b04
+e0ed0609963aca47e766901d7ec57ab97b649567 jdk8u151-b05
+ff824edbfa4dc81b6f2b5c33e4027806fd149304 jdk8u151-b06
+9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00
+85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01
+2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02
+a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03
+a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+18bfe5da1f56c6932cce6378f617904db68bedcd jdk8u122-b03
+5ce29dae0e3e11bbecbc2173479ccf0a06b7d556 jdk8u122-b04
+9229942f9ee2ad7c5b8d57cddcb9011aac6bac23 jdk8u132-b00
+03e31cfcd499360c2db8eeccacc77ee040e71bac jdk8u152-b00
+f47b61665c6fefb5eba2504d5e312004d59f0483 jdk8u152-b01
+a283fc8f44acc956fbc4192d546216c4638e7146 jdk8u152-b02
+2783ff53e49dec0e7939b54aeb302605725e1017 jdk8u152-b03
+71e344b8e2c237dd7ef7c5f4276030e2880a6e07 jdk8u152-b04
+38bb14529d829cc290439a712b9821cd0e272f7e jdk8u152-b05
+243671be7d4e0a4f71c0f88add12695ac86295cb jdk8u152-b06
+a2cc6d348025da4b72c7b18edcc5fc9e046803da jdk8u152-b07
+19eec1de09c1fef1392593284eb9d2c5becd6663 jdk8u152-b08
+ca6375d1a8b2ba3c086746a2bca65015a1a12146 jdk8u152-b09
+4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
+a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03
+9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00
+85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01
+2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02
+a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03
+a5da608d17bdc073fd3a4f2e1d4fe7d526567d09 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+18bfe5da1f56c6932cce6378f617904db68bedcd jdk8u122-b03
+5ce29dae0e3e11bbecbc2173479ccf0a06b7d556 jdk8u122-b04
+9229942f9ee2ad7c5b8d57cddcb9011aac6bac23 jdk8u132-b00
+03e31cfcd499360c2db8eeccacc77ee040e71bac jdk8u152-b00
+f47b61665c6fefb5eba2504d5e312004d59f0483 jdk8u152-b01
+a283fc8f44acc956fbc4192d546216c4638e7146 jdk8u152-b02
+2783ff53e49dec0e7939b54aeb302605725e1017 jdk8u152-b03
+71e344b8e2c237dd7ef7c5f4276030e2880a6e07 jdk8u152-b04
+38bb14529d829cc290439a712b9821cd0e272f7e jdk8u152-b05
+243671be7d4e0a4f71c0f88add12695ac86295cb jdk8u152-b06
+4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
+af48981bdd47e86656dfdc6b675fbd5caeabd843 jdk8u161-b00
+63426c18e9c269af515533122beca9707cc18e7b jdk8u161-b01
+c18e76a704169bfdaeb498f6cb46c99251793e19 jdk8u161-b02
+a9ed1dba7dd19b8886b6fd0e6fde3e1ef1a78789 jdk8u161-b03
+17507635a86dd95b0a76a59e8ff80d92510844df jdk8u161-b04
+102179740625431f80fb33c078b344c771528daa jdk8u161-b05
+9d6ebf514475c90019ed352bf207ca28e3f294af jdk8u161-b06
+cb6f7d27f97c64fe4076e321a6e49cf2dc40f939 jdk8u161-b07
+36cd8cee9f0cf803923fb310d9fe4362787f750e jdk8u161-b08
+96cdc8b62d5f7263a0c42bc21bf85a205cb75ebb jdk8u161-b09
+cfc40ab214f9174edbb08925a39efd081d6e4b34 jdk8u161-b10
+44fd88d9e5ae96d54e6d993dae14d6f2ab53b5c1 jdk8u161-b11
+cc28ef580ec551df5338083eb9365b923bceedf4 jdk8u161-b12
 6d21463aeffd526c9f7f5ce9a70ae7664235e125 jdk8u162-b00
 9986bf97a48d3f2f16b90f2fb72e52b398202bd0 jdk8u162-b01
 127419d98e7e30f666f4f7e595c53915dec01beb jdk8u162-b02
 9c3d2bd8e3dff93bb572522e972de9cce95f3024 jdk8u162-b03
+a53904e332953e428901e9330d2d4418a3f9c249 jdk8u162-b04
+b7139bbfb407f9973a7563f9bd2e1e446b330ee8 jdk8u162-b05
+91a05c239f639a72f4b56e64b58585538a3773b7 jdk8u162-b06
+fec3ee6be9177021ee1d2675a5ee3f603e1bbcae jdk8u162-b07
+30b1ef9951c21562a45c75d9a9a964d601c08b02 jdk8u162-b08
+e856f66901b181604c72bb8fcc7b9e746ee4593a jdk8u162-b09
+29bd40939ca9433f1ab9dccc00d809c309427cce jdk8u162-b10
+f112f1acb17609cdd4151abf21f069d2bae24e99 jdk8u162-b11
+90286557058376d6c01260e3c192f76111f78b36 jdk8u162-b12
 53092d863cb60907700ac5fd7d12fc28ce871b2a jdk8u172-b00
--- a/THIRD_PARTY_README	Mon Dec 04 10:33:18 2017 -0500
+++ b/THIRD_PARTY_README	Fri Dec 22 13:47:42 2017 -0800
@@ -7,7 +7,7 @@
 
 --- begin of LICENSE ---
 
-Copyright (c) 2000-2011 France Télécom
+Copyright (c) 2000-2011 France T??l??com
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -849,7 +849,7 @@
 --- begin of LICENSE ---
 
 Copyright notice
-Copyright © 2011 Ecma International
+Copyright ?? 2011 Ecma International
 Ecma International
 Rue du Rhone 114
 CH-1204 Geneva
@@ -916,7 +916,7 @@
 
 --- begin of LICENSE ---
 
-Copyright © 2001,2003 Keith Packard
+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
@@ -2212,16 +2212,16 @@
 Unicode Terms of Use
 
 For the general privacy policy governing access to this site, see the Unicode
-Privacy Policy. For trademark usage, see the Unicode® Consortium Name and
+Privacy Policy. For trademark usage, see the Unicode?? Consortium Name and
 Trademark Usage Policy.
 
 A. Unicode Copyright.
-   1. Copyright © 1991-2013 Unicode, Inc. All rights reserved.
+   1. Copyright ?? 1991-2013 Unicode, Inc. All rights reserved.
 
    2. Certain documents and files on this website contain a legend indicating
       that "Modification is permitted." Any person is hereby authorized,
       without fee, to modify such documents and files to create derivative
-      works conforming to the Unicode® Standard, subject to Terms and
+      works conforming to the Unicode?? Standard, subject to Terms and
       Conditions herein.
 
     3. Any person is hereby authorized, without fee, to view, use, reproduce,
@@ -2287,14 +2287,14 @@
 
 E.Trademarks & Logos.
    1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode,
-      Inc.  “The Unicode Consortium” and “Unicode, Inc.” are trade names of
+      Inc.  ???The Unicode Consortium??? and ???Unicode, Inc.??? are trade names of
       Unicode, Inc.  Use of the information and materials found on this
-      website indicates your acknowledgement of Unicode, Inc.’s exclusive
+      website indicates your acknowledgement of Unicode, Inc.???s exclusive
       worldwide rights in the Unicode Word Mark, the Unicode Logo, and the
       Unicode trade names.
 
-   2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark
-      Policy”) are incorporated herein by reference and you agree to abide by
+   2. The Unicode Consortium Name and Trademark Usage Policy (???Trademark
+      Policy???) are incorporated herein by reference and you agree to abide by
       the provisions of the Trademark Policy, which may be changed from time
       to time in the sole discretion of Unicode, Inc.
 
@@ -2317,12 +2317,12 @@
 
    2. Modification by Unicode.  Unicode shall have the right to modify this
       Agreement at any time by posting it to this site. The user may not
-      assign any part of this Agreement without Unicode’s prior written
+      assign any part of this Agreement without Unicode???s prior written
       consent.
 
    3. Taxes. The user agrees to pay any taxes arising from access to this
       website or use of the information herein, except for those based on
-      Unicode’s net income.
+      Unicode???s net income.
 
    4. Severability.  If any provision of this Agreement is declared invalid or
       unenforceable, the remaining provisions of this Agreement shall remain
@@ -2351,7 +2351,7 @@
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the
+Copyright ?? 1991-2012 Unicode, Inc. All rights reserved. Distributed under the
 Terms of Use in http://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Mon Dec 04 10:33:18 2017 -0500
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Fri Dec 22 13:47:42 2017 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2017, 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
@@ -639,10 +639,10 @@
 compiler.err.repeated.modifier=\u4FEE\u9970\u7B26\u91CD\u590D
 
 # 0: symbol, 1: set of modifier, 2: symbol
-compiler.err.report.access={0}\u53EF\u4EE5\u5728{2}\u4E2D\u8BBF\u95EE{1}
+compiler.err.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236
 
 # 0: symbol, 1: set of modifier, 2: symbol
-compiler.misc.report.access={0}\u53EF\u4EE5\u5728{2}\u4E2D\u8BBF\u95EE{1}
+compiler.misc.report.access={0} \u5728 {2} \u4E2D\u662F {1} \u8BBF\u95EE\u63A7\u5236
 
 compiler.err.ret.outside.meth=\u8FD4\u56DE\u5916\u90E8\u65B9\u6CD5