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
commit0f2751a19081b9352e1fb4a7275501fb691c09f1 (patch)
tree892cc91a9faafbd7d2f654badccdf75734404b7c
parente3bd03fd7a1031f6d7d900d583ac812967f7b8ff (diff)
parenta293281ba59909dc79c4dbfcad0d4a49edf785a2 (diff)
downloadjdk8u_jaxws-master.tar.gz
Merge tag jb8u242-b1644.3HEADmastermain
Change-Id: Ia293281ba59909dc79c4dbfcad0d4a49edf785a2
-rw-r--r--.hgtags9
-rw-r--r--THIRD_PARTY_README4
2 files changed, 12 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index a62d7262..39104616 100644
--- a/.hgtags
+++ b/.hgtags
@@ -1017,3 +1017,12 @@ fb3b24b266a254727e88edaa3a7211a2de6c74db jdk8u232-b07
65b391f0ed666750478e3fc887c6a6c383190d30 jdk8u232-b08
5f799cd7fe51a1c0fab3c079f59b368853ba02c4 jdk8u232-b09
5f799cd7fe51a1c0fab3c079f59b368853ba02c4 jdk8u232-ga
+3a911ec83c7e3786a95e3778dc459926b1c9775e jdk8u242-b01
+016be7bdaa27e14de8e40db8c67d0ab3997d5dc7 jdk8u242-b02
+6f53efc6747b8be967b6919ce83426924ae6b79e jdk8u242-b03
+b1722cc8c8d85ad8baac1469831a02b5c85f6c7a jdk8u242-b04
+c00877a0e915474c530fe45b68d8af8cbb245abf jdk8u242-b05
+a82b6ab00878ea389c4e03cbab0c01e7b2ffc257 jdk8u242-b06
+888c7a41a3ece3f502aa12b17fbd4625bc217c0f jdk8u242-b07
+b933b8903615c12824dc12ae493dc213e6f07c43 jdk8u242-b08
+b933b8903615c12824dc12ae493dc213e6f07c43 jdk8u242-ga
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index 7dc54a05..643ea79c 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