3 files changed, 2 insertions, 11 deletions
diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index e9a4d6d8952..4b433567978 100644
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     // please keep list ordered
     compile 'org.slf4j:slf4j-api'
 
-    compile 'org.elasticsearch.client:transport'
+    compile 'org.elasticsearch.client:elasticsearch-rest-high-level-client'
     compile project(':server:sonar-ce')
     compile project(':server:sonar-main')
     compile project(':server:sonar-process')
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 6ce66482775..6ca7452a06e 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -271,7 +271,7 @@
 # Same as previous property, but allows to not repeat all other settings like -Xmx
 #sonar.search.javaAdditionalOpts=
 
-# Elasticsearch port. Default is 9001. Use 0 to get a free port.
+# Elasticsearch port for incoming HTTP connections. Default is 9001. Use 0 to get a free port.
 # As a security precaution, should be blocked by a firewall and not exposed to the Internet.
 #sonar.search.port=9001
 
@@ -413,11 +413,3 @@
 # We don't collect source code or IP addresses. And we don't share the data with anyone else.
 # To see an example of the data shared: login as a global administrator, call the WS api/system/info and check the Statistics field.
 #sonar.telemetry.enable=true
-
-
-#--------------------------------------------------------------------------------------------------
-# DEVELOPMENT - only for developers
-# The following properties MUST NOT be used in production environments.
-
-# Elasticsearch HTTP connector
-#sonar.search.httpPort=-1
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index 5ab3ae12142..d7f7341aaf0 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -42,7 +42,6 @@ public class App {
   private final JavaVersion javaVersion;
   private StopRequestWatcher stopRequestWatcher = null;
   private StopRequestWatcher hardStopRequestWatcher = null;
-
   public App(JavaVersion javaVersion) {
     this.javaVersion = javaVersion;
   }