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:51:37 UTC
svn commit: r1183739 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/test/ lucene/contrib/icu/lib/
lucene/src/test-framework/org/apache/lucene/util/ solr/
solr/contrib/analysis-extras/lib/ solr/contrib/extraction/lib/
Author: rmuir
Date: Sat Oct 15 21:51:37 2011
New Revision: 1183739
URL: http://svn.apache.org/viewvc?rev=1183739&view=rev
Log:
LUCENE-3521: upgrade icu jar to 4.8.1.1 / remove lucenetestcase hack
Added:
lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-4_8_1_1.jar
- copied unchanged from r1183738, lucene/dev/trunk/modules/analysis/icu/lib/icu4j-4_8_1_1.jar
lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar
- copied unchanged from r1183738, lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-4_8_1_1.jar
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar
- copied unchanged from r1183738, lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-4_8_1_1.jar
Removed:
lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/icu4j-4_8.jar
lucene/dev/branches/branch_3x/solr/contrib/analysis-extras/lib/icu4j-4_8.jar
lucene/dev/branches/branch_3x/solr/contrib/extraction/lib/icu4j-4_8.jar
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1183739&r1=1183738&r2=1183739&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Sat Oct 15 21:51:37 2011
@@ -534,7 +534,6 @@
errorProperty="tests.failed" failureProperty="tests.failed" forkmode="perBatch" dir="@{tempDir}/@{threadNum}">
<classpath refid="@{junit.classpath}"/>
<assertions>
- <enable package="org.apache.lucene"/>
<enable package="org.apache.solr"/>
</assertions>
Modified: lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1183739&r1=1183738&r2=1183739&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Sat Oct 15 21:51:37 2011
@@ -200,9 +200,6 @@ public abstract class LuceneTestCase ext
random.setSeed(staticSeed);
random.initialized = true;
}
-
- @Deprecated
- private static boolean icuTested = false;
@BeforeClass
public static void beforeClassLuceneTestCaseJ4() {
@@ -225,20 +222,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();