src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java

rev 14857 : imported patch 8159781

*** 81,98 ****
          "sun.util.resources.cldr.provider",
          "sun.util.resources.ext",
          "sun.util.resources.provider");
      private static final String METAINFONAME = "LocaleDataMetaInfo";
      private static final String META_FILES =
!         "*module-info.class," +
!         "*LocaleDataProvider.class," +
!         "*" + METAINFONAME + ".class,";
      private static final String INCLUDE_LOCALE_FILES =
!         "*sun/text/resources/ext/[^\\/]+_%%.class," +
!         "*sun/util/resources/ext/[^\\/]+_%%.class," +
!         "*sun/text/resources/cldr/ext/[^\\/]+_%%.class," +
!         "*sun/util/resources/cldr/ext/[^\\/]+_%%.class,";
      private Predicate<String> predicate;
      private String userParam;
      private List<Locale.LanguageRange> priorityList;
      private List<Locale> available;
      private List<String> filtered;
--- 81,98 ----
          "sun.util.resources.cldr.provider",
          "sun.util.resources.ext",
          "sun.util.resources.provider");
      private static final String METAINFONAME = "LocaleDataMetaInfo";
      private static final String META_FILES =
!         "regex:.+module-info.class," +
!         "regex:.+LocaleDataProvider.class," +
!         "regex:.+" + METAINFONAME + ".class,";
      private static final String INCLUDE_LOCALE_FILES =
!         "regex:.+sun/text/resources/ext/[^_]+_%%.class," +
!         "regex:.+sun/util/resources/ext/[^_]+_%%.class," +
!         "regex:.+sun/text/resources/cldr/ext/[^_]+_%%.class," +
!         "regex:.+sun/util/resources/cldr/ext/[^_]+_%%.class,";
      private Predicate<String> predicate;
      private String userParam;
      private List<Locale.LanguageRange> priorityList;
      private List<Locale> available;
      private List<String> filtered;
*** 251,262 ****
              files += INCLUDE_LOCALE_FILES.replaceAll("%%", isoSpecial + "_[0-9]{3}");
          }
  
          // Add Thai BreakIterator related data files
          if (lang.equals("th")) {
!             files += "*sun/text/resources/thai_dict," +
!                      "*sun/text/resources/[^\\/]+BreakIteratorData_th,";
          }
  
          // Add Taiwan resource bundles for Hong Kong
          if (tag.startsWith("zh-HK")) {
              files += INCLUDE_LOCALE_FILES.replaceAll("%%", "zh_TW");
--- 251,262 ----
              files += INCLUDE_LOCALE_FILES.replaceAll("%%", isoSpecial + "_[0-9]{3}");
          }
  
          // Add Thai BreakIterator related data files
          if (lang.equals("th")) {
!             files += "regex:.+sun/text/resources/thai_dict," +
!                      "regex:.+sun/text/resources/[^_]+BreakIteratorData_th,";
          }
  
          // Add Taiwan resource bundles for Hong Kong
          if (tag.startsWith("zh-HK")) {
              files += INCLUDE_LOCALE_FILES.replaceAll("%%", "zh_TW");