Merge pull request #10 from mweirauch/basepom_update

Basepom update
mweirauch · Jun 27, 2017 · 2c1162a · 2c1162a
2 parents 7381d38 + 351926a
commit 2c1162a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.basepom</groupId>
         <artifactId>basepom-oss</artifactId>
-        <version>19</version>
+        <version>23</version>
     </parent>
 
     <groupId>io.github.mweirauch</groupId>
@@ -53,7 +53,7 @@
 
     <properties>
         <ignored-checkstyles />
-        <dep.pmd.version>5.5.1</dep.pmd.version>
+        <dep.pmd.version>5.6.1</dep.pmd.version>
     </properties>
 
     <dependencies>
@@ -77,13 +77,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.7.18</version>
+            <version>2.8.47</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava-testlib</artifactId>
-            <version>21.0</version>
+            <version>22.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/src/build/resources/pmd-ruleset.xml b/src/build/resources/pmd-ruleset.xml
@@ -161,7 +161,6 @@
     <rule ref="rulesets/java/design.xml/AbstractClassWithoutAnyMethod" />
     <rule ref="rulesets/java/design.xml/AccessorClassGeneration" />
     <rule ref="rulesets/java/design.xml/AssignmentToNonFinalStatic" />
-    <rule ref="rulesets/java/design.xml/AvoidConstantsInterface" />
     <rule ref="rulesets/java/design.xml/AvoidDeeplyNestedIfStmts" />
     <rule ref="rulesets/java/design.xml/AvoidInstanceofChecksInCatchClause" />
     <rule ref="rulesets/java/design.xml/AvoidProtectedFieldInFinalClass" />
@@ -175,7 +174,7 @@
     <rule ref="rulesets/java/design.xml/CloseResource" />
     <rule ref="rulesets/java/design.xml/CompareObjectsWithEquals" />
     <rule ref="rulesets/java/design.xml/ConfusingTernary" />
-    <!-- <rule ref="rulesets/java/design.xml/ConstantsInInterface" /> -->
+    <rule ref="rulesets/java/design.xml/ConstantsInInterface" />
     <rule ref="rulesets/java/design.xml/ConstructorCallsOverridableMethod" />
     <rule ref="rulesets/java/design.xml/DefaultLabelNotLastInSwitchStmt" />
     <rule
@@ -423,6 +422,7 @@
         /> -->
     <rule ref="rulesets/java/unnecessary.xml/UnnecessaryConversionTemporary" />
     <rule ref="rulesets/java/unnecessary.xml/UnnecessaryFinalModifier" />
+    <rule ref="rulesets/java/unnecessary.xml/UnnecessaryModifier" />
     <!-- <rule ref="rulesets/ecmascript/unnecessary.xml/UnnecessaryParentheses"
         /> -->
     <rule ref="rulesets/java/unnecessary.xml/UnnecessaryReturn" />
@@ -433,7 +433,6 @@
     <rule ref="rulesets/java/unnecessary.xml/UselessQualifiedThis" />
     <rule ref="rulesets/java/unusedcode.xml/UnusedFormalParameter" />
     <rule ref="rulesets/java/unusedcode.xml/UnusedLocalVariable" />
-    <rule ref="rulesets/java/unusedcode.xml/UnusedModifier" />
     <rule ref="rulesets/java/unusedcode.xml/UnusedPrivateField" />
     <rule ref="rulesets/java/unusedcode.xml/UnusedPrivateMethod" />
     <!-- <rule ref="rulesets/xsl/xpath.xml/AvoidAxisNavigation" /> -->