# HG changeset patch
# User naoto
# Date 1466198655 25200
#      Fri Jun 17 14:24:15 2016 -0700
# Node ID a225899affa5615370031a0dc52b904acf5fab69
# Parent  84d500090fb9ce49ad24e019c7f422f71fe07c8a
imported patch 8159781

diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java
@@ -83,14 +83,14 @@
         "sun.util.resources.provider");
     private static final String METAINFONAME = "LocaleDataMetaInfo";
     private static final String META_FILES =
-        "*module-info.class," +
-        "*LocaleDataProvider.class," +
-        "*" + METAINFONAME + ".class,";
+        "regex:.+module-info.class," +
+        "regex:.+LocaleDataProvider.class," +
+        "regex:.+" + 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,";
+        "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;
@@ -253,8 +253,8 @@
 
         // Add Thai BreakIterator related data files
         if (lang.equals("th")) {
-            files += "*sun/text/resources/thai_dict," +
-                     "*sun/text/resources/[^\\/]+BreakIteratorData_th,";
+            files += "regex:.+sun/text/resources/thai_dict," +
+                     "regex:.+sun/text/resources/[^_]+BreakIteratorData_th,";
         }
 
         // Add Taiwan resource bundles for Hong Kong
diff --git a/test/ProblemList.txt b/test/ProblemList.txt
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -387,8 +387,6 @@
 
 # core_tools
 
-tools/jlink/plugins/IncludeLocalesPluginTest.java               8159781 generic-all
-
 tools/jlink/JLinkOptimTest.java                                 8159264 generic-all
 
 ############################################################################