SONAR-3810 Upgrade to Checkstyle 5.6

DoubleCheckedLockingCheck removed.

diff --git a/plugins/sonar-checkstyle-plugin/pom.xml b/plugins/sonar-checkstyle-plugin/pom.xml
index 37c1d24b598739013e09c4e6a706ef14f049209d..2a87a0c35c3d79332f26a3c0a8ee31f26810779b 100644 (file)
--- a/plugins/sonar-checkstyle-plugin/pom.xml
+++ b/plugins/sonar-checkstyle-plugin/pom.xml
@@ -15,7 +15,7 @@
   </description>
 
   <properties>
-    <checkstyle.version>5.5</checkstyle.version>
+    <checkstyle.version>5.6</checkstyle.version>
   </properties>
 
   <dependencies>

diff --git a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
index 1f14b18cdd7312776bc6601e252efcc2c80c5d0e..1a4c4adcd372e177ed774fb66706bba8329f16b5 100644 (file)
--- a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
+++ b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/l10n/checkstyle.properties
@@ -148,7 +148,6 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeChe
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.NPathComplexityCheck.name=NPath Complexity
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.NPathComplexityCheck.param.max=the maximum threshold allowed. Default is 200.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck.name=Simplify Boolean Return
-rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck.name=Double Checked Locking
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.CyclomaticComplexityCheck.name=Cyclomatic Complexity
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.metrics.CyclomaticComplexityCheck.param.max=the maximum threshold allowed. Default is 10.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck.name=Annotation Use Style

diff --git a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/l10n/checkstyle/rules/checkstyle/com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck.html b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/l10n/checkstyle/rules/checkstyle/com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck.html
deleted file mode 100644 (file)
index 08da5a1..0000000
--- a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/l10n/checkstyle/rules/checkstyle/com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck.html
+++ /dev/null
@@ -1 +0,0 @@
-Detect the double-checked locking idiom, a technique that tries to avoid synchronization overhead but is incorrect because of subtle artifacts of the java memory model.
\ No newline at end of file

diff --git a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/profile-sonar-way.xml b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/profile-sonar-way.xml
index 3edfba5d493066bcd0e2fd88c9940f44b2a4080a..70b881c4b266fffc63b7c787e0243f29de8cf330 100644 (file)
--- a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/profile-sonar-way.xml
+++ b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/profile-sonar-way.xml
@@ -38,10 +38,6 @@
       <repositoryKey>checkstyle</repositoryKey>
       <key>com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck</key>
     </rule>
-    <rule>
-      <repositoryKey>checkstyle</repositoryKey>
-      <key>com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck</key>
-    </rule>
     <rule>
       <repositoryKey>checkstyle</repositoryKey>
       <key>com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck</key>

diff --git a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/profile-sun-conventions.xml b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/profile-sun-conventions.xml
index e987174d78dca62706f48e26d27238b37a609f5a..75e32602b292529928076e04cf74237086c41a0f 100644 (file)
--- a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/profile-sun-conventions.xml
+++ b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/profile-sun-conventions.xml
@@ -184,10 +184,6 @@
         </parameter>
       </parameters>
     </rule>
-    <rule>
-      <repositoryKey>checkstyle</repositoryKey>
-      <key>com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck</key>
-    </rule>
     <rule>
       <repositoryKey>checkstyle</repositoryKey>
       <key>com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck</key>

diff --git a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
index 6e9b9e608cb55d58114ed0ce1a5e31e538e541a5..4d48d0cdc49c1433d469a440cc0241a2dda867db 100644 (file)
--- a/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
+++ b/plugins/sonar-checkstyle-plugin/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
@@ -349,12 +349,6 @@
     <configKey><![CDATA[Checker/TreeWalker/DesignForExtension]]></configKey>
   </rule>
 
-  <rule key="com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck">
-    <priority>MAJOR</priority>
-    <name><![CDATA[Double Checked Locking]]></name>
-    <configKey><![CDATA[Checker/TreeWalker/DoubleCheckedLocking]]></configKey>
-  </rule>
-
   <rule key="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck">
     <priority>MAJOR</priority>
     <name><![CDATA[Empty Block]]></name>

diff --git a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleRuleRepositoryTest.java b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleRuleRepositoryTest.java
index 9c6daac1e045287117400f915c2074f4e5304181..387815fe9bbf8f3220849d95b1346ff75895fcb2 100644 (file)
--- a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleRuleRepositoryTest.java
+++ b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleRuleRepositoryTest.java
@@ -44,7 +44,7 @@ public class CheckstyleRuleRepositoryTest {
     List<Rule> rules = repository.createRules();
 
     assertThat(repository.getKey()).isEqualTo("checkstyle");
-    assertThat(rules.size()).isEqualTo(129);
+    assertThat(rules.size()).isEqualTo(128);
   }
 
   @Test

diff --git a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/SonarWayProfileTest.java b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/SonarWayProfileTest.java
index 2631ba5db86a1fc737b5eb11384f555c2366e94f..29c69ed9244495624ff7555e36dac1bc682d48e6 100644 (file)
--- a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/SonarWayProfileTest.java
+++ b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/SonarWayProfileTest.java
@@ -42,7 +42,7 @@ public class SonarWayProfileTest {
     ProfileDefinition sonarWay = new SonarWayProfile(new XMLProfileParser(newRuleFinder(), mock(MetricFinder.class)));
     ValidationMessages validation = ValidationMessages.create();
     RulesProfile profile = sonarWay.createProfile(validation);
-    assertThat(profile.getActiveRulesByRepository(CheckstyleConstants.REPOSITORY_KEY).size()).isEqualTo(33);
+    assertThat(profile.getActiveRulesByRepository(CheckstyleConstants.REPOSITORY_KEY).size()).isEqualTo(32);
     assertThat(validation.hasErrors()).isFalse();
   }
 

diff --git a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/SunConventionsProfileTest.java b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/SunConventionsProfileTest.java
index dc49069e45e8353659c76c5cbe7e20765ac8f233..6ec39c4933f021f70e5ac2652f9ae37488a2a23e 100644 (file)
--- a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/SunConventionsProfileTest.java
+++ b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/SunConventionsProfileTest.java
@@ -42,7 +42,7 @@ public class SunConventionsProfileTest {
     ProfileDefinition definition = new SunConventionsProfile(new XMLProfileParser(newRuleFinder(), mock(MetricFinder.class)));
     ValidationMessages validation = ValidationMessages.create();
     RulesProfile sunProfile = definition.createProfile(validation);
-    assertThat(sunProfile.getActiveRulesByRepository(CheckstyleConstants.REPOSITORY_KEY).size()).isEqualTo(59);
+    assertThat(sunProfile.getActiveRulesByRepository(CheckstyleConstants.REPOSITORY_KEY).size()).isEqualTo(58);
     assertThat(validation.hasErrors()).isFalse();
   }