You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/10/15 23:48:52 UTC
svn commit: r1183738 - in /lucene/dev/trunk:
lucene/src/test-framework/org/apache/lucene/util/ modules/analysis/icu/lib/
solr/contrib/analysis-extras/lib/ solr/contrib/extraction/lib/
Author: rmuir
Date: Sat Oct 15 21:48:50 2011
New Revision: 1183738
URL: http://svn.apache.org/viewvc?rev=1183738&view=rev
Log:
LUCENE-3521: upgrade icu jar to 4.8.1.1 / remove lucenetestcase hack
Added:
lucene/dev/trunk/modules/analysis/icu/lib/icu4j-4_8_1_1.jar (with props)
lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar (with props)
lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar (with props)
Removed:
lucene/dev/trunk/modules/analysis/icu/lib/icu4j-4_8.jar
lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-4_8.jar
lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-4_8.jar
Modified:
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1183738&r1=1183737&r2=1183738&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Sat Oct 15 21:48:50 2011
@@ -324,9 +324,6 @@ public abstract class LuceneTestCase ext
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 ext
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();
Added: lucene/dev/trunk/modules/analysis/icu/lib/icu4j-4_8_1_1.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/icu/lib/icu4j-4_8_1_1.jar?rev=1183738&view=auto
==============================================================================
Binary file - no diff available.
Added: lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar?rev=1183738&view=auto
==============================================================================
Binary file - no diff available.
Added: lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar?rev=1183738&view=auto
==============================================================================
Binary file - no diff available.