SONAR-12279 Swap Elasticsearch options to match convention

diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
index 34e6b61298919117ae1ad4903d91afd39bf109cd..7feee6e57fe0b5f05727d5c9f24b9a7c770e4a2b 100644 (file)
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
@@ -67,7 +67,7 @@ public class ProcessProperties {
     SEARCH_HOST("sonar.search.host", InetAddress.getLoopbackAddress().getHostAddress()),
     SEARCH_PORT("sonar.search.port", "9001"),
     SEARCH_HTTP_PORT("sonar.search.httpPort"),
-    SEARCH_JAVA_OPTS("sonar.search.javaOpts", "-Xms512m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError"),
+    SEARCH_JAVA_OPTS("sonar.search.javaOpts", "-Xmx512m -Xms512m -XX:+HeapDumpOnOutOfMemoryError"),
     SEARCH_JAVA_ADDITIONAL_OPTS("sonar.search.javaAdditionalOpts", ""),
     SEARCH_REPLICAS("sonar.search.replicas"),
     SEARCH_MINIMUM_MASTER_NODES("sonar.search.minimumMasterNodes"),

diff --git a/sonar-application/build.gradle b/sonar-application/build.gradle
index edf70929c6b80b700ccc14bc4aea83a3a999b817..b56806c047901fce1b06d4cd19c2424352afeaab 100644 (file)
--- a/sonar-application/build.gradle
+++ b/sonar-application/build.gradle
@@ -135,7 +135,7 @@ task zip(type: Zip, dependsOn: [configurations.compile]) {
     from file('src/main/assembly/conf/sonar.properties')
       filter(ReplaceTokens, tokens: [
               'searchDefaultHeapSize': '512MB',
-              'searchJavaOpts'       : '-Xms512m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError',
+              'searchJavaOpts'       : '-Xmx512m -Xms512m -XX:+HeapDumpOnOutOfMemoryError',
               'ceDefaultHeapSize'    : '512MB',
               'ceJavaOpts'           : '-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError',
               'webDefaultHeapSize'   : '512MB',