Merge master jdk-11.0.21+5 into openj9-staging

Conflicts: src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c Signed-off-by: Jason Feng <fengj@ca.ibm.com>
ibmruntimes · Aug 31, 2023 · 1dfb61b · 1dfb61b
2 parents 07e588c + 66fd3f5
commit 1dfb61b
Show file tree

Hide file tree

Showing 307 changed files with 5,987 additions and 2,836 deletions.
diff --git a/make/data/publicsuffixlist/VERSION b/make/data/publicsuffixlist/VERSION
@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/3c213aab32b3c014f171b1673d4ce9b5cd72bf1c/public_suffix_list.dat
-Date: 2021-11-27
+Github: https://raw.githubusercontent.com/publicsuffix/list/88467c960d6cdad2ca1623e892e5e17506bc269f/public_suffix_list.dat
+Date: 2023-04-14