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
commitd9445780e8c2cfa3317e769f988d5da0c27a63ef (patch)
treea0bc2789021a8ba89b70f53fa1314d63ca9f8289
parente5890d2b9d648a1f93e46d4a037b5ede75224f4e (diff)
parentcd914a1c1383d797172faab9fc1ef399dd7a0dd2 (diff)
downloadjdk8u_corba-d9445780e8c2cfa3317e769f988d5da0c27a63ef.tar.gz
Merge tag jb8u242-b1644.3HEADmastermain
Change-Id: Icd914a1c1383d797172faab9fc1ef399dd7a0dd2
-rw-r--r--.hgtags9
-rw-r--r--THIRD_PARTY_README4
2 files changed, 12 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 5172685..1bd2492 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1059,3 +1059,12 @@ af5f5e2e07bc12472ffb52951120e14e19690b1a jdk8u232-b07
def9640e5d8213f650c128330161d9cdcd04d96b jdk8u232-b08
3cdc7d41905a2808bb01c3503e119073e9df0898 jdk8u232-b09
3cdc7d41905a2808bb01c3503e119073e9df0898 jdk8u232-ga
+d4d4f7f07a863fd30db8911421ef45db4a6ad5dd jdk8u242-b01
+b3fbd77f16f6744939621dd68c18cb310f9a6e8d jdk8u242-b02
+89f67ddac3c9a8307156a7a1963d184ecd97efe0 jdk8u242-b03
+1835a96a04a6cf83449507245f5c4b12395d0cf5 jdk8u242-b04
+69e526db7430472a95cb9c43d928a8eb00faaf27 jdk8u242-b05
+751146fda0429aeb6501620cdcfa021d469613f1 jdk8u242-b06
+72d4f7e239eec808290ee6e1ab99dfab88d66150 jdk8u242-b07
+bdd855313cfed15bb2d6bd567c0487313752bcb2 jdk8u242-b08
+bdd855313cfed15bb2d6bd567c0487313752bcb2 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