Merge

.hgtags

@@ -737,5 +737,37 @@ de3c63a8b2e52d47554c999a65dbcec7f6d9c1be jdk8u131-b10
 2b88cb53e31fb637d7c37cc3414bb3eb3e9d1f0d jdk8u131-b11
 7056e474d6e3b7b3bac76bc35f8c4c321bf9abe9 jdk8u141-b00
 0f825574a7c8742494810d1f29193bfc3f1d370c jdk8u141-b01
+66d2dbe82668e425317ec0c421f5384399b220c9 jdk8u141-b02
+7316b3f30654a029024aab9f36ab814b44138e9d jdk8u141-b03
+68139c8638dc8038d3b5a3fcb41e4e314a95df1f jdk8u141-b04
+df048aacfa198bbfba66dae289dd0287627f5576 jdk8u141-b05
+608c9620655e56d96f741a68c214406740e48909 jdk8u141-b06
+3c2d6ed6d9ed7931eebe0a2a6e8ef7946409e7b7 jdk8u141-b07
+a88f33e068d46eb1d6206da5b4d87102b0107a43 jdk8u141-b08
+9947765c3f11e667a61abce6109d35d6d7f8bd6e jdk8u141-b09
+2dcbb77fb6d5ce03e3555f9d972b189b49a68e28 jdk8u141-b10
+f4091c5aed03f482ce64e406850b3ec6a7ed71ef jdk8u141-b11
+87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12
+ad04b672d6f92dcfbe9e72de041bd05d26a31fde jdk8u141-b13
+2232cdb74345eeeeffc13d4f6b1cbcae068c5998 jdk8u141-b14
+2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00
+4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01
+ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02
+58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00
+a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01
+8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02
+117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03
+117a593d021502529821afbd7e0d695c170449f8 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+0000000000000000000000000000000000000000 jdk8u122-b03
+f8661a76fe475b1d7653493e407086830fde81f8 jdk8u122-b03
+7bd4195b17aa0a268eee4bc4b89f30ed3b096898 jdk8u122-b04
+f86d6064d7cfa022425c3df03d4335511ab33ecb jdk8u132-b00
+ea3d3c26102dcb82d9b140f729308395310dae7a jdk8u152-b00
+1819d008129b31df8c74b5d16e9daabc2bdcc10c jdk8u152-b01
+06f411ed0014d88050d9bd1e74c208a9fa3cfb6e jdk8u152-b02
+d36e9c6f195c5604626f7c836c17826960ca2a11 jdk8u152-b03
+4f94cc55256028ab54390abe212959c241b0670f jdk8u152-b04
+2917e61cfadab474625d19fb7775ccdec5584738 jdk8u152-b05
 2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00
 aed470d361fe9b3a6714e6c9942923c188dcc050 jdk8u161-b00

ASSEMBLY_EXCEPTION

 
 OPENJDK ASSEMBLY EXCEPTION
 
-The OpenJDK source code made available by Sun at openjdk.java.net and
-openjdk.dev.java.net ("OpenJDK Code") is distributed under the terms of the
-GNU General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
+The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
+openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
+General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
 only ("GPL2"), with the following clarification and special exception.
 
     Linking this OpenJDK Code statically or dynamically with other code
     is making a combined work based on this library.  Thus, the terms
     and conditions of GPL2 cover the whole combination.
 
-    As a special exception, Sun gives you permission to link this
-    OpenJDK Code with certain code licensed by Sun as indicated at
+    As a special exception, Oracle gives you permission to link this
+    OpenJDK Code with certain code licensed by Oracle as indicated at
     http://openjdk.java.net/legal/exception-modules-2007-05-08.html
     ("Designated Exception Modules") to produce an executable,
     regardless of the license terms of the Designated Exception Modules,
     and to copy and distribute the resulting executable under GPL2,
     provided that the Designated Exception Modules continue to be
-    governed by the licenses under which they were offered by Sun.
+    governed by the licenses under which they were offered by Oracle.
 
-As such, it allows licensees and sublicensees of Sun's GPL2 OpenJDK Code to
-build an executable that includes those portions of necessary code that Sun
-could not provide under GPL2 (or that Sun has provided under GPL2 with the
-Classpath exception).  If you modify or add to the OpenJDK code, that new
-GPL2 code may still be combined with Designated Exception Modules if the
-new code is made subject to this exception by its copyright holder.
+As such, it allows licensees and sublicensees of Oracle's GPL2 OpenJDK Code
+to build an executable that includes those portions of necessary code that
+Oracle could not provide under GPL2 (or that Oracle has provided under GPL2
+with the Classpath exception).  If you modify or add to the OpenJDK code,
+that new GPL2 code may still be combined with Designated Exception Modules
+if the new code is made subject to this exception by its copyright holder.