SONAR-14735 Improve log message for plugins risk consent warning

diff --git a/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginConsentVerifier.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginConsentVerifier.java
index e677596b07452b451b7a6e8031f0e32a55e82c9a..494cec61a4daab17317c0c447a6ec27b44880f80 100644 (file)
--- a/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginConsentVerifier.java
+++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginConsentVerifier.java
@@ -72,7 +72,8 @@ public class PluginConsentVerifier implements Startable {
 
   private static void addWarningInSonarDotLog() {
     String highlighter = "####################################################################################################################";
-    String msg = "Plugin(s) detected. The risk associated with installing plugins has not been accepted. The SonarQube admin needs to log in and accept the risk.";
+    String msg = "Plugin(s) detected. Plugins are not provided by SonarSource and are therefore installed at your own risk."
+        + " A SonarQube administrator needs to acknowledge this risk once logged in.";
 
     LOGGER.warn(highlighter);
     LOGGER.warn(msg);

diff --git a/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginConsentVerifierTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginConsentVerifierTest.java
index 15d8dcaf3244e0a3fe1cb4d98c391e55e3e46b18..be4b1a9078a9c90005dbae727e38c6a189b67f80 100644 (file)
--- a/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginConsentVerifierTest.java
+++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginConsentVerifierTest.java
@@ -68,7 +68,8 @@ public class PluginConsentVerifierTest {
 
     underTest.start();
 
-    assertThat(logTester.logs(LoggerLevel.WARN)).contains("Plugin(s) detected. The risk associated with installing plugins has not been accepted. The SonarQube admin needs to log in and accept the risk.");
+    assertThat(logTester.logs(LoggerLevel.WARN)).contains("Plugin(s) detected. Plugins are not provided by SonarSource"
+        + " and are therefore installed at your own risk. A SonarQube administrator needs to acknowledge this risk once logged in.");
     assertThat(dbClient.propertiesDao().selectGlobalProperty(PLUGINS_RISK_CONSENT))
       .extracting(PropertyDto::getValue)
       .isEqualTo(REQUIRED.name());