From b06772b95322202f33b3e7e64b58078fdff989c3 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 18 Feb 2020 18:54:47 +0100
Subject: [PATCH] Update rulesets

* add comment for removed rules in the releases rulesets
* remove rules completely in normal rulesets
  (instead of commenting)
---
 pmd-apex/src/main/resources/rulesets/apex/style.xml   | 1 -
 pmd-core/src/main/resources/rulesets/releases/34.xml  | 2 +-
 pmd-core/src/main/resources/rulesets/releases/36.xml  | 2 +-
 pmd-core/src/main/resources/rulesets/releases/41.xml  | 2 +-
 pmd-core/src/main/resources/rulesets/releases/50.xml  | 2 +-
 pmd-core/src/main/resources/rulesets/releases/512.xml | 4 ++--
 pmd-core/src/main/resources/rulesets/releases/550.xml | 2 +-
 pmd-java/src/main/resources/rulesets/java/design.xml  | 1 -
 8 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pmd-apex/src/main/resources/rulesets/apex/style.xml b/pmd-apex/src/main/resources/rulesets/apex/style.xml
index 0e20621929..7064578fca 100644
--- a/pmd-apex/src/main/resources/rulesets/apex/style.xml
+++ b/pmd-apex/src/main/resources/rulesets/apex/style.xml
@@ -10,7 +10,6 @@ The Style Ruleset contains rules regarding preferred usage of names and identifi
 
     <rule ref="category/apex/codestyle.xml/ClassNamingConventions" deprecated="true" />
     <rule ref="category/apex/codestyle.xml/MethodNamingConventions" deprecated="true" />
-    <!--    <rule ref="category/apex/codestyle.xml/VariableNamingConventions" deprecated="true" />-->
 
     <rule ref="category/apex/errorprone.xml/AvoidDirectAccessTriggerMap" deprecated="true" />
     <rule ref="category/apex/errorprone.xml/AvoidHardcodingId" deprecated="true" />
diff --git a/pmd-core/src/main/resources/rulesets/releases/34.xml b/pmd-core/src/main/resources/rulesets/releases/34.xml
index 6bd6183f19..a3328515ae 100644
--- a/pmd-core/src/main/resources/rulesets/releases/34.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/34.xml
@@ -17,7 +17,7 @@ This ruleset contains links to rules that are new in PMD v3.4
 
   <rule ref="rulesets/java/controversial.xml/DefaultPackage"/>
 
-  <!--  <rule ref="rulesets/java/naming.xml/MisleadingVariableName"/>-->
+  <!-- Removed with 7.0.0 <rule ref="rulesets/java/naming.xml/MisleadingVariableName"/> -->
 
   <rule ref="rulesets/java/migrating.xml/ReplaceVectorWithList"/>
   <rule ref="rulesets/java/migrating.xml/ReplaceHashtableWithMap"/>
diff --git a/pmd-core/src/main/resources/rulesets/releases/36.xml b/pmd-core/src/main/resources/rulesets/releases/36.xml
index f83d3c8791..16a32f41f4 100644
--- a/pmd-core/src/main/resources/rulesets/releases/36.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/36.xml
@@ -9,7 +9,7 @@ This ruleset contains links to rules that are new in PMD v3.6
   </description>
 
   <rule ref="rulesets/java/strings.xml/InefficientEmptyStringCheck"/>
-  <!--  <rule ref="rulesets/java/design.xml/UnsynchronizedStaticDateFormatter"/>-->
+  <!-- Removed with 7.0.0 <rule ref="rulesets/java/design.xml/UnsynchronizedStaticDateFormatter"/>-->
   <rule ref="rulesets/java/strings.xml/InsufficientStringBufferDeclaration"/>
   <rule ref="rulesets/java/junit.xml/SimplifyBooleanAssertion"/>
   <rule ref="rulesets/java/basic.xml/AvoidThreadGroup"/>
diff --git a/pmd-core/src/main/resources/rulesets/releases/41.xml b/pmd-core/src/main/resources/rulesets/releases/41.xml
index b6819f114c..50a9b1277b 100644
--- a/pmd-core/src/main/resources/rulesets/releases/41.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/41.xml
@@ -11,7 +11,7 @@ This ruleset contains links to rules that are new in PMD v4.1
   <rule ref="rulesets/java/basic.xml/AvoidUsingHardCodedIP"/>
   <rule ref="rulesets/java/basic.xml/CheckResultSet"/>
   <rule ref="rulesets/java/controversial.xml/AvoidAccessibilityAlteration"/>
-  <!--  <rule ref="rulesets/java/controversial.xml/AvoidFinalLocalVariable"/>-->
+  <!-- Removed with 7.0.0 <rule ref="rulesets/java/controversial.xml/AvoidFinalLocalVariable"/>-->
   <rule ref="rulesets/java/controversial.xml/AvoidUsingNativeCode"/>
   <rule ref="rulesets/java/controversial.xml/AvoidUsingShortType"/>
   <rule ref="rulesets/java/controversial.xml/AvoidUsingVolatile"/>
diff --git a/pmd-core/src/main/resources/rulesets/releases/50.xml b/pmd-core/src/main/resources/rulesets/releases/50.xml
index e98718a9a2..d612ceac00 100644
--- a/pmd-core/src/main/resources/rulesets/releases/50.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/50.xml
@@ -25,7 +25,7 @@ This ruleset contains links to rules that are new in PMD v5.0
 	<rule ref="rulesets/java/android.xml/CallSuperLast"/>
 	<rule ref="rulesets/java/basic.xml/CheckSkipResult"/>
 	<rule ref="rulesets/java/basic.xml/ExtendsObject"/>
-<!--	<rule ref="rulesets/java/controversial.xml/AvoidPrefixingMethodParameters"/>-->
+<!-- Removed with 7.0.0 <rule ref="rulesets/java/controversial.xml/AvoidPrefixingMethodParameters"/>-->
 	<rule ref="rulesets/java/controversial.xml/AvoidLiteralsInIfCondition"/>
 	<rule ref="rulesets/java/controversial.xml/OneDeclarationPerLine"/>
   	<rule ref="rulesets/java/coupling.xml/LoosePackageCoupling"/>
diff --git a/pmd-core/src/main/resources/rulesets/releases/512.xml b/pmd-core/src/main/resources/rulesets/releases/512.xml
index ca15347b4b..234204bbf4 100644
--- a/pmd-core/src/main/resources/rulesets/releases/512.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/512.xml
@@ -8,8 +8,8 @@
 This ruleset contains links to rules that are new in PMD v5.1.2
   </description>
 
-<!--    <rule ref="rulesets/java/codesize.xml/StdCyclomaticComplexity"/>-->
-<!--    <rule ref="rulesets/java/codesize.xml/ModifiedCyclomaticComplexity"/>-->
+<!-- Removed with 7.0.0 <rule ref="rulesets/java/codesize.xml/StdCyclomaticComplexity"/>-->
+<!-- Removed with 7.0.0 <rule ref="rulesets/java/codesize.xml/ModifiedCyclomaticComplexity"/>-->
 
 </ruleset>
 
diff --git a/pmd-core/src/main/resources/rulesets/releases/550.xml b/pmd-core/src/main/resources/rulesets/releases/550.xml
index a3df927ec1..5fb17c056b 100644
--- a/pmd-core/src/main/resources/rulesets/releases/550.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/550.xml
@@ -22,7 +22,7 @@ This ruleset contains links to rules that are new in PMD v5.5.0
     <rule ref="rulesets/apex/complexity.xml/ExcessivePublicCount" />
     <rule ref="rulesets/apex/performance.xml/AvoidDmlStatementsInLoops" />
     <rule ref="rulesets/apex/performance.xml/AvoidSoqlInLoops" />
-<!--    <rule ref="rulesets/apex/style.xml/VariableNamingConventions" />-->
+<!-- Removed with 7.0.0 <rule ref="rulesets/apex/style.xml/VariableNamingConventions" />-->
     <rule ref="rulesets/apex/style.xml/MethodNamingConventions" />
     <rule ref="rulesets/apex/style.xml/ClassNamingConventions" />
     <rule ref="rulesets/apex/style.xml/MethodWithSameNameAsEnclosingClass" />
diff --git a/pmd-java/src/main/resources/rulesets/java/design.xml b/pmd-java/src/main/resources/rulesets/java/design.xml
index 8e1b2de0f9..bef304b2e6 100644
--- a/pmd-java/src/main/resources/rulesets/java/design.xml
+++ b/pmd-java/src/main/resources/rulesets/java/design.xml
@@ -54,7 +54,6 @@ are suggested.
 
     <rule ref="category/java/multithreading.xml/AvoidSynchronizedAtMethodLevel" deprecated="true" />
     <rule ref="category/java/multithreading.xml/NonThreadSafeSingleton" deprecated="true" />
-    <!--    <rule ref="category/java/multithreading.xml/UnsynchronizedStaticDateFormatter" deprecated="true" />-->
     <rule ref="category/java/multithreading.xml/UseNotifyAllInsteadOfNotify" deprecated="true" />
 
     <rule ref="category/java/bestpractices.xml/AbstractClassWithoutAbstractMethod" deprecated="true" />