Automatic merge from branch-5.5

* origin/branch-5.5:
  QA: enable deploy on branch-*
  add l10n names for reliability_rating and security_rating
  Add PropertiesDao.deleteById
  SONAR-7533 Hide sonar.login property in analysis.log sent in the scanner report
  SONAR-7238 do not display identity provider details when it is "sonarqube"
  fix bug which prevents to add a quality gate condition for "new_" metric
  SONAR-7402 clicking on project bubble brings to the project page
  Fix javadoc errors
  Exclude protobuf code from SQ analysis
  Fix some Javadoc warnings
  Improve javadoc
  Change return type of Plugin#getSonarQubeVersion()

1 files changed, 2 insertions, 3 deletions

diff --git a/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/XooPluginTest.java b/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/XooPluginTest.java
index 69cc0823895..76198a3ac70 100644
--- a/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/XooPluginTest.java
+++ b/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/XooPluginTest.java
@@ -21,7 +21,6 @@ package org.sonar.xoo;
 
 import org.junit.Test;
 import org.sonar.api.Plugin;
-import org.sonar.api.SonarQubeVersion;
 import org.sonar.api.utils.Version;
 import org.sonar.xoo.lang.CpdTokenizerSensor;
 
@@ -32,11 +31,11 @@ public class XooPluginTest {
 
   @Test
   public void provide_extensions_for_5_5() {
-    Plugin.Context context = new Plugin.Context(new SonarQubeVersion(V5_5));
+    Plugin.Context context = new Plugin.Context(V5_5);
     new XooPlugin().define(context);
     assertThat(context.getExtensions()).hasSize(39).contains(CpdTokenizerSensor.class);
 
-    context = new Plugin.Context(new SonarQubeVersion(Version.parse("5.4")));
+    context = new Plugin.Context(Version.parse("5.4"));
     new XooPlugin().define(context);
     assertThat(context.getExtensions()).hasSize(38).doesNotContain(CpdTokenizerSensor.class);
   }