SONAR-9773 improve warning message in generated ES jvm.options file

diff --git a/server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java b/server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java
index 61760016d2e558147cfbe429362275ac519a67c7..eddf98b4ef07abb796dedc113966d673f3c92436 100644 (file)
--- a/server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/jmvoptions/EsJvmOptions.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 
 public class EsJvmOptions extends JvmOptions<EsJvmOptions> {
   private static final String ELASTICSEARCH_JVM_OPTIONS_HEADER = "# This file has been automatically generated by SonarQube during startup.\n" +
-    "# Please use the sonar.search.javaOpts in sonar.properties to specify jvm options for Elasticsearch\n" +
+    "# Please use sonar.search.javaOpts and/or sonar.search.javaAdditionalOpts in sonar.properties to specify jvm options for Elasticsearch\n" +
     "\n" +
     "# DO NOT EDIT THIS FILE\n" +
     "\n";

diff --git a/server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java b/server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java
index 5f4ef878875426d064b310e9a1ec0d36fa861a06..dd47b1100a6cf72d2848ba4e5429c0bf07c7ff28 100644 (file)
--- a/server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java
@@ -69,7 +69,7 @@ public class EsJvmOptionsTest {
 
     assertThat(file).hasContent(
       "# This file has been automatically generated by SonarQube during startup.\n" +
-        "# Please use the sonar.search.javaOpts in sonar.properties to specify jvm options for Elasticsearch\n" +
+        "# Please use sonar.search.javaOpts and/or sonar.search.javaAdditionalOpts in sonar.properties to specify jvm options for Elasticsearch\n" +
         "\n" +
         "# DO NOT EDIT THIS FILE\n" +
         "\n" +