From a7a788a9d1f340b35a7248a886948487524b66c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Mon, 11 Sep 2017 16:41:27 +0200 Subject: [PATCH] SONAR-9773 improve warning message in generated ES jvm.options file --- .../main/java/org/sonar/process/jmvoptions/EsJvmOptions.java | 2 +- .../java/org/sonar/process/jmvoptions/EsJvmOptionsTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 61760016d2e..eddf98b4ef0 100644 --- 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 { 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 5f4ef878875..dd47b1100a6 100644 --- 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" + -- 2.39.5