ICU-22769 Rename of the ICU4J data folder to not contain a version (c…

…ode)

icu4j/main/core/src/main/java/com/ibm/icu/impl/ICUData.java

@@ -33,12 +33,13 @@ public final class ICUData {
  * The ICU data package name.
  * This is normally the name of the .dat package, and the prefix (plus '/')
  * of the package entry names.
+ * Not used when loading from resources packaged in the .jar.
  */
  static final String PACKAGE_NAME = "icudt" + VersionInfo.ICU_DATA_VERSION_PATH;
  /**
  * The data path to be used with Class.getResourceAsStream().
  */
- public static final String ICU_BUNDLE = "data/" + PACKAGE_NAME;
+ public static final String ICU_BUNDLE = "data/icudata";
 
  /**
  * The base name of ICU data to be used with ClassLoader.getResourceAsStream(),

icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java

@@ -9,6 +9,7 @@
 
 package com.ibm.icu.util;
 
+import com.ibm.icu.impl.ICUData;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -230,7 +231,8 @@ public final class VersionInfo implements Comparable<VersionInfo>
  public static final VersionInfo ICU_VERSION;
 
  /**
- * Data version string for ICU's internal data.
+ * Data version string for ICU's data file.
+ * Not used when loading from resources packaged in the .jar.
  * Used for appending to data path (e.g. icudt43b)
  * @internal
  * @deprecated This API is ICU internal only.
@@ -703,8 +705,8 @@ static String getTZDataVersion() {
  if (TZDATA_VERSION == null) {
  synchronized (VersionInfo.class) {
  if (TZDATA_VERSION == null) {
- UResourceBundle tzbundle = UResourceBundle.getBundleInstance("com/ibm/icu/impl/data/icudt"
- + VersionInfo.ICU_DATA_VERSION_PATH, "zoneinfo64");
+ UResourceBundle tzbundle =
+ UResourceBundle.getBundleInstance("com/ibm/icu/impl/" + ICUData.ICU_BUNDLE, "zoneinfo64");
  TZDATA_VERSION = tzbundle.getString("TZVersion");
  }
  }