ICU-22357 Rename gb18030.ucm to add -2022, follow-on to PR #2430

icu4c/source/data/mappings/convrtrs.txt

@@ -366,7 +366,7 @@ US-ASCII { MIME* IANA JAVA WINDOWS }
     ibm-367 { IBM* } IBM367 { IANA WINDOWS } # This is not truely ibm-367 because it's missing the fallbacks.
 
 # GB 18030 is partly algorithmic, using the MBCS converter
-gb18030 { IANA* }       ibm-1392 { IBM* } windows-54936 { WINDOWS* } GB18030 { MIME* }
+gb18030-2022            ibm-1392 { IBM* } windows-54936 { WINDOWS* } GB18030 { MIME* IANA* }
 
 # Table-based interchange codepages
 

icu4c/source/data/mappings/gb18030-2022.ucm

@@ -5,7 +5,7 @@
 
 # ICU codepage data for GB 18030-2022
 
-<code_set_name>               "gb18030"
+<code_set_name>               "gb18030-2022"
 <char_name_mask>              "AXXXX"
 <mb_cur_max>                  4
 <mb_cur_min>                  1

icu4c/source/data/mappings/ucmcore.mk

@@ -24,7 +24,7 @@ ibm-4909_P100-1999.ucm\
 ibm-5346_P100-1998.ucm ibm-5347_P100-1998.ucm ibm-5348_P100-1997.ucm\
 ibm-5349_P100-1998.ucm ibm-5350_P100-1998.ucm ibm-9447_P100-2002.ucm\
 ibm-5352_P100-1998.ucm ibm-9449_P100-2002.ucm ibm-5354_P100-1998.ucm\
-ibm-1383_P110-1999.ucm ibm-1386_P100-2001.ucm gb18030.ucm\
+ibm-1383_P110-1999.ucm ibm-1386_P100-2001.ucm gb18030-2022.ucm\
 ibm-1373_P100-2002.ucm\
 ibm-943_P15A-2003.ucm ibm-33722_P12A_P12A-2009_U2.ucm\
 ibm-970_P110_P110-2006_U2.ucm ibm-949_P11A-1999.ucm ibm-1363_P11B-1998.ucm

icu4c/source/test/cintltst/udatatst.c

@@ -1333,7 +1333,7 @@ static const struct {
     /* EUC-TW (3-byte) conversion table file without extension */
     {"ibm-964_P110-1999",        "cnv", ucnv_swap},
     /* GB 18030 (4-byte) conversion table file without extension */
-    {"gb18030",                  "cnv", ucnv_swap},
+    {"gb18030-2022",             "cnv", ucnv_swap},
     /* MBCS conversion table file with extension */
     {"*test4x",                  "cnv", ucnv_swap},
     /*

icu4j/main/shared/data/icudata.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:49f886698feb647c2dcfb10d6f872601280bf8783483456a706dd45549308875
-size 14330800
+oid sha256:72cf930fd69ea004b603abf57c5cc5add87028b62bda8300d0dc2e1e3cbeaa7a
+size 14330842

icu4j/main/shared/data/icutzdata.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2903ecb7a300f5d52e7636addfe2756cbdb00262835a787379d7aa6456c0349a
+oid sha256:fb2be51fc4c0fa490d7bbeb78a6c697a89c91704ff9fb70e39a55a11baf9649f
 size 94829

icu4j/main/shared/data/testdata.jar

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1cda304595c1fa919460b28de344a541938d5ed91af9f3089ccff9ce2effd440
+oid sha256:7b9763e6c4396a08e72d1c9ffa2c8ac4cac1e363a65972e75ea79965a974ee2d
 size 831983