diff --git a/checkstyle-sonar-plugin/config/pmd-main.xml b/checkstyle-sonar-plugin/config/pmd-main.xml new file mode 100644 index 00000000..9eb2deb3 --- /dev/null +++ b/checkstyle-sonar-plugin/config/pmd-main.xml @@ -0,0 +1,20 @@ + + + + PMD ruleset for Checkstyle main code (copy from main repo) + + .*/src/test/.* + + + + + + + + + + diff --git a/checkstyle-sonar-plugin/config/pmd-test.xml b/checkstyle-sonar-plugin/config/pmd-test.xml new file mode 100644 index 00000000..d57077ce --- /dev/null +++ b/checkstyle-sonar-plugin/config/pmd-test.xml @@ -0,0 +1,73 @@ + + + + PMD ruleset for Checkstyle tests (copy from main repo) + + .*/src/main/.* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/checkstyle-sonar-plugin/config/pmd.xml b/checkstyle-sonar-plugin/config/pmd.xml index c3896510..558dbcf0 100644 --- a/checkstyle-sonar-plugin/config/pmd.xml +++ b/checkstyle-sonar-plugin/config/pmd.xml @@ -3,248 +3,158 @@ xmlns="http://pmd.sourceforge.net/ruleset/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 - http://pmd.sourceforge.net/ruleset_2_0_0.xsd"> + http://pmd.sourceforge.net/ruleset_2_0_0.xsd"> - PMD ruleset for Checkstyle (copy from main repo) + PMD common ruleset for Checkstyle main/test sourcesets (copy from main repo) - - - - - - - - - - - - - - - - gnature - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - + + - - - - - - - - + + - - - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + - - + + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + - + + + + + - - - - - - - - - - - - - - - - - - - + + + - - + + - - - - - + - - - - - - - - - - - - - - - - - - - + + + + Fields, local variables, or parameter names that are very short are not helpful to the reader. + + 3 + + + + + + - - - diff --git a/checkstyle-sonar-plugin/pom.xml b/checkstyle-sonar-plugin/pom.xml index 7ff39ebc..f957baa4 100644 --- a/checkstyle-sonar-plugin/pom.xml +++ b/checkstyle-sonar-plugin/pom.xml @@ -217,17 +217,18 @@ org.apache.maven.plugins maven-pmd-plugin - 3.7 + 3.10.0 + false ${java.version} 20 false true true - false true - config/pmd.xml + config/pmd-main.xml + config/pmd-test.xml @@ -237,6 +238,28 @@ + + + net.sourceforge.pmd + pmd-java + 6.6.0 + + + net.sourceforge.pmd + pmd-core + 6.6.0 + + + net.sourceforge.pmd + pmd-javascript + 6.6.0 + + + net.sourceforge.pmd + pmd-jsp + 6.6.0 + + org.codehaus.mojo