changeset 2149:f42bdc74d2f5 icedtea-3.15.0 icedtea-3.16.0pre00

Merge jdk8u242-ga
author andrew
date Mon, 20 Jan 2020 01:16:55 +0000
parents 0bc44ba1ea0a (current diff) bf05a1187b78 (diff)
children 7b898b0a5bfb
files .hgtags
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 24 20:24:02 2019 +0000
+++ b/.hgtags	Mon Jan 20 01:16:55 2020 +0000
@@ -1081,3 +1081,12 @@
 9f2145980ba0874d0cfc6d66ad73529accbe8877 icedtea-3.14.0
 9f2145980ba0874d0cfc6d66ad73529accbe8877 icedtea-3.15.0pre00
 b046272d2577d2fbe50bce617cd9d821acc8fc32 icedtea-3.15.0pre01
+6e9f5f2c620ae1a481aa8198d0507c3857bc6d42 jdk8u242-b01
+91cff4cef2095bbc8af71dec6357d6eb5524e0ce jdk8u242-b02
+616095b698d1c1c9a8c8a3517735be30be443207 jdk8u242-b03
+2199192fb5ecf001bfd3f3ad2fd5ae09ef7e3073 jdk8u242-b04
+81838c6f30bc08546c3cc9941583da81ed6dadb1 jdk8u242-b05
+77787fb589bb938de5cdf1462dee166cd6cd2722 jdk8u242-b06
+8bddae4d0a3d727b1f254ec8932fb2e505fd01de jdk8u242-b07
+eac8e0f4e575f35d0266340575d79f1102ef0502 jdk8u242-b08
+eac8e0f4e575f35d0266340575d79f1102ef0502 jdk8u242-ga
--- a/THIRD_PARTY_README	Tue Dec 24 20:24:02 2019 +0000
+++ b/THIRD_PARTY_README	Mon Jan 20 01:16:55 2020 +0000
@@ -1334,11 +1334,13 @@
 
 --------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Joni v1.1.9, which may be 
+%% This notice is provided with respect to Joni v2.1.16, which may be
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
+Copyright (c) 2017 JRuby Team
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights