Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Robert Muir 2011-10-15 21:48:50 +00:00
parent f934d2420d
commit 7af9fbd16d
7 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
View File

@ -324,9 +324,6 @@ public abstract class LuceneTestCase extends Assert {
random.setSeed(staticSeed); random.setSeed(staticSeed);
random.initialized = true; random.initialized = true;
} }
@Deprecated
private static boolean icuTested = false;
@BeforeClass @BeforeClass
public static void beforeClassLuceneTestCaseJ4() { public static void beforeClassLuceneTestCaseJ4() {
@ -379,20 +376,6 @@ public abstract class LuceneTestCase extends Assert {
savedLocale = Locale.getDefault(); 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 = TEST_LOCALE.equals("random") ? randomLocale(random) : localeForName(TEST_LOCALE);
Locale.setDefault(locale); Locale.setDefault(locale);
savedTimeZone = TimeZone.getDefault(); savedTimeZone = TimeZone.getDefault();

2
modules/analysis/icu/lib/icu4j-4_8.jar
View File

@ -1,2 +0,0 @@
AnyObjectId[907862721d458dcb1db68e932b89f9028e59f8dd] was removed in git history.
Apache SVN contains full history.

2
modules/analysis/icu/lib/icu4j-4_8_1_1.jar Normal file
View File

@ -0,0 +1,2 @@
AnyObjectId[a97d575b7d923c1c4f5deb5a735cd45fbc084230] was removed in git history.
Apache SVN contains full history.

2
solr/contrib/analysis-extras/lib/icu4j-4_8.jar
View File

@ -1,2 +0,0 @@
AnyObjectId[907862721d458dcb1db68e932b89f9028e59f8dd] was removed in git history.
Apache SVN contains full history.

2
solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar Normal file
View File

@ -0,0 +1,2 @@
AnyObjectId[a97d575b7d923c1c4f5deb5a735cd45fbc084230] was removed in git history.
Apache SVN contains full history.

2
solr/contrib/extraction/lib/icu4j-4_8.jar
View File

@ -1,2 +0,0 @@
AnyObjectId[907862721d458dcb1db68e932b89f9028e59f8dd] was removed in git history.
Apache SVN contains full history.

2
solr/contrib/extraction/lib/icu4j-4_8_1_1.jar Normal file
View File

@ -0,0 +1,2 @@
AnyObjectId[a97d575b7d923c1c4f5deb5a735cd45fbc084230] was removed in git history.
Apache SVN contains full history.