Skip to content

Commit 81742c3

Browse files
committed
Update to elasticsearch 1.3.0
Closes #24. (cherry picked from commit 9c62411)
1 parent 37474b4 commit 81742c3

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ Google Compute Engine Cloud Plugin for Elasticsearch
33

44
The GCE Cloud plugin allows to use GCE API for the unicast discovery mechanism.
55

6-
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-gce/2.0.0`.
6+
In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-cloud-gce/2.1.1`.
77

88
* For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/master).
9+
* For 1.3.x elasticsearch versions, look at [es-1.3 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.3).
910
* For 1.2.x elasticsearch versions, look at [es-1.2 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.2).
1011
* For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.1).
1112
* For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-cloud-gce/tree/es-1.0).

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ governing permissions and limitations under the License. -->
5151
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
5252
<google.gce.version>v1-rev15-1.18.0-rc</google.gce.version>
5353
<google.api.version>1.18.0-rc</google.api.version>
54-
<lucene.version>4.8.0</lucene.version>
54+
<lucene.version>4.8.1</lucene.version>
5555
<tests.shuffle>true</tests.shuffle>
5656
<tests.output>onerror</tests.output>
5757
<tests.client.ratio></tests.client.ratio>

src/test/java/org/elasticsearch/discovery/gce/AbstractGceComputeServiceTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
2323
import org.elasticsearch.common.settings.ImmutableSettings;
2424
import org.elasticsearch.common.settings.Settings;
25+
import org.elasticsearch.plugins.PluginsService;
2526
import org.elasticsearch.test.ElasticsearchIntegrationTest;
2627
import org.junit.Test;
2728

@@ -55,6 +56,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
5556
return ImmutableSettings.builder()
5657
.put("transport.tcp.port", getPort(nodeOrdinal))
5758
.put("http.enabled", false)
59+
.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
5860
.build();
5961
}
6062

src/test/java/org/elasticsearch/gce/itest/GceSimpleITest.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.elasticsearch.cloud.gce.AbstractGceTest;
2424
import org.elasticsearch.common.settings.ImmutableSettings;
2525
import org.elasticsearch.common.settings.Settings;
26+
import org.elasticsearch.plugins.PluginsService;
2627
import org.elasticsearch.test.ElasticsearchIntegrationTest;
2728
import org.hamcrest.Matchers;
2829
import org.junit.Test;
@@ -36,11 +37,19 @@
3637
*/
3738
@AbstractGceTest.GceTest
3839
@ElasticsearchIntegrationTest.ClusterScope(
39-
scope = ElasticsearchIntegrationTest.Scope.TEST,
40+
scope = ElasticsearchIntegrationTest.Scope.SUITE,
4041
numDataNodes = 1,
4142
transportClientRatio = 0.0)
4243
public class GceSimpleITest extends AbstractGceTest {
4344

45+
@Override
46+
protected Settings nodeSettings(int nodeOrdinal) {
47+
return ImmutableSettings.builder()
48+
.put(super.nodeSettings(nodeOrdinal))
49+
.put("plugins." + PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, true)
50+
.build();
51+
}
52+
4453
@Test
4554
public void one_node_should_run() {
4655
// Do nothing... Just start :-)

0 commit comments

Comments
 (0)