From 14cbe08c08e3b6aba8e599b578a68d54308f964b Mon Sep 17 00:00:00 2001 From: David Pilato Date: Thu, 19 Dec 2013 09:46:47 +0100 Subject: [PATCH] Update to Elasticsearch 0.90.8 / Lucene 4.6.0 Closes #15. --- README.md | 98 +++---------------- pom.xml | 4 +- .../SimpleIcuCollationTokenFilterTests.java | 6 +- 3 files changed, 23 insertions(+), 85 deletions(-) diff --git a/README.md b/README.md index 19651fd47cd6a..d125ec0b43726 100644 --- a/README.md +++ b/README.md @@ -5,88 +5,22 @@ The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-analysis-icu/1.12.0`. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ICU Analysis PluginElasticsearchRelease date
1.13.0-SNAPSHOT (master)0.90.6 -> master
1.12.00.90.6 -> master2013-11-06
1.11.00.90.3 -> 0.90.52013-08-08
1.10.00.90.1 -> 0.90.22013-05-30
1.9.00.90.02013-04-29
1.8.00.90.02013-02-26
1.7.00.19 -> 0.202012-09-28
1.6.00.19 -> 0.202012-09-27
1.5.00.19 -> 0.202012-04-30
1.4.00.19 -> 0.202012-03-20
1.3.00.19 -> 0.202012-03-20
1.2.00.19 -> 0.202012-02-07
1.1.00.182011-12-13
1.0.00.182011-12-05
+| ICU Analysis Plugin | elasticsearch | Release date | +|--------------------------|------------------|:------------:| +| 1.13.0-SNAPSHOT (master) | 0.90.8 -> master | 2013-12-19 | +| 1.12.0 | 0.90.6 -> 0.90.7 | 2013-11-06 | +| 1.11.0 | 0.90.3 -> 0.90.5 | 2013-08-08 | +| 1.10.0 | 0.90.1 -> 0.90.2 | 2013-05-30 | +| 1.9.0 | 0.90.0 | 2013-04-29 | +| 1.8.0 | 0.90.0 | 2013-02-26 | +| 1.7.0 | 0.19 -> 0.20 | 2012-09-28 | +| 1.6.0 | 0.19 -> 0.20 | 2012-09-27 | +| 1.5.0 | 0.19 -> 0.20 | 2012-04-30 | +| 1.4.0 | 0.19 -> 0.20 | 2012-03-20 | +| 1.3.0 | 0.19 -> 0.20 | 2012-03-20 | +| 1.2.0 | 0.19 -> 0.20 | 2012-02-07 | +| 1.1.0 | 0.18 | 2011-12-13 | +| 1.0.0 | 0.18 | 2011-12-05 | ICU Normalization diff --git a/pom.xml b/pom.xml index 81e3f34aa944c..2a8ae4faf9189 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,8 @@ - 0.90.6 - 4.5.1 + 0.90.8 + 4.6.0 diff --git a/src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java b/src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java index e4475e853b9cc..987384c61c1a4 100644 --- a/src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/SimpleIcuCollationTokenFilterTests.java @@ -3,8 +3,8 @@ import com.ibm.icu.text.Collator; import com.ibm.icu.text.RuleBasedCollator; import com.ibm.icu.util.ULocale; -import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.ModulesBuilder; @@ -290,6 +290,10 @@ private void assertCollation(TokenStream stream1, TokenStream stream2, int compa .addAttribute(CharTermAttribute.class); CharTermAttribute term2 = stream2 .addAttribute(CharTermAttribute.class); + + stream1.reset(); + stream2.reset(); + assertThat(stream1.incrementToken(), equalTo(true)); assertThat(stream2.incrementToken(), equalTo(true)); assertThat(Integer.signum(term1.toString().compareTo(term2.toString())), equalTo(Integer.signum(comparison)));