Drop unused dependency org.elasticsearch.test:framework

diff --git a/build.gradle b/build.gradle
index 95fb87f80b2f298e4cb1f8ca02a45997bfae94a2..15751f75c65155aad5cf59c1df46a568277d1e8a 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -71,7 +71,6 @@ subprojects {
   artifactoryPublish.skip = true
 
   ext {
-    elasticsearchVersion = '5.6.3'
     protobufVersion = '3.5.1'
   }
 
@@ -179,7 +178,7 @@ subprojects {
         entry 'jetty-server'
         entry 'jetty-servlet'
       }
-      dependency("org.elasticsearch.client:transport:${elasticsearchVersion}") {
+      dependency('org.elasticsearch.client:transport:5.6.3') {
         exclude 'org.elasticsearch.plugin:lang-mustache-client'
         exclude 'org.elasticsearch.plugin:transport-netty3-client'
         exclude 'commons-logging:commons-logging'

diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle
index 130487ef396c79a17ab785c980f80b29a06f5525..761efd7ae1b6d295ba51b1d9c41d643d713aa57f 100644 (file)
--- a/server/sonar-server/build.gradle
+++ b/server/sonar-server/build.gradle
@@ -74,12 +74,6 @@ dependencies {
   testCompile 'org.apache.logging.log4j:log4j-core'
   testCompile 'org.assertj:assertj-core'
   testCompile 'org.assertj:assertj-guava'
-  testCompile("org.elasticsearch.test:framework:${elasticsearchVersion}") {
-    // should be excluded to avoid ES go into "test mode" and require to run EsTester-based UTs with RandomizedRunner
-    exclude group: 'com.carrotsearch.randomizedtesting', module: 'randomizedtesting-runner'
-    exclude group: 'org.elasticsearch', module: 'securemock'
-    exclude group: 'commons-logging', module: 'commons-logging'
-  }
   testCompile 'org.hamcrest:hamcrest-all'
   testCompile 'org.mockito:mockito-core'
   testCompile 'org.reflections:reflections'

diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java
index 552db86f990a89805859a8b2f75d99411d5775db..bb0be1280b80a0fe9853365bfe5d33cf4241fa83 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java
@@ -54,7 +54,6 @@ import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.NodeEnvironment;
 import org.elasticsearch.index.IndexNotFoundException;
 import org.elasticsearch.indices.recovery.RecoverySettings;
-import org.elasticsearch.node.MockNode;
 import org.elasticsearch.node.Node;
 import org.elasticsearch.search.SearchHit;
 import org.junit.rules.ExternalResource;
@@ -70,7 +69,6 @@ import org.sonar.server.view.index.ViewIndexDefinition;
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.collect.Lists.newArrayList;
-import static java.util.Collections.emptyList;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.sonar.server.es.DefaultIndexSettings.REFRESH_IMMEDIATE;
 
@@ -328,7 +326,7 @@ public class EsTester extends ExternalResource {
         .put(NetworkModule.HTTP_ENABLED.getKey(), false)
         .put(DiscoveryModule.DISCOVERY_TYPE_SETTING.getKey(), "single-node")
         .build();
-      MockNode node = new MockNode(settings, emptyList());
+      Node node = new Node(settings);
       return node.start();
     } catch (Exception e) {
       throw new IllegalStateException("Fail to start embedded Elasticsearch", e);