aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Dahlstrom <dahlstrom@google.com>2020-02-12 11:00:00 -0800
committerDana Dahlstrom <dahlstrom@google.com>2020-02-12 11:00:00 -0800
commit1699db6728501d636baa80e7bcba9cdbaad3ce4d (patch)
tree0aef555263ccd0b70f7d6cf5ecb1d1dc0d306ac0
parent9518ca8b23c78bea9d58e3061b7cba269eb7349b (diff)
parent80167d596b75a0e77ab21b443172934933d6c2df (diff)
downloadjdk8u-master.tar.gz
Merge tag jb8u242-b1644.3HEADmastermain
Change-Id: I80167d596b75a0e77ab21b443172934933d6c2df
-rw-r--r--.hgtags9
-rw-r--r--THIRD_PARTY_README4
2 files changed, 12 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 77402a5..940c54b 100644
--- a/.hgtags
+++ b/.hgtags
@@ -986,3 +986,12 @@ aa1559aa1f70d79e8bd4f3de9ab9a48fe1c0cc78 jdk8u232-b06
7aea873d47e1d93c7ef4902e758417e5afc19d9c jdk8u232-b08
6b9f309807a227d32bfcad2ab36cdbccd71d38ca jdk8u232-b09
6b9f309807a227d32bfcad2ab36cdbccd71d38ca jdk8u232-ga
+34aa7bcd731f29c1a37aad70a5f07272a3fa9ca7 jdk8u242-b01
+d2079934980013fdd8e63e31897011edae1a1188 jdk8u242-b02
+be3a6b2c79821f056a9ca1efde037555d829ccb8 jdk8u242-b03
+813d61736302c853dd0ef1b1e92b8fd0ca0af123 jdk8u242-b04
+bb4532c15611d35d3136eeb287049da79ce01ebb jdk8u242-b05
+72443ad60b1e685bd50e7ec8f21adf66786863d1 jdk8u242-b06
+8ca5f59e3042b7353b64c131be6bb970ba489ce9 jdk8u242-b07
+5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-b08
+5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-ga
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index 7dc54a0..643ea79 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1334,11 +1334,13 @@ SUCH DAMAGE.
--------------------------------------------------------------------------------
-%% 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