diff --git a/.gitignore b/.gitignore index a21978ed9e..229800b1ec 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,11 @@ bin/ .ruleset .settings/ *.patch -pmd/src/site/site.xml -pmd/src/site/xdoc/rules -pmd/src/site/xdoc/mergedruleset.xml +pmd-java/src/site/site.xml +pmd-javascript/src/site/site.xml +pmd-jsp/src/site/site.xml +pmd-plsql/src/site/site.xml +pmd-vm/src/site/site.xml +pmd-xml/src/site/site.xml +*/src/site/xdoc/rules +*/src/site/xdoc/mergedruleset.xml diff --git a/pmd-cpp/src/site/markdown/index.md b/pmd-cpp/src/site/markdown/index.md new file mode 100644 index 0000000000..3b79f03162 --- /dev/null +++ b/pmd-cpp/src/site/markdown/index.md @@ -0,0 +1,3 @@ +# PMD C++ + +Only CPD is supported. There are no PMD rules for C++. diff --git a/pmd-cpp/src/site/site.xml b/pmd-cpp/src/site/site.xml new file mode 100644 index 0000000000..d90415fcce --- /dev/null +++ b/pmd-cpp/src/site/site.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/pmd-fortran/src/site/markdown/index.md b/pmd-fortran/src/site/markdown/index.md new file mode 100644 index 0000000000..808bc4fa7b --- /dev/null +++ b/pmd-fortran/src/site/markdown/index.md @@ -0,0 +1,3 @@ +# PMD Fortran + +Only CPD is supported. There are no PMD rules for Fortran. diff --git a/pmd-fortran/src/site/site.xml b/pmd-fortran/src/site/site.xml new file mode 100644 index 0000000000..156ddcb354 --- /dev/null +++ b/pmd-fortran/src/site/site.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index e27629c9be..b303634fe2 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -100,11 +100,22 @@ - org.apache.maven.plugins - maven-site-plugin + net.sourceforge.pmd + pmd-build - ${project.build.directory}/generated-xdocs + ${basedir}/src/main/resources/rulesets + ${basedir}/src/site/site.pre.xml + ${basedir}/src/site/site.xml + ${basedir}/src/site/xdoc/rules + + + pre-site + + pmd-pre-site + + + diff --git a/pmd-java/src/site/site.xml b/pmd-java/src/site/site.pre.xml similarity index 100% rename from pmd-java/src/site/site.xml rename to pmd-java/src/site/site.pre.xml diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml index 7e276a4efe..c23173e920 100644 --- a/pmd-javascript/pom.xml +++ b/pmd-javascript/pom.xml @@ -41,6 +41,24 @@ + + net.sourceforge.pmd + pmd-build + + ${basedir}/src/main/resources/rulesets + ${basedir}/src/site/site.pre.xml + ${basedir}/src/site/site.xml + ${basedir}/src/site/xdoc/rules + + + + pre-site + + pmd-pre-site + + + + diff --git a/pmd-javascript/src/site/markdown/index.md b/pmd-javascript/src/site/markdown/index.md new file mode 100644 index 0000000000..24c7020097 --- /dev/null +++ b/pmd-javascript/src/site/markdown/index.md @@ -0,0 +1,5 @@ +# PMD JavaScript + +Contains the PMD implementation to support the JavaScript programming language. + +For the available rules, see rulesets index page. diff --git a/pmd-javascript/src/site/site.pre.xml b/pmd-javascript/src/site/site.pre.xml new file mode 100644 index 0000000000..aa54fe79d9 --- /dev/null +++ b/pmd-javascript/src/site/site.pre.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index b8a36b8f0f..a5d36168bf 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -83,11 +83,22 @@ - org.apache.maven.plugins - maven-site-plugin + net.sourceforge.pmd + pmd-build - ${project.build.directory}/generated-xdocs + ${basedir}/src/main/resources/rulesets + ${basedir}/src/site/site.pre.xml + ${basedir}/src/site/site.xml + ${basedir}/src/site/xdoc/rules + + + pre-site + + pmd-pre-site + + + diff --git a/pmd-jsp/src/site/markdown/index.md b/pmd-jsp/src/site/markdown/index.md new file mode 100644 index 0000000000..d8112908ac --- /dev/null +++ b/pmd-jsp/src/site/markdown/index.md @@ -0,0 +1,5 @@ +# PMD JSP + +Contains the PMD implementation to support Java Server Pages. + +For the available rules, see rulesets index page. diff --git a/pmd-jsp/src/site/site.pre.xml b/pmd-jsp/src/site/site.pre.xml new file mode 100644 index 0000000000..f012ef958a --- /dev/null +++ b/pmd-jsp/src/site/site.pre.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/pmd-php/src/site/markdown/index.md b/pmd-php/src/site/markdown/index.md new file mode 100644 index 0000000000..43f979c0bb --- /dev/null +++ b/pmd-php/src/site/markdown/index.md @@ -0,0 +1,3 @@ +# PMD PHP + +Only CPD is supported. There are no PMD rules for PHP. diff --git a/pmd-php/src/site/site.xml b/pmd-php/src/site/site.xml new file mode 100644 index 0000000000..2813d6fe41 --- /dev/null +++ b/pmd-php/src/site/site.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml index 2ea94392c6..9fd48bfda2 100644 --- a/pmd-plsql/pom.xml +++ b/pmd-plsql/pom.xml @@ -83,11 +83,22 @@ - org.apache.maven.plugins - maven-site-plugin + net.sourceforge.pmd + pmd-build - ${project.build.directory}/generated-xdocs + ${basedir}/src/main/resources/rulesets + ${basedir}/src/site/site.pre.xml + ${basedir}/src/site/site.xml + ${basedir}/src/site/xdoc/rules + + + pre-site + + pmd-pre-site + + + diff --git a/pmd-plsql/src/site/markdown/index.md b/pmd-plsql/src/site/markdown/index.md new file mode 100644 index 0000000000..ed4af64260 --- /dev/null +++ b/pmd-plsql/src/site/markdown/index.md @@ -0,0 +1,5 @@ +# PMD PL/SQL + +Contains the PMD implementation to support PL/SQL. + +For the available rules, see rulesets index page. diff --git a/pmd-plsql/src/site/site.pre.xml b/pmd-plsql/src/site/site.pre.xml new file mode 100644 index 0000000000..e7ad19da8e --- /dev/null +++ b/pmd-plsql/src/site/site.pre.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/pmd-ruby/src/site/markdown/index.md b/pmd-ruby/src/site/markdown/index.md new file mode 100644 index 0000000000..69a30fbed0 --- /dev/null +++ b/pmd-ruby/src/site/markdown/index.md @@ -0,0 +1,3 @@ +# PMD Ruby + +Only CPD is supported. There are no PMD rules for Ruby. diff --git a/pmd-ruby/src/site/site.xml b/pmd-ruby/src/site/site.xml new file mode 100644 index 0000000000..30af96423e --- /dev/null +++ b/pmd-ruby/src/site/site.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml index 7b84f12c7b..ace55cae86 100644 --- a/pmd-vm/pom.xml +++ b/pmd-vm/pom.xml @@ -82,6 +82,24 @@ + + net.sourceforge.pmd + pmd-build + + ${basedir}/src/main/resources/rulesets + ${basedir}/src/site/site.pre.xml + ${basedir}/src/site/site.xml + ${basedir}/src/site/xdoc/rules + + + + pre-site + + pmd-pre-site + + + + diff --git a/pmd-vm/src/site/markdown/index.md b/pmd-vm/src/site/markdown/index.md new file mode 100644 index 0000000000..3cd3d3e744 --- /dev/null +++ b/pmd-vm/src/site/markdown/index.md @@ -0,0 +1,5 @@ +# PMD Velocity + +Contains the PMD implementation to support the Velocity Template Language. + +For the available rules, see rulesets index page. diff --git a/pmd-vm/src/site/site.pre.xml b/pmd-vm/src/site/site.pre.xml new file mode 100644 index 0000000000..d8c9a4b800 --- /dev/null +++ b/pmd-vm/src/site/site.pre.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml index 6e50ed4c5c..5bc480a421 100644 --- a/pmd-xml/pom.xml +++ b/pmd-xml/pom.xml @@ -41,6 +41,24 @@ + + net.sourceforge.pmd + pmd-build + + ${basedir}/src/main/resources/rulesets + ${basedir}/src/site/site.pre.xml + ${basedir}/src/site/site.xml + ${basedir}/src/site/xdoc/rules + + + + pre-site + + pmd-pre-site + + + + diff --git a/pmd-xml/src/site/markdown/index.md b/pmd-xml/src/site/markdown/index.md new file mode 100644 index 0000000000..591bd1d2da --- /dev/null +++ b/pmd-xml/src/site/markdown/index.md @@ -0,0 +1,5 @@ +# PMD XML and XSL + +Contains the PMD implementation to support XML and XSL. + +For the available rules, see rulesets index page. diff --git a/pmd-xml/src/site/site.pre.xml b/pmd-xml/src/site/site.pre.xml new file mode 100644 index 0000000000..cc7ede3088 --- /dev/null +++ b/pmd-xml/src/site/site.pre.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + diff --git a/pmd/pom.xml b/pmd/pom.xml index 9aff737433..d36c7021e5 100644 --- a/pmd/pom.xml +++ b/pmd/pom.xml @@ -115,25 +115,6 @@ - - - net.sourceforge.pmd - pmd-build - - ${basedir}/src/main/resources/rulesets - ${basedir}/src/site/site.pre.xml - ${basedir}/src/site/site.xml - ${basedir}/src/site/xdoc/rules - - - - pre-site - - pmd-pre-site - - - - @@ -222,118 +203,6 @@ - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.4 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - - javadoc - test-javadoc - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - ${pmd.plugin.version} - - true - 100 - ${java.version} - - src/main/resources/rulesets/internal/dogfood.xml - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${checkstyle.version} - - etc/checkstyle-config.xml - etc/checkstyle-suppressions.xml - - - - - checkstyle - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - summary - dependencies - project-team - mailing-list - cim - issue-tracking - license - scm - - - - - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${surefire.version} - - - com.atlassian.maven.plugins - maven-clover2-plugin - 2.5.1 - - licences/clover2.license - etc/default-clover-report.xml - - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - - dependency-updates-report - plugin-updates-report - property-updates-report - - - - - - - reports diff --git a/pmd/src/site/site.pre.xml b/pmd/src/site/site.xml similarity index 89% rename from pmd/src/site/site.pre.xml rename to pmd/src/site/site.xml index 691609d3d3..6b1ef0c9f8 100644 --- a/pmd/src/site/site.pre.xml +++ b/pmd/src/site/site.xml @@ -54,15 +54,6 @@ - - - - - - - - diff --git a/pom.xml b/pom.xml index 06fc1e0664..d98f5c03e4 100644 --- a/pom.xml +++ b/pom.xml @@ -271,7 +271,7 @@ If the xdocs files stay in src/site/xdoc/, mvn tries to copy over the generated one, and complains... --> src/site/xdocs - http://pmd.sourceforge.net/snapshot + http://pmd.sourceforge.net/snapshot/${project.artifactId} @@ -447,6 +447,118 @@ + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.4 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + + javadoc + test-javadoc + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${pmd.plugin.version} + + true + 100 + ${java.version} + + src/main/resources/rulesets/internal/dogfood.xml + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${checkstyle.version} + + etc/checkstyle-config.xml + etc/checkstyle-suppressions.xml + + + + + checkstyle + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + + summary + dependencies + project-team + mailing-list + cim + issue-tracking + license + scm + + + + + + + org.apache.maven.plugins + maven-surefire-report-plugin + ${surefire.version} + + + com.atlassian.maven.plugins + maven-clover2-plugin + 2.5.1 + + licences/clover2.license + etc/default-clover-report.xml + + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + dependency-updates-report + plugin-updates-report + property-updates-report + + + + + + +