From 8300ea17ad97fc54f2bdaea53f5b1166b8eb79eb Mon Sep 17 00:00:00 2001 From: David Pilato Date: Wed, 28 May 2014 16:51:47 +0200 Subject: [PATCH] Update to elasticsearch 1.3.0 Closes #32. (cherry picked from commit 4d17e47) --- README.md | 5 +++-- pom.xml | 2 +- .../index/analysis/ICUIntegrationTests.java | 9 +++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0cc22a6b7f8..ae4378cd94a 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,11 @@ ICU Analysis for Elasticsearch The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding ICU relates analysis components. -In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-analysis-icu/2.0.0`. +In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-analysis-icu/2.1.0`. * For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-analysis-icu/tree/master). -* For 1.2.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-analysis-icu/tree/es-1.2). +* For 1.3.x elasticsearch versions, look at [es-1.3 branch](https://github.com/elasticsearch/elasticsearch-analysis-icu/tree/es-1.3). +* For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-analysis-icu/tree/es-1.2). * For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-analysis-icu/tree/es-1.1). * For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-analysis-icu/tree/es-1.0). * For 0.90.x elasticsearch versions, look at [es-0.90 branch](https://github.com/elasticsearch/elasticsearch-analysis-icu/tree/es-0.90). diff --git a/pom.xml b/pom.xml index 23aeda9e444..fcd6493ab31 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ 2.0.0-SNAPSHOT - 4.8.0 + 4.8.1 1 true onerror diff --git a/src/test/java/org/elasticsearch/index/analysis/ICUIntegrationTests.java b/src/test/java/org/elasticsearch/index/analysis/ICUIntegrationTests.java index 23c12d137de..95874c98b07 100644 --- a/src/test/java/org/elasticsearch/index/analysis/ICUIntegrationTests.java +++ b/src/test/java/org/elasticsearch/index/analysis/ICUIntegrationTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; @@ -38,6 +39,14 @@ import static org.hamcrest.CoreMatchers.notNullValue; @ElasticsearchIntegrationTest.ClusterScope(scope = ElasticsearchIntegrationTest.Scope.SUITE) public class ICUIntegrationTests extends ElasticsearchIntegrationTest { + @Override + protected Settings nodeSettings(int nodeOrdinal) { + return ImmutableSettings.builder() + .put(super.nodeSettings(nodeOrdinal)) + .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true) + .build(); + } + @Override public Settings indexSettings() { Settings settings = ImmutableSettings.builder()