diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml index 5a60f1e785..a9fec4a315 100644 --- a/pmd-cpp/pom.xml +++ b/pmd-cpp/pom.xml @@ -10,6 +10,10 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + @@ -63,25 +67,6 @@ - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - org.apache.maven.plugins maven-site-plugin diff --git a/pmd-dist/pom.xml b/pmd-dist/pom.xml index 42203d5ccf..637e52cc36 100644 --- a/pmd-dist/pom.xml +++ b/pmd-dist/pom.xml @@ -11,6 +11,10 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + diff --git a/pmd-fortran/pom.xml b/pmd-fortran/pom.xml index 5cb3b57113..5e2e298953 100644 --- a/pmd-fortran/pom.xml +++ b/pmd-fortran/pom.xml @@ -10,6 +10,10 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + @@ -21,26 +25,6 @@ - - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index b303634fe2..50d1529b36 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -10,6 +10,10 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + @@ -80,25 +84,6 @@ - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - net.sourceforge.pmd pmd-build diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml index c23173e920..525b91d29f 100644 --- a/pmd-javascript/pom.xml +++ b/pmd-javascript/pom.xml @@ -10,7 +10,17 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + + + + ${basedir}/src/main/resources + true + + maven-resources-plugin @@ -22,25 +32,6 @@ - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - net.sourceforge.pmd pmd-build diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index a5d36168bf..0381f54597 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -10,7 +10,17 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + + + + ${basedir}/src/main/resources + true + + maven-resources-plugin @@ -63,25 +73,6 @@ - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - net.sourceforge.pmd pmd-build diff --git a/pmd-php/pom.xml b/pmd-php/pom.xml index b2b19878f9..ec0775fc8d 100644 --- a/pmd-php/pom.xml +++ b/pmd-php/pom.xml @@ -10,6 +10,10 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + @@ -21,26 +25,6 @@ - - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml index 9fd48bfda2..88916ca35a 100644 --- a/pmd-plsql/pom.xml +++ b/pmd-plsql/pom.xml @@ -10,7 +10,17 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + + + + ${basedir}/src/main/resources + true + + maven-resources-plugin @@ -63,25 +73,6 @@ - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - net.sourceforge.pmd pmd-build diff --git a/pmd-ruby/pom.xml b/pmd-ruby/pom.xml index 9c990f5e44..0100d77666 100644 --- a/pmd-ruby/pom.xml +++ b/pmd-ruby/pom.xml @@ -10,39 +10,10 @@ 5.1.4-SNAPSHOT - - - - maven-resources-plugin - - false - - ${*} - - - + + ${basedir}/../pmd + - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - - - net.sourceforge.pmd diff --git a/pmd-test/pom.xml b/pmd-test/pom.xml index 10bf1b1760..c2b6eac391 100644 --- a/pmd-test/pom.xml +++ b/pmd-test/pom.xml @@ -10,6 +10,10 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + net.sourceforge.pmd diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml index ace55cae86..5d86749348 100644 --- a/pmd-vm/pom.xml +++ b/pmd-vm/pom.xml @@ -10,7 +10,17 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + + + + ${basedir}/src/main/resources + true + + maven-resources-plugin @@ -63,25 +73,6 @@ - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - net.sourceforge.pmd pmd-build diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml index 5bc480a421..60c299f820 100644 --- a/pmd-xml/pom.xml +++ b/pmd-xml/pom.xml @@ -10,7 +10,17 @@ 5.1.4-SNAPSHOT + + ${basedir}/../pmd + + + + + ${basedir}/src/main/resources + true + + maven-resources-plugin @@ -22,25 +32,6 @@ - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - ${basedir}/../pmd/licences/clover2.license - - - - pre-site - - instrument - - - - net.sourceforge.pmd pmd-build diff --git a/pmd/pom.xml b/pmd/pom.xml index d36c7021e5..78e8a1508f 100644 --- a/pmd/pom.xml +++ b/pmd/pom.xml @@ -10,35 +10,12 @@ 5.1.4-SNAPSHOT - - - - ${basedir}/src/test/resources - - - ${basedir}/src/test/java - - **/testdata/*.java - - - - - - ${basedir}/src/main/resources - true - - - - - maven-resources-plugin - - false - - ${*} - - - + + ${basedir} + + + org.apache.maven.plugins maven-antrun-plugin @@ -59,22 +36,6 @@ run - - pmd-clean - clean - - - PMD specific tasks: cleaning generated xdocs - - - - - - - - run - - @@ -95,26 +56,6 @@ - - - - com.atlassian.maven.plugins - maven-clover2-plugin - - ${java.version} - licences/clover2.license - - - - pre-site - - instrument - - - - @@ -202,52 +143,4 @@ test - - - - reports - - true - - - - - org.apache.maven.plugins - maven-pmd-plugin - - - verify - - pmd - - - - - 100 - ${java.version} - - src/main/resources/rulesets/internal/dogfood.xml - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - verify - - checkstyle - - - - - etc/checkstyle-config.xml - etc/checkstyle-suppressions.xml - - - - - - diff --git a/pom.xml b/pom.xml index d98f5c03e4..8c877e5bfd 100644 --- a/pom.xml +++ b/pom.xml @@ -262,6 +262,7 @@ 5.0 2.17 2.12.1 + 2.5.1 3.2 1.6 @@ -272,6 +273,11 @@ one, and complains... --> src/site/xdocs http://pmd.sourceforge.net/snapshot/${project.artifactId} + + ${basedir}/pmd + ${config.basedir}/src/main/resources/rulesets/internal/dogfood.xml + ${config.basedir}/etc/checkstyle-config.xml + ${config.basedir}/etc/checkstyle-suppressions.xml @@ -373,7 +379,7 @@ com.atlassian.maven.plugins maven-clover2-plugin - 2.5.1 + ${clover.version} net.sourceforge.pmd @@ -429,12 +435,34 @@ + + + com.atlassian.maven.plugins + maven-clover2-plugin + ${clover.version} + true + + ${java.version} + ${config.basedir}/licences/clover2.license + + + + pre-site + + instrument + + + + org.apache.maven.plugins maven-site-plugin + false attach-site-descriptor @@ -444,6 +472,29 @@ + + org.apache.maven.plugins + maven-antrun-plugin + true + + + pmd-clean + clean + + + PMD specific tasks: cleaning generated xdocs + + + + + + + + run + + + + @@ -478,7 +529,7 @@ 100 ${java.version} - src/main/resources/rulesets/internal/dogfood.xml + ${pmd.dogfood.ruleset} @@ -495,8 +546,8 @@ maven-checkstyle-plugin ${checkstyle.version} - etc/checkstyle-config.xml - etc/checkstyle-suppressions.xml + ${checkstyle.configLocation} + ${checkstyle.suppressionsFile} @@ -535,10 +586,10 @@ com.atlassian.maven.plugins maven-clover2-plugin - 2.5.1 + ${clover.version} - licences/clover2.license - etc/default-clover-report.xml + ${config.basedir}/licences/clover2.license + ${config.basedir}/etc/default-clover-report.xml @@ -735,6 +786,52 @@ + + + reports + + true + + + + + org.apache.maven.plugins + maven-pmd-plugin + + + verify + + pmd + + + + + 100 + ${java.version} + + ${pmd.dogfood.ruleset} + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + verify + + checkstyle + + + + + ${checkstyle.configLocation} + ${checkstyle.suppressionsFile} + + + + +