SONAR-3644 Remove deprecation declarations in configuration

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/Constants.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/Constants.java
index 632d038d1bdc0d2309fc64608a317a0b78612a53..f32528033064cd70cf9dcd595bd433a627def9d0 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/Constants.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/Constants.java
@@ -25,23 +25,19 @@ public interface Constants {
   String SUB_CATEGORY_IGNORE_ISSUES = "Ignore Issues";
 
   String CORE_KEY_PREFIX = "sonar.issue.ignore";
-  String DEPRECATED_PLUGIN_KEY_PREFIX = "sonar.switchoffviolations";
 
   String MULTICRITERIA_SUFFIX = ".multicriteria";
   String PATTERNS_MULTICRITERIA_KEY = CORE_KEY_PREFIX + MULTICRITERIA_SUFFIX;
-  String DEPRECATED_MULTICRITERIA_KEY = DEPRECATED_PLUGIN_KEY_PREFIX + MULTICRITERIA_SUFFIX;
   String RESOURCE_KEY = "resourceKey";
   String RULE_KEY = "ruleKey";
   String LINE_RANGE_KEY = "lineRange";
 
   String BLOCK_SUFFIX = ".block";
   String PATTERNS_BLOCK_KEY = CORE_KEY_PREFIX + BLOCK_SUFFIX;
-  String DEPRECATED_BLOCK_KEY = DEPRECATED_PLUGIN_KEY_PREFIX + BLOCK_SUFFIX;
   String BEGIN_BLOCK_REGEXP = "beginBlockRegexp";
   String END_BLOCK_REGEXP = "endBlockRegexp";
 
   String ALLFILE_SUFFIX = ".allfile";
   String PATTERNS_ALLFILE_KEY = CORE_KEY_PREFIX + ALLFILE_SUFFIX;
-  String DEPRECATED_ALLFILE_KEY = DEPRECATED_PLUGIN_KEY_PREFIX + ALLFILE_SUFFIX;
   String FILE_REGEXP = "fileRegexp";
 }

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesConfiguration.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesConfiguration.java
index e09370c404f40b711d657aaa8abbd6cccd10fbf0..abb87bf5352fb3c373fd4efa13b0b779ab30622a 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesConfiguration.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/IgnoreIssuesConfiguration.java
@@ -42,7 +42,6 @@ public final class IgnoreIssuesConfiguration {
       PropertyDefinition.builder(Constants.PATTERNS_MULTICRITERIA_KEY)
         .category(CoreProperties.CATEGORY_EXCLUSIONS)
         .subCategory(Constants.SUB_CATEGORY_IGNORE_ISSUES)
-        .deprecatedKey(Constants.DEPRECATED_MULTICRITERIA_KEY)
         .name("Resource Key Pattern")
         .description("Patterns used to identify which violations to switch off.<br/>" +
           "More information on the <a href=\"http://docs.codehaus.org/display/SONAR/Project+Administration#ProjectAdministration-IgnoringIssues\">Project Administration page</a>.<br/>")
@@ -70,7 +69,6 @@ public final class IgnoreIssuesConfiguration {
         PropertyDefinition.builder(Constants.PATTERNS_BLOCK_KEY)
         .category(CoreProperties.CATEGORY_EXCLUSIONS)
         .subCategory(Constants.SUB_CATEGORY_IGNORE_ISSUES)
-        .deprecatedKey(Constants.DEPRECATED_BLOCK_KEY)
         .name("Block exclusion patterns")
         .description("Patterns used to identify blocks in which violations are switched off.<br/>" +
           "More information on the <a href=\"http://docs.codehaus.org/display/SONAR/Project+Administration#ProjectAdministration-IgnoringIssues\">Project Administration page</a>.<br/>")
@@ -92,7 +90,6 @@ public final class IgnoreIssuesConfiguration {
         PropertyDefinition.builder(Constants.PATTERNS_ALLFILE_KEY)
         .category(CoreProperties.CATEGORY_EXCLUSIONS)
         .subCategory(Constants.SUB_CATEGORY_IGNORE_ISSUES)
-        .deprecatedKey(Constants.DEPRECATED_ALLFILE_KEY)
         .name("File exclusion patterns")
         .description("Patterns used to identify files in which violations are switched off.<br/>" +
           "More information on the <a href=\"http://docs.codehaus.org/display/SONAR/Project+Administration#ProjectAdministration-IgnoringIssues\">Project Administration page</a>.<br/>")