Merge branch 'branch-6.7'

diff --cc server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
index 957375812d082772c11fc71f0ddcd02f2c111a6b,22cc745f8405ecd3b98eca4537c79e7c5077fbcc..b585954a785699760d324f59d8cb059abc9ac183
--- 1/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
--- 2/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java
@@@ -46,11 -44,10 +46,12 @@@ import org.sonar.db.RowNotFoundExceptio
  import org.sonar.db.es.RuleExtensionId;
  import org.sonar.db.organization.OrganizationDto;
  import org.sonar.db.organization.OrganizationTesting;
 +import org.sonar.db.rule.RuleDto.Scope;
  
+ import static com.google.common.collect.ImmutableSet.of;
  import static com.google.common.collect.Sets.newHashSet;
  import static java.util.Arrays.asList;
 +import static java.util.Collections.emptyList;
  import static java.util.Collections.singletonList;
  import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
  import static org.assertj.core.api.Assertions.assertThat;

diff --cc server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDbTester.java
Simple merge

diff --cc server/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java
index bed8c761474be6805191d472935dd9e08b3c6845,36a25efd1cacfac0b7f7edc3a1c94cd98bcc3bde..da5e850067ef57ca3344193ed07462fa1341be5b
--- 1/server/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java
--- 2/server/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/CachingRuleFinder.java
@@@ -174,7 -175,9 +174,8 @@@ public class CachingRuleFinder implemen
        .setRepositoryKey(ruleDefinition.getRepositoryKey())
        .setSeverity(severity != null ? RulePriority.valueOf(severity) : null)
        .setStatus(ruleDefinition.getStatus().name())
-       .setTags(ruleDefinition.getSystemTags().toArray(new String[ruleDefinition.getSystemTags().size()]))
 -      .setSystemTags(systemTags)
 -      // FIXME tags should contain user defined tags and we can't provide them without organization => tags should return []
 -      .setTags(systemTags)
++      .setSystemTags(ruleDefinition.getSystemTags().toArray(new String[ruleDefinition.getSystemTags().size()]))
++      .setTags(new String[0])
        .setId(ruleDefinition.getId());
      if (description != null && descriptionFormat != null) {
        if (RuleDto.Format.HTML.equals(descriptionFormat)) {

diff --cc server/sonar-server/src/main/java/org/sonar/server/rule/DefaultRuleFinder.java
Simple merge

diff --cc server/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java
index 7bc6af5db4246eb4375d0758df7a0f0b31a27c7a,b4e7bf3a9bc0c486bef7ff817fc931f55d332bdf..ee0287a318a830f25df56fe2fd96873eb62c5313
--- 1/server/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java
--- 2/server/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/CachingRuleFinderTest.java
@@@ -408,7 -408,9 +408,8 @@@ public class CachingRuleFinderTest 
      assertThat(rule.getUpdatedAt().getTime()).isEqualTo(ruleDefinition.getUpdatedAt());
      assertThat(rule.getRepositoryKey()).isEqualTo(ruleDefinition.getRepositoryKey());
      assertThat(rule.getSeverity().name()).isEqualTo(ruleDefinition.getSeverityString());
-     assertThat(rule.getTags()).isEqualTo(ruleDefinition.getSystemTags().stream().toArray(String[]::new));
 -    String[] systemTags = ruleDefinition.getSystemTags().stream().toArray(String[]::new);
 -    assertThat(rule.getSystemTags()).isEqualTo(systemTags);
 -    assertThat(rule.getTags()).isEqualTo(systemTags);
++    assertThat(rule.getSystemTags()).isEqualTo(ruleDefinition.getSystemTags().stream().toArray(String[]::new));
++    assertThat(rule.getTags()).isEmpty();
      assertThat(rule.getId()).isEqualTo(ruleDefinition.getId());
      assertThat(rule.getDescription()).isEqualTo(ruleDefinition.getDescription());
  

diff --cc server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java
index 3727eea253e94dfa007cc86e487e9144001eca2b,138d653586165ccfabff06872a675eccf425cac4..a8e8f668d82b18900e0deb035302ea14de602e42
--- 1/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java
--- 2/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/rule/DefaultRuleFinderTest.java
@@@ -28,8 -29,9 +29,10 @@@ import org.sonar.api.utils.System2
  import org.sonar.db.DbClient;
  import org.sonar.db.DbSession;
  import org.sonar.db.DbTester;
+ import org.sonar.db.organization.OrganizationDto;
+ import org.sonar.db.rule.RuleDefinitionDto;
  import org.sonar.db.rule.RuleDto;
 +import org.sonar.db.rule.RuleDto.Scope;
  import org.sonar.server.organization.DefaultOrganizationProvider;
  import org.sonar.server.organization.TestDefaultOrganizationProvider;
  

diff --cc sonar-plugin-api/src/main/java/org/sonar/api/rules/Rule.java
Simple merge