2 files changed, 10 insertions, 13 deletions
diff --git a/server/sonar-search/pom.xml b/server/sonar-search/pom.xml
index 7d4b3282a28..ce4fd4eaf6e 100644
--- a/server/sonar-search/pom.xml
+++ b/server/sonar-search/pom.xml
@@ -20,10 +20,6 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>net.java.dev.jna</groupId>
-      <artifactId>jna</artifactId>
-    </dependency>
-    <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>
       <scope>provided</scope>
diff --git a/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java b/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java
index 549809ef13a..77ed96a090a 100644
--- a/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/EsSettings.java
@@ -61,7 +61,7 @@ public class EsSettings implements EsSettingsMBean {
 
   @Override
   public int getHttpPort() {
-    return props.valueAsInt(ProcessProperties.SEARCH_HTTP_PORT, 9010);
+    return props.valueAsInt(ProcessProperties.SEARCH_HTTP_PORT, -1);
   }
 
   @Override
@@ -125,15 +125,16 @@ public class EsSettings implements EsSettingsMBean {
     int httpPort = getHttpPort();
     if (httpPort < 0) {
       // standard configuration
-      httpPort = 9010;
+      builder.put("http.enabled", String.valueOf(false));
+    } else {
+      LOGGER.warn("Elasticsearch HTTP connector is enabled on port {}. MUST NOT BE USED FOR PRODUCTION", httpPort);
+      // see https://github.com/lmenezes/elasticsearch-kopf/issues/195
+      builder.put("http.cors.enabled", String.valueOf(true));
+      builder.put("http.cors.allow-origin", "*");
+      builder.put("http.enabled", String.valueOf(true));
+      builder.put("http.host", host.getHostAddress());
+      builder.put("http.port", String.valueOf(httpPort));
     }
-
-    // see https://github.com/lmenezes/elasticsearch-kopf/issues/195
-    builder.put("http.cors.enabled", String.valueOf(true));
-    builder.put("http.cors.allow-origin", "*");
-    builder.put("http.enabled", String.valueOf(true));
-    builder.put("http.host", host.getHostAddress());
-    builder.put("http.port", String.valueOf(httpPort));
   }
 
   private InetAddress readHost() {