diff --git a/README.md b/README.md index 55e83822ba6..77ec97e2e35 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,10 @@ Google Compute Engine Cloud Plugin for Elasticsearch The GCE Cloud plugin allows to use GCE API for the unicast discovery mechanism. -In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-gce/2.0.0`. +In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-gce/2.1.1`. * For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/master). +* For 1.3.x elasticsearch versions, look at [es-1.3 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.3). * For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.2). * For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.1). * For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.0). diff --git a/pom.xml b/pom.xml index 1f9eeca053d..ad91d70da13 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,7 @@ governing permissions and limitations under the License. --> <elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version> <google.gce.version>v1-rev15-1.18.0-rc</google.gce.version> <google.api.version>1.18.0-rc</google.api.version> - <lucene.version>4.8.0</lucene.version> + <lucene.version>4.8.1</lucene.version> <tests.shuffle>true</tests.shuffle> <tests.output>onerror</tests.output> <tests.client.ratio></tests.client.ratio> diff --git a/src/test/java/org/elasticsearch/discovery/gce/AbstractGceComputeServiceTest.java b/src/test/java/org/elasticsearch/discovery/gce/AbstractGceComputeServiceTest.java index 57980ffebf9..a39b500a8f4 100644 --- a/src/test/java/org/elasticsearch/discovery/gce/AbstractGceComputeServiceTest.java +++ b/src/test/java/org/elasticsearch/discovery/gce/AbstractGceComputeServiceTest.java @@ -22,6 +22,7 @@ package org.elasticsearch.discovery.gce; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.junit.Test; @@ -55,6 +56,7 @@ public abstract class AbstractGceComputeServiceTest extends ElasticsearchIntegra return ImmutableSettings.builder() .put("transport.tcp.port", getPort(nodeOrdinal)) .put("http.enabled", false) + .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true) .build(); } diff --git a/src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java b/src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java index 48d0c1a762e..f02aecc543b 100644 --- a/src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java +++ b/src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java @@ -23,6 +23,7 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cloud.gce.AbstractGceTest; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.plugins.PluginsService; import org.elasticsearch.test.ElasticsearchIntegrationTest; import org.hamcrest.Matchers; import org.junit.Test; @@ -36,11 +37,19 @@ import org.junit.Test; */ @AbstractGceTest.GceTest @ElasticsearchIntegrationTest.ClusterScope( - scope = ElasticsearchIntegrationTest.Scope.TEST, + scope = ElasticsearchIntegrationTest.Scope.SUITE, numDataNodes = 1, transportClientRatio = 0.0) public class GceSimpleITest extends AbstractGceTest { + @Override + protected Settings nodeSettings(int nodeOrdinal) { + return ImmutableSettings.builder() + .put(super.nodeSettings(nodeOrdinal)) + .put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true) + .build(); + } + @Test public void one_node_should_run() { // Do nothing... Just start :-)