From 27ef02e59b288ac74bada68b67107575f68e862f Mon Sep 17 00:00:00 2001
From: David Pilato <david@pilato.fr>
Date: Tue, 29 Apr 2014 21:37:59 +0200
Subject: [PATCH] Update to elasticsearch 2.0.0 / Lucene 4.8

Breaking changes in tests
---
 pom.xml                                                         | 2 +-
 .../java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java | 2 +-
 .../elasticsearch/repositories/s3/S3SnapshotRestoreTest.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a1df06e51c6..4cbe7fa14bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
-        <lucene.version>4.7.1</lucene.version>
+        <lucene.version>4.8.0</lucene.version>
         <tests.output>onerror</tests.output>
         <tests.jvms>1</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
diff --git a/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java b/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java
index 5f211422ab7..51232bd4792 100644
--- a/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java
+++ b/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java
@@ -35,7 +35,7 @@ import static org.elasticsearch.common.settings.ImmutableSettings.settingsBuilde
  * This test requires AWS to run.
  */
 @AwsTest
-@ClusterScope(scope = Scope.TEST, numNodes = 0)
+@ClusterScope(scope = Scope.TEST, numDataNodes = 0)
 public class Ec2DiscoveryITest extends AbstractAwsTest {
 
     @Test
diff --git a/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreTest.java b/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreTest.java
index d936f866b6e..040f1f1152b 100644
--- a/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreTest.java
+++ b/src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreTest.java
@@ -52,7 +52,7 @@ import static org.hamcrest.Matchers.greaterThan;
 /**
  */
 @AwsTest
-@ClusterScope(scope = Scope.SUITE, numNodes = 2)
+@ClusterScope(scope = Scope.SUITE, numDataNodes = 2)
 public class S3SnapshotRestoreTest extends AbstractAwsTest {
 
     @Override