8260245: Update ICU4C to version 68.2

8232379: Need to remove large icudt64l.zip binary file from source repository

Reviewed-by: jvos
Backport-of: 808b1078f762a923bd5e74298daffeb88ed108c2

build.gradle

@@ -346,6 +346,9 @@ defineProperty("javaBuildNumber", javaVersionInfo[1])
 
 defineProperty("libAVRepositoryURL", "https://libav.org/releases/")
 defineProperty("FFmpegRepositoryURL", "https://www.ffmpeg.org/releases/")
+defineProperty("icuRepositoryURL", "https://github.com/unicode-org/icu/releases/")
+
+defineProperty("icuVersion", "68.2")
 
 loadProperties("$projectDir/build.properties")
 
@@ -1801,6 +1804,21 @@ allprojects {
         }
     }
 
+    if (JFX_DEPS_URL == "" && IS_COMPILE_WEBKIT) {
+        def icuReleaseVersion = icuVersion.replaceAll('\\.', '-')
+        repositories {
+            ivy {
+                url icuRepositoryURL
+                metadataSources {
+                    artifact()
+                }
+                patternLayout {
+                    artifact "download/release-$icuReleaseVersion/[artifact].[ext]"
+                }
+            }
+        }
+    }
+
     // We want to configure all projects as java projects and use the same compile settings
     // etc, except for the root project which we just want to ignore (and for now media)
     if (project == rootProject) {
@@ -3819,6 +3837,8 @@ project(":web") {
     project.ext.moduleRuntime = true
     project.ext.moduleName = "javafx.web"
 
+    getConfigurations().create("icu");
+
     sourceSets {
         main
         shims
@@ -3831,6 +3851,9 @@ project(":web") {
     commonModuleSetup(project, [ 'base', 'graphics', 'controls', 'media', 'web' ])
 
     dependencies {
+        if (IS_COMPILE_WEBKIT) {
+            icu name: "icu4c-${icuVersion}-data-bin-l", ext: "zip"
+        }
     }
 
     compileJava.dependsOn updateCacheIfNeeded
@@ -3903,7 +3926,14 @@ project(":web") {
         File nativeBuildDir = new File("${webkitOutputDir}")
         nativeBuildDir.mkdirs()
 
-        def compileNativeTask = task("compileNative${t.capital}", dependsOn: [compileJava]) {
+        def getICUFile = task("copyICUFile", type: Copy) {
+            enabled = IS_COMPILE_WEBKIT
+
+            from configurations.icu.files
+            into "$webkitOutputDir/$webkitConfig/icu/data"
+        }
+
+        def compileNativeTask = task("compileNative${t.capital}", dependsOn: [compileJava, getICUFile]) {
             println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
             enabled =  (IS_COMPILE_WEBKIT)
 

modules/javafx.web/src/main/legal/icu_web.md

@@ -1,11 +1,11 @@
-## IBM International Components for Unicode (ICU4C) v64.2
+## IBM International Components for Unicode (ICU4C) v68.2
 
 ### ICU License
 ```
 
 COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
 
-Copyright © 1991-2019 Unicode, Inc. All rights reserved.
+Copyright © 1991-2020 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -289,9 +289,9 @@ property of their respective owners.
  #  Copyright (c) 2013 International Business Machines Corporation
  #  and others. All Rights Reserved.
  #
- # Project: http://code.google.com/p/lao-dictionary/
- # Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt
- # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt
+ # Project: https://github.com/veer66/lao-dictionary
+ # Dictionary: https://github.com/veer66/lao-dictionary/blob/master/Lao-Dictionary.txt
+ # License: https://github.com/veer66/lao-dictionary/blob/master/Lao-Dictionary-LICENSE.txt
  #              (copied below)
  #
  #  This file is derived from the above dictionary, with slight

modules/javafx.web/src/main/native/Source/ThirdParty/icu/CMakeLists.txt

@@ -67,8 +67,8 @@ set(ICU_COMMON_SOURCES
     source/common/brkiter.cpp
     source/common/bytesinkutil.cpp
     source/common/bytestream.cpp
-    source/common/bytestriebuilder.cpp
     source/common/bytestrie.cpp
+    source/common/bytestriebuilder.cpp
     source/common/bytestrieiterator.cpp
     source/common/caniter.cpp
     source/common/characterproperties.cpp
@@ -89,15 +89,20 @@ set(ICU_COMMON_SOURCES
     source/common/icuplug.cpp
     source/common/loadednormalizer2impl.cpp
     source/common/localebuilder.cpp
+    source/common/localematcher.cpp
+    source/common/localeprioritylist.cpp
     source/common/locavailable.cpp
     source/common/locbased.cpp
     source/common/locdispnames.cpp
+    source/common/locdistance.cpp
     source/common/locdspnm.cpp
     source/common/locid.cpp
     source/common/loclikely.cpp
+    source/common/loclikelysubtags.cpp
     source/common/locmap.cpp
     source/common/locresdata.cpp
     source/common/locutil.cpp
+    source/common/lsr.cpp
     source/common/messagepattern.cpp
     source/common/normalizer2.cpp
     source/common/normalizer2impl.cpp
@@ -109,18 +114,19 @@ set(ICU_COMMON_SOURCES
     source/common/propsvec.cpp
     source/common/punycode.cpp
     source/common/putil.cpp
-    source/common/rbbi_cache.cpp
     source/common/rbbi.cpp
+    source/common/rbbi_cache.cpp
     source/common/rbbidata.cpp
     source/common/rbbinode.cpp
     source/common/rbbirb.cpp
     source/common/rbbiscan.cpp
     source/common/rbbisetb.cpp
     source/common/rbbistbl.cpp
     source/common/rbbitblb.cpp
-    source/common/resbund_cnv.cpp
     source/common/resbund.cpp
+    source/common/resbund_cnv.cpp
     source/common/resource.cpp
+    source/common/restrace.cpp
     source/common/ruleiter.cpp
     source/common/schriter.cpp
     source/common/serv.cpp
@@ -137,8 +143,8 @@ set(ICU_COMMON_SOURCES
     source/common/stringtriebuilder.cpp
     source/common/uarrsort.cpp
     source/common/ubidi.cpp
-    source/common/ubidiln.cpp
     source/common/ubidi_props.cpp
+    source/common/ubidiln.cpp
     source/common/ubiditransform.cpp
     source/common/ubidiwrt.cpp
     source/common/ubrk.cpp
@@ -147,35 +153,35 @@ set(ICU_COMMON_SOURCES
     source/common/ucasemap_titlecase_brkiter.cpp
     source/common/ucat.cpp
     source/common/uchar.cpp
-    source/common/ucharstriebuilder.cpp
     source/common/ucharstrie.cpp
+    source/common/ucharstriebuilder.cpp
     source/common/ucharstrieiterator.cpp
     source/common/uchriter.cpp
     source/common/ucln_cmn.cpp
     source/common/ucmndata.cpp
+    source/common/ucnv.cpp
     source/common/ucnv2022.cpp
     source/common/ucnv_bld.cpp
-    source/common/ucnvbocu.cpp
     source/common/ucnv_cb.cpp
     source/common/ucnv_cnv.cpp
-    source/common/ucnv.cpp
     source/common/ucnv_ct.cpp
-    source/common/ucnvdisp.cpp
     source/common/ucnv_err.cpp
     source/common/ucnv_ext.cpp
-    source/common/ucnvhz.cpp
     source/common/ucnv_io.cpp
-    source/common/ucnvisci.cpp
-    source/common/ucnvlat1.cpp
     source/common/ucnv_lmb.cpp
-    source/common/ucnvmbcs.cpp
-    source/common/ucnvscsu.cpp
-    source/common/ucnvsel.cpp
     source/common/ucnv_set.cpp
     source/common/ucnv_u16.cpp
     source/common/ucnv_u32.cpp
     source/common/ucnv_u7.cpp
     source/common/ucnv_u8.cpp
+    source/common/ucnvbocu.cpp
+    source/common/ucnvdisp.cpp
+    source/common/ucnvhz.cpp
+    source/common/ucnvisci.cpp
+    source/common/ucnvlat1.cpp
+    source/common/ucnvmbcs.cpp
+    source/common/ucnvscsu.cpp
+    source/common/ucnvsel.cpp
     source/common/ucol_swp.cpp
     source/common/ucptrie.cpp
     source/common/ucurr.cpp
@@ -201,50 +207,50 @@ set(ICU_COMMON_SOURCES
     source/common/unifiedcache.cpp
     source/common/unifilt.cpp
     source/common/unifunct.cpp
-    source/common/uniset_closure.cpp
     source/common/uniset.cpp
+    source/common/uniset_closure.cpp
     source/common/uniset_props.cpp
     source/common/unisetspan.cpp
+    source/common/unistr.cpp
     source/common/unistr_case.cpp
     source/common/unistr_case_locale.cpp
     source/common/unistr_cnv.cpp
-    source/common/unistr.cpp
     source/common/unistr_props.cpp
     source/common/unistr_titlecase_brkiter.cpp
-    source/common/unormcmp.cpp
     source/common/unorm.cpp
+    source/common/unormcmp.cpp
     source/common/uobject.cpp
     source/common/uprops.cpp
-    source/common/uresbund.cpp
     source/common/ures_cnv.cpp
+    source/common/uresbund.cpp
     source/common/uresdata.cpp
     source/common/usc_impl.cpp
     source/common/uscript.cpp
     source/common/uscript_props.cpp
     source/common/uset.cpp
-    source/common/usetiter.cpp
     source/common/uset_props.cpp
+    source/common/usetiter.cpp
     source/common/ushape.cpp
     source/common/usprep.cpp
     source/common/ustack.cpp
+    source/common/ustr_cnv.cpp
+    source/common/ustr_titlecase_brkiter.cpp
+    source/common/ustr_wcs.cpp
     source/common/ustrcase.cpp
     source/common/ustrcase_locale.cpp
-    source/common/ustr_cnv.cpp
     source/common/ustrenum.cpp
     source/common/ustrfmt.cpp
     source/common/ustring.cpp
-    source/common/ustr_titlecase_brkiter.cpp
     source/common/ustrtrns.cpp
-    source/common/ustr_wcs.cpp
     source/common/utext.cpp
     source/common/utf_impl.cpp
     source/common/util.cpp
     source/common/util_props.cpp
     source/common/utrace.cpp
+    source/common/utrie.cpp
+    source/common/utrie2.cpp
     source/common/utrie2_builder.cpp
     source/common/utrie_swap.cpp
-    source/common/utrie2.cpp
-    source/common/utrie.cpp
     source/common/uts46.cpp
     source/common/utypes.cpp
     source/common/uvector.cpp
@@ -327,10 +333,10 @@ set(ICU_I18N_SOURCES
     source/i18n/double-conversion-bignum-dtoa.cpp
     source/i18n/double-conversion-bignum.cpp
     source/i18n/double-conversion-cached-powers.cpp
-    source/i18n/double-conversion-diy-fp.cpp
+    source/i18n/double-conversion-double-to-string.cpp
     source/i18n/double-conversion-fast-dtoa.cpp
+    source/i18n/double-conversion-string-to-double.cpp
     source/i18n/double-conversion-strtod.cpp
-    source/i18n/double-conversion.cpp
     source/i18n/dtfmtsym.cpp
     source/i18n/dtitvfmt.cpp
     source/i18n/dtitvinf.cpp
@@ -342,6 +348,7 @@ set(ICU_I18N_SOURCES
     source/i18n/fmtable.cpp
     source/i18n/fmtable_cnv.cpp
     source/i18n/format.cpp
+    source/i18n/formatted_string_builder.cpp
     source/i18n/formattedval_iterimpl.cpp
     source/i18n/formattedval_sbimpl.cpp
     source/i18n/formattedvalue.cpp
@@ -359,14 +366,14 @@ set(ICU_I18N_SOURCES
     source/i18n/listformatter.cpp
     source/i18n/measfmt.cpp
     source/i18n/measunit.cpp
+    source/i18n/measunit_extra.cpp
     source/i18n/measure.cpp
     source/i18n/msgfmt.cpp
     source/i18n/name2uni.cpp
     source/i18n/nfrs.cpp
     source/i18n/nfrule.cpp
     source/i18n/nfsubs.cpp
     source/i18n/nortrans.cpp
-    source/i18n/nounit.cpp
     source/i18n/nultrans.cpp
     source/i18n/number_affixutils.cpp
     source/i18n/number_asformat.cpp
@@ -391,7 +398,8 @@ set(ICU_I18N_SOURCES
     source/i18n/number_rounding.cpp
     source/i18n/number_scientific.cpp
     source/i18n/number_skeletons.cpp
-    source/i18n/number_stringbuilder.cpp
+    source/i18n/number_symbolswrapper.cpp
+    source/i18n/number_usageprefs.cpp
     source/i18n/number_utils.cpp
     source/i18n/numfmt.cpp
     source/i18n/numparse_affixes.cpp
@@ -401,14 +409,15 @@ set(ICU_I18N_SOURCES
     source/i18n/numparse_impl.cpp
     source/i18n/numparse_parsednumber.cpp
     source/i18n/numparse_scientific.cpp
-    source/i18n/numparse_stringsegment.cpp
     source/i18n/numparse_symbols.cpp
     source/i18n/numparse_validators.cpp
+    source/i18n/numrange_capi.cpp
     source/i18n/numrange_fluent.cpp
     source/i18n/numrange_impl.cpp
     source/i18n/numsys.cpp
     source/i18n/olsontz.cpp
     source/i18n/persncal.cpp
+    source/i18n/pluralranges.cpp
     source/i18n/plurfmt.cpp
     source/i18n/plurrule.cpp
     source/i18n/quant.cpp
@@ -441,6 +450,7 @@ set(ICU_I18N_SOURCES
     source/i18n/smpdtfst.cpp
     source/i18n/sortkey.cpp
     source/i18n/standardplural.cpp
+    source/i18n/string_segment.cpp
     source/i18n/strmatch.cpp
     source/i18n/strrepl.cpp
     source/i18n/stsearch.cpp
@@ -478,6 +488,10 @@ set(ICU_I18N_SOURCES
     source/i18n/umsg.cpp
     source/i18n/unesctrn.cpp
     source/i18n/uni2name.cpp
+    source/i18n/units_data.cpp
+    source/i18n/units_complexconverter.cpp
+    source/i18n/units_converter.cpp
+    source/i18n/units_router.cpp
     source/i18n/unum.cpp
     source/i18n/unumsys.cpp
     source/i18n/upluralrules.cpp
@@ -565,12 +579,10 @@ target_link_libraries(data_as_asm icuuc icui18n)
 ###### tools END ####
 
 ###### data BEGIN ####
-file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/icu/data")
-file(GLOB ICU_DATA_ZIP_FILE "java/data/icudt*l.zip")
+file(GLOB ICU_DATA_ZIP_FILE "${CMAKE_BINARY_DIR}/icu/data/icu4c-*.zip")
 
-get_filename_component(ICU_DATA_FILE_NAME ${ICU_DATA_ZIP_FILE} NAME)
 # Get just file name without extension
-string(REGEX REPLACE ".zip" "" ICU_DATA_FILE_NAME ${ICU_DATA_FILE_NAME})
+set(ICU_DATA_FILE_NAME "icudt68l")
 
 # Use jar instead of unzip, it will be helpful to get rid of cygwin dependency
 find_package(Java)

modules/javafx.web/src/main/native/Source/ThirdParty/icu/LICENSE

@@ -1,6 +1,6 @@
 COPYRIGHT AND PERMISSION NOTICE (ICU 58 and later)
 
-Copyright © 1991-2019 Unicode, Inc. All rights reserved.
+Copyright © 1991-2020 Unicode, Inc. All rights reserved.
 Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -284,9 +284,9 @@ property of their respective owners.
  #  Copyright (c) 2013 International Business Machines Corporation
  #  and others. All Rights Reserved.
  #
- # Project: http://code.google.com/p/lao-dictionary/
- # Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt
- # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt
+ # Project: https://github.com/veer66/lao-dictionary
+ # Dictionary: https://github.com/veer66/lao-dictionary/blob/master/Lao-Dictionary.txt
+ # License: https://github.com/veer66/lao-dictionary/blob/master/Lao-Dictionary-LICENSE.txt
  #              (copied below)
  #
  #  This file is derived from the above dictionary, with slight