Update to elasticsearch 2.0.0 / Lucene 4.8

Breaking changes in tests

Author: dadoonet

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>

src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryITest.java

@@ -35,7 +35,7 @@
  * 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

src/test/java/org/elasticsearch/repositories/s3/S3SnapshotRestoreTest.java

@@ -52,7 +52,7 @@
 /**
  */
 @AwsTest
-@ClusterScope(scope = Scope.SUITE, numNodes = 2)
+@ClusterScope(scope = Scope.SUITE, numDataNodes = 2)
 public class S3SnapshotRestoreTest extends AbstractAwsTest {
 
  @Override