From 7af9fbd16d8706f6307d6b98a3a6bd4e8d931e3e Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Sat, 15 Oct 2011 21:48:50 +0000 Subject: [PATCH] LUCENE-3521: upgrade icu jar to 4.8.1.1 / remove lucenetestcase hack git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1183738 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/lucene/util/LuceneTestCase.java | 17 ----------------- modules/analysis/icu/lib/icu4j-4_8.jar | 2 -- modules/analysis/icu/lib/icu4j-4_8_1_1.jar | 2 ++ solr/contrib/analysis-extras/lib/icu4j-4_8.jar | 2 -- .../analysis-extras/lib/icu4j-4_8_1_1.jar | 2 ++ solr/contrib/extraction/lib/icu4j-4_8.jar | 2 -- solr/contrib/extraction/lib/icu4j-4_8_1_1.jar | 2 ++ 7 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 modules/analysis/icu/lib/icu4j-4_8.jar create mode 100644 modules/analysis/icu/lib/icu4j-4_8_1_1.jar delete mode 100644 solr/contrib/analysis-extras/lib/icu4j-4_8.jar create mode 100644 solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar delete mode 100644 solr/contrib/extraction/lib/icu4j-4_8.jar create mode 100644 solr/contrib/extraction/lib/icu4j-4_8_1_1.jar diff --git a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java index f9df8e5f15b..e510a0ef356 100644 --- a/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java @@ -324,9 +324,6 @@ public abstract class LuceneTestCase extends Assert { random.setSeed(staticSeed); random.initialized = true; } - - @Deprecated - private static boolean icuTested = false; @BeforeClass public static void beforeClassLuceneTestCaseJ4() { @@ -379,20 +376,6 @@ public abstract class LuceneTestCase extends Assert { savedLocale = Locale.getDefault(); - // START hack to init ICU safely before we randomize locales. - // ICU fails during classloading when a special Java7-only locale is the default - // see: http://bugs.icu-project.org/trac/ticket/8734 - if (!icuTested) { - icuTested = true; - try { - Locale.setDefault(Locale.US); - Class.forName("com.ibm.icu.util.ULocale"); - } catch (ClassNotFoundException cnfe) { - // ignore if no ICU is in classpath - } - } - // END hack - locale = TEST_LOCALE.equals("random") ? randomLocale(random) : localeForName(TEST_LOCALE); Locale.setDefault(locale); savedTimeZone = TimeZone.getDefault(); diff --git a/modules/analysis/icu/lib/icu4j-4_8.jar b/modules/analysis/icu/lib/icu4j-4_8.jar deleted file mode 100644 index cc428f93f2f..00000000000 --- a/modules/analysis/icu/lib/icu4j-4_8.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[907862721d458dcb1db68e932b89f9028e59f8dd] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/modules/analysis/icu/lib/icu4j-4_8_1_1.jar b/modules/analysis/icu/lib/icu4j-4_8_1_1.jar new file mode 100644 index 00000000000..098d38b6fbf --- /dev/null +++ b/modules/analysis/icu/lib/icu4j-4_8_1_1.jar @@ -0,0 +1,2 @@ +AnyObjectId[a97d575b7d923c1c4f5deb5a735cd45fbc084230] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/analysis-extras/lib/icu4j-4_8.jar b/solr/contrib/analysis-extras/lib/icu4j-4_8.jar deleted file mode 100644 index cc428f93f2f..00000000000 --- a/solr/contrib/analysis-extras/lib/icu4j-4_8.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[907862721d458dcb1db68e932b89f9028e59f8dd] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar b/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar new file mode 100644 index 00000000000..098d38b6fbf --- /dev/null +++ b/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar @@ -0,0 +1,2 @@ +AnyObjectId[a97d575b7d923c1c4f5deb5a735cd45fbc084230] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/icu4j-4_8.jar b/solr/contrib/extraction/lib/icu4j-4_8.jar deleted file mode 100644 index cc428f93f2f..00000000000 --- a/solr/contrib/extraction/lib/icu4j-4_8.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[907862721d458dcb1db68e932b89f9028e59f8dd] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar b/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar new file mode 100644 index 00000000000..098d38b6fbf --- /dev/null +++ b/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar @@ -0,0 +1,2 @@ +AnyObjectId[a97d575b7d923c1c4f5deb5a735cd45fbc084230] was removed in git history. +Apache SVN contains full history. \ No newline at end of file