ICU-23290 Integrate CLDR 48.1 beta1 to ICU maint-78, part 3: ICU code/test/tool mods

Author: pedberg-icu

icu4c/source/test/intltest/dtifmtts.cpp

@@ -2293,20 +2293,20 @@ void DateIntervalFormatTest::testTicket21222ROCEraDiff() {
 
     formatted = roc->formatToValue(bothAfterMG, status);
     assertEquals("roc calendar - both dates in MG Era",
-                 u"民國1/1/2上午6時\u2009\u2013\u2009民國2/1/2上午6時",
+                 u"民國1/1/2\u2009上午6時\u2009\u2013\u2009民國2/1/2\u2009上午6時",
                  formatted.toString(status));
     getCategoryAndField(formatted, expectedCategory,
                         expectedField, status);
 
     formatted = roc->formatToValue(beforeAfterMG, status);
     assertEquals("roc calendar - prior MG Era and in MG Era",
-                 u"民國前1/1/2上午6時\u2009\u2013\u2009民國2/1/2上午6時",
+                 u"民國前1/1/2\u2009上午6時\u2009\u2013\u2009民國2/1/2\u2009上午6時",
                  formatted.toString(status));
     verifyCategoryAndField(formatted, expectedCategory, expectedField, status);
 
     formatted = roc->formatToValue(bothBeforeMG, status);
     assertEquals("roc calendar - both dates prior MG Era",
-                 u"民國前2/1/2上午6時\u2009\u2013\u2009民國前1/1/2上午6時",
+                 u"民國前2/1/2\u2009上午6時\u2009\u2013\u2009民國前1/1/2\u2009上午6時",
                  formatted.toString(status));
     verifyCategoryAndField(formatted, expectedCategory, expectedField, status);
 }

icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java

@@ -2433,19 +2433,19 @@ public void testTicket21222ROCEraDiff() {
 
         FormattedDateInterval formatted = roc.formatToValue(bothAfterMG);
         assertEquals("roc calendar - both dates in MG Era",
-                     "民國1/1/2上午6時\u2009\u2013\u2009民國2/1/2上午6時",
+                     "民國1/1/2\u2009上午6時\u2009\u2013\u2009民國2/1/2\u2009上午6時",
                      formatted.toString());
         List<Field> expectedFields = getFields(formatted);
 
         formatted = roc.formatToValue(beforeAfterMG);
         assertEquals("roc calendar - prior MG Era and in MG Era",
-                     "民國前1/1/2上午6時\u2009\u2013\u2009民國2/1/2上午6時",
+                     "民國前1/1/2\u2009上午6時\u2009\u2013\u2009民國2/1/2\u2009上午6時",
                      formatted.toString());
         verifyFields(formatted, expectedFields);
 
         formatted = roc.formatToValue(bothBeforeMG);
         assertEquals("roc calendar - both dates prior MG Era",
-                     "民國前2/1/2上午6時\u2009\u2013\u2009民國前1/1/2上午6時",
+                     "民國前2/1/2\u2009上午6時\u2009\u2013\u2009民國前1/1/2\u2009上午6時",
                      formatted.toString());
         verifyFields(formatted, expectedFields);
     }

tools/cldr/cldr-to-icu/pom.xml

@@ -25,7 +25,7 @@
             SNAPSHOT for the ICU version that we want, so this should only need updating
             when the ICU version changes e.g. from 74.0.1, to 74.1, then to 75.0.1 -->
         <icu4j.version>78.2</icu4j.version>
-        <cldr-code.version>48.0</cldr-code.version>
+        <cldr-code.version>48.1-SNAPSHOT</cldr-code.version>
         <guava.version>32.1.1-jre</guava.version>
         <truth.version>1.4.4</truth.version>
         <commons-cli.version>1.9.0</commons-cli.version>