SONAR-4655 Move CPD exclusions settings to dedicated subcategory of Exclusions

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index cd843c9ff80cb713789029bc2a0bf6f878dc819e..54dfc755f6e710d0ab3068e1089ca4b8cc05ea56 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -822,6 +822,8 @@ property.sonar.includedModules.description=Comma-separated list of the modules t
  If a module's artifactId differs from its module name (the directory name): it is the artifactId that should be use instead of the module name.
 property.category.exclusions.issues=Issues
 property.category.exclusions.issues.description=Configure which issues should not be reported.
+property.category.exclusions.duplications=Duplications
+property.category.exclusions.duplications.description=Configure files which should not be checked for duplicated code
 property.error.notBoolean=Valid options are "true" and "false"
 property.error.notInteger=Only digits are allowed
 property.error.notFloat=Not a floating point number

diff --git a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
index 72d474afbf0f5f854cec6d663a984ed0e4e39d3e..d4b7a55386390aa6ae52273b65eafe9b0c22085b 100644 (file)
--- a/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
+++ b/plugins/sonar-cpd-plugin/src/main/java/org/sonar/plugins/cpd/CpdPlugin.java
@@ -33,7 +33,7 @@ import java.util.List;
 
 public final class CpdPlugin extends SonarPlugin {
 
-  public List getExtensions() {
+  public List<?> getExtensions() {
     return ImmutableList.of(
       PropertyDefinition.builder(CoreProperties.CPD_CROSS_RPOJECT)
         .defaultValue(CoreProperties.CPD_CROSS_RPOJECT_DEFAULT_VALUE + "")
@@ -57,7 +57,8 @@ public final class CpdPlugin extends SonarPlugin {
         .description("Patterns used to exclude some source files from the duplication detection mechanism. " +
           "See the \"Exclusions\" category to know how to use wildcards to specify this property.")
         .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE)
-        .category(CoreProperties.CATEGORY_DUPLICATIONS)
+        .category(CoreProperties.CATEGORY_EXCLUSIONS)
+        .subCategory(CoreProperties.SUBCATEGORY_DUPLICATIONS_EXCLUSIONS)
         .multiValues(true)
         .build(),
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
index b741be03da089d9e30dc2c3a8254668e89227d96..124f0c08e5a775ae94eb2f4a4f98f98b8f083995 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/CoreProperties.java
@@ -76,6 +76,7 @@ public interface CoreProperties {
    * @since 4.0
    */
   String SUBCATEGORY_FILES_EXCLUSIONS = "files";
+  String SUBCATEGORY_DUPLICATIONS_EXCLUSIONS = "duplications";
 
   /**
    * @since 3.7