commit b3cb66677d88d9ca1fa1ca965d6c6140477755cb
author Daniel Kulp <dkulp@apache.org> Mon Feb 09 08:21:55 2015 -0500
committer Daniel Kulp <dkulp@apache.org> Mon Feb 09 08:21:55 2015 -0500
tree e887787019a9599b075594659dd28a1eff3380cd
parent d43e340feff06292ed8c3575b58e30d1fd487b12

Update PMD rulesets to work without warnings with latest maven-pmd-plugin and in eclipse

buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml

diff --git a/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml b/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
index 349a8cc..0967dad 100644
--- a/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
+++ b/buildtools/src/main/resources/cxf-pmd-ruleset-generated.xml
@@ -46,7 +46,7 @@
     <!--<rule ref="rulesets/java/basic.xml/EmptyCatchBlock"/>-->
     <!--<rule ref="rulesets/java/basic.xml/EmptyFinallyBlock"/>-->
     <!--<rule ref="rulesets/java/basic.xml/EmptyIfStmt"/>-->
-    <rule ref="rulesets/java/basic.xml/EmptyStatementNotInLoop"/>
+    <rule ref="rulesets/java/empty.xml/EmptyStatementNotInLoop"/>
     <!--<rule ref="rulesets/java/basic.xml/EmptyStaticInitializer"/>-->
     <!--<rule ref="rulesets/java/basic.xml/EmptySwitchStatements"/>-->
     <!--<rule ref="rulesets/java/basic.xml/EmptySynchronizedBlock"/>-->
@@ -57,9 +57,9 @@
     <!--<rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode"/>-->
     <rule ref="rulesets/java/basic.xml/ReturnFromFinallyBlock"/>
     <rule ref="rulesets/java/basic.xml/UnconditionalIfStatement"/>
-    <rule ref="rulesets/java/basic.xml/UnnecessaryConversionTemporary"/>
-    <rule ref="rulesets/java/basic.xml/UnnecessaryFinalModifier"/>
-    <rule ref="rulesets/java/basic.xml/UnnecessaryReturn"/>
+    <rule ref="rulesets/java/unnecessary.xml/UnnecessaryConversionTemporary"/>
+    <rule ref="rulesets/java/unnecessary.xml/UnnecessaryFinalModifier"/>
+    <rule ref="rulesets/java/unnecessary.xml/UnnecessaryReturn"/>
     <!--<rule ref="rulesets/java/basic.xml/UselessOverridingMethod"/>-->
 
     <!--<rule ref="rulesets/java/braces.xml/ForLoopsMustUseBraces"/>-->

buildtools/src/main/resources/cxf-pmd-ruleset.xml

diff --git a/buildtools/src/main/resources/cxf-pmd-ruleset.xml b/buildtools/src/main/resources/cxf-pmd-ruleset.xml
index afefe51..195ff96 100644
--- a/buildtools/src/main/resources/cxf-pmd-ruleset.xml
+++ b/buildtools/src/main/resources/cxf-pmd-ruleset.xml
@@ -37,7 +37,7 @@
     <!--<rule ref="rulesets/java/basic.xml/EmptyCatchBlock"/>-->
     <!--<rule ref="rulesets/java/basic.xml/EmptyFinallyBlock"/>-->
     <!--<rule ref="rulesets/java/basic.xml/EmptyIfStmt"/>-->
-    <rule ref="rulesets/java/basic.xml/EmptyStatementNotInLoop"/>
+    <rule ref="rulesets/java/empty.xml/EmptyStatementNotInLoop"/>
     <!--<rule ref="rulesets/java/basic.xml/EmptyStaticInitializer"/>-->
     <!--<rule ref="rulesets/java/basic.xml/EmptySwitchStatements"/>-->
     <!--<rule ref="rulesets/java/basic.xml/EmptySynchronizedBlock"/>-->
@@ -48,9 +48,9 @@
     <!--<rule ref="rulesets/java/basic.xml/OverrideBothEqualsAndHashcode"/>-->
     <rule ref="rulesets/java/basic.xml/ReturnFromFinallyBlock"/>
     <rule ref="rulesets/java/basic.xml/UnconditionalIfStatement"/>
-    <rule ref="rulesets/java/basic.xml/UnnecessaryConversionTemporary"/>
-    <rule ref="rulesets/java/basic.xml/UnnecessaryFinalModifier"/>
-    <rule ref="rulesets/java/basic.xml/UnnecessaryReturn"/>
+    <rule ref="rulesets/java/unnecessary.xml/UnnecessaryConversionTemporary"/>
+    <rule ref="rulesets/java/unnecessary.xml/UnnecessaryFinalModifier"/>
+    <rule ref="rulesets/java/unnecessary.xml/UnnecessaryReturn"/>
     <!--<rule ref="rulesets/java/basic.xml/UselessOverridingMethod"/>-->
 
     <!--<rule ref="rulesets/java/braces.xml/ForLoopsMustUseBraces"/>-->