From ed2d166a34e2a0a4796f7bfc15ba1e2cc44fa3f4 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 13 Mar 2021 14:15:50 +0000
Subject: [PATCH] Remove deprecated rules and some codestyle rules (#23)

* Disable some rules

* Raise max method count to 20

* Update Changelog

* Remove deprecated rules

* Version set to 1.2.0
---
 CHANGELOG.org                               | 18 ++++++++++++++++++
 pom.xml                                     |  2 +-
 src/main/resources/net/kemitix/pmd/java.xml | 19 +++++--------------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 5fc7f5a..23ce383 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -6,6 +6,24 @@
   Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
   [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+* 1.2.0
+
+** Changed
+
+  * TooManyMethods - threshold raised from 10 to 20
+
+** Removed
+
+   - PositionLiteralsFirstInCaseInsensitiveComparisons
+   - PositionLiteralsFirstInComparisons
+   - DataflowAnomalyAnalysis
+   - CommentDefaultAccessModifier
+   - DefaultPackage
+   - OnlyOneReturn
+   - ShortClassName
+   - ShortMethodName
+   - ShortVariable
+
 * 1.1.0
 
 ** Changed
diff --git a/pom.xml b/pom.xml
index d60fe0c..ff4becc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <artifactId>kemitix-pmd-ruleset</artifactId>
-    <version>DEV-SNAPSHOT</version>
+    <version>1.2.0</version>
 
     <name>Kemitix PMD Ruleset</name>
     <description>Kemitix PMD Ruleset for Java</description>
diff --git a/src/main/resources/net/kemitix/pmd/java.xml b/src/main/resources/net/kemitix/pmd/java.xml
index 37534e2..d28521a 100644
--- a/src/main/resources/net/kemitix/pmd/java.xml
+++ b/src/main/resources/net/kemitix/pmd/java.xml
@@ -41,8 +41,6 @@ http://pmd.sourceforge.net/ruleset/2.0.0 ">
             <property name="strictMode" value="true"/>
         </properties>
     </rule>
-    <rule ref="category/java/bestpractices.xml/PositionLiteralsFirstInCaseInsensitiveComparisons"/>
-    <rule ref="category/java/bestpractices.xml/PositionLiteralsFirstInComparisons"/>
     <rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
     <rule ref="category/java/bestpractices.xml/ReplaceEnumerationWithIterator"/>
     <rule ref="category/java/bestpractices.xml/ReplaceHashtableWithMap"/>
@@ -80,9 +78,7 @@ http://pmd.sourceforge.net/ruleset/2.0.0 ">
     </rule>
     <rule ref="category/java/codestyle.xml/CallSuperInConstructor"/>
     <rule ref="category/java/codestyle.xml/ClassNamingConventions"/>
-    <rule ref="category/java/codestyle.xml/CommentDefaultAccessModifier"/>
     <rule ref="category/java/codestyle.xml/ConfusingTernary"/>
-    <rule ref="category/java/codestyle.xml/DefaultPackage"/>
     <rule ref="category/java/codestyle.xml/DontImportJavaLang"/>
     <rule ref="category/java/codestyle.xml/DuplicateImports"/>
     <rule ref="category/java/codestyle.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
@@ -102,12 +98,8 @@ http://pmd.sourceforge.net/ruleset/2.0.0 ">
     <rule ref="category/java/codestyle.xml/MethodArgumentCouldBeFinal"/>
     <rule ref="category/java/codestyle.xml/MethodNamingConventions"/>
     <rule ref="category/java/codestyle.xml/NoPackage"/>
-    <rule ref="category/java/codestyle.xml/OnlyOneReturn"/>
     <rule ref="category/java/codestyle.xml/PackageCase"/>
     <rule ref="category/java/codestyle.xml/PrematureDeclaration"/>
-    <rule ref="category/java/codestyle.xml/ShortClassName"/>
-    <rule ref="category/java/codestyle.xml/ShortMethodName"/>
-    <rule ref="category/java/codestyle.xml/ShortVariable"/>
     <rule ref="category/java/codestyle.xml/TooManyStaticImports"/><!-- to review -->
     <rule ref="category/java/codestyle.xml/UnnecessaryConstructor"/>
     <rule ref="category/java/codestyle.xml/UnnecessaryFullyQualifiedName"/>
@@ -178,7 +170,11 @@ http://pmd.sourceforge.net/ruleset/2.0.0 ">
     <rule ref="category/java/design.xml/SingularField"/>
     <rule ref="category/java/design.xml/SwitchDensity"/>
     <rule ref="category/java/design.xml/TooManyFields"/>
-    <rule ref="category/java/design.xml/TooManyMethods"/>
+    <rule ref="category/java/design.xml/TooManyMethods">
+        <properties>
+            <property name="maxmethods" value="20" />
+        </properties>
+    </rule>
     <rule ref="category/java/design.xml/UselessOverridingMethod"/>
     <rule ref="category/java/design.xml/UseObjectForClearerAPI"/>
     <rule ref="category/java/design.xml/UseUtilityClass"/>
@@ -230,11 +226,6 @@ http://pmd.sourceforge.net/ruleset/2.0.0 ">
     <rule ref="category/java/errorprone.xml/CloseResource"/>
     <rule ref="category/java/errorprone.xml/CompareObjectsWithEquals"/>
     <rule ref="category/java/errorprone.xml/ConstructorCallsOverridableMethod"/>
-    <rule ref="category/java/errorprone.xml/DataflowAnomalyAnalysis">
-        <properties>
-            <property name="maxViolations" value="1"/>
-        </properties>
-    </rule>
     <rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
     <rule ref="category/java/errorprone.xml/DoNotCallSystemExit"/>
     <rule ref="category/java/errorprone.xml/DoNotExtendJavaLangThrowable"/>