From dd6affeb6edbf6cd1130539ee4c9502975c34c0b Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sun, 15 Mar 2015 14:59:55 +0100 Subject: [PATCH] Use new pmd-build plugin, adjust some rule documentation for markdown changes --- .gitignore | 11 +++------- pmd-cpp/pom.xml | 8 -------- pmd-java/pom.xml | 20 +++---------------- .../resources/rulesets/java/controversial.xml | 4 ++-- pmd-javascript/pom.xml | 20 +++---------------- pmd-jsp/pom.xml | 20 +++---------------- .../src/main/resources/rulesets/jsp/basic.xml | 6 ++---- pmd-matlab/pom.xml | 8 -------- pmd-objectivec/pom.xml | 8 -------- pmd-plsql/pom.xml | 20 +++---------------- pmd-python/pom.xml | 8 -------- pmd-scala/pom.xml | 9 --------- pmd-vm/pom.xml | 20 +++---------------- pmd-xml/pom.xml | 20 +++---------------- pom.xml | 9 ++++++++- 15 files changed, 33 insertions(+), 158 deletions(-) diff --git a/.gitignore b/.gitignore index 47a1dcba1e..5b2546cb76 100644 --- a/.gitignore +++ b/.gitignore @@ -9,11 +9,6 @@ bin/ *.iml .idea *.patch -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 +*/src/site/site.xml +*/src/site/markdown/rules +*/src/site/markdown/mergedruleset.xml diff --git a/pmd-cpp/pom.xml b/pmd-cpp/pom.xml index 8787ea2a74..63668c747e 100644 --- a/pmd-cpp/pom.xml +++ b/pmd-cpp/pom.xml @@ -66,14 +66,6 @@ - - - org.apache.maven.plugins - maven-site-plugin - - ${project.build.directory}/generated-xdocs - - diff --git a/pmd-java/pom.xml b/pmd-java/pom.xml index 53023f0b4f..86fc9f3be7 100644 --- a/pmd-java/pom.xml +++ b/pmd-java/pom.xml @@ -68,10 +68,10 @@ clean - PMD specific tasks: cleaning generated xdocs + PMD specific tasks: cleaning generated markdown - - + + @@ -104,20 +104,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 - - - diff --git a/pmd-java/src/main/resources/rulesets/java/controversial.xml b/pmd-java/src/main/resources/rulesets/java/controversial.xml index b7af66cb43..e356e917d9 100644 --- a/pmd-java/src/main/resources/rulesets/java/controversial.xml +++ b/pmd-java/src/main/resources/rulesets/java/controversial.xml @@ -308,10 +308,10 @@ or MethodDeclaration[@PackagePrivate='true'] **Note:** This rule is deprecated as nowadays the JVMs JIT compilers will optimize away the differences. While the bytecode generated by the java compiler is indeed different, at runtime the instructions are optimized to the fastest way automatically. -See for more details. +See [#1277](https://sourceforge.net/p/pmd/bugs/1277/) for more details. Use bitwise inversion to invert boolean values - it's the fastest way to do this. -See for specific details +See [Java Specialists - Issue 042](http://www.javaspecialists.eu/archive/Issue042.html) for specific details. ]]> 3 diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml index a21eda72fb..be9a16ba5f 100644 --- a/pmd-javascript/pom.xml +++ b/pmd-javascript/pom.xml @@ -35,20 +35,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 - - - @@ -60,10 +46,10 @@ clean - PMD specific tasks: cleaning generated xdocs + PMD specific tasks: cleaning generated markdown - - + + diff --git a/pmd-jsp/pom.xml b/pmd-jsp/pom.xml index 462a6db1a6..9d2ba4bfbb 100644 --- a/pmd-jsp/pom.xml +++ b/pmd-jsp/pom.xml @@ -57,10 +57,10 @@ clean - PMD specific tasks: cleaning generated xdocs + PMD specific tasks: cleaning generated markdown - - + + @@ -93,20 +93,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 - - - diff --git a/pmd-jsp/src/main/resources/rulesets/jsp/basic.xml b/pmd-jsp/src/main/resources/rulesets/jsp/basic.xml index 759002bda1..68de40f2c1 100644 --- a/pmd-jsp/src/main/resources/rulesets/jsp/basic.xml +++ b/pmd-jsp/src/main/resources/rulesets/jsp/basic.xml @@ -91,7 +91,7 @@ response.setHeader("Pragma", "No-cache"); class="net.sourceforge.pmd.lang.jsp.rule.basic.NoInlineStyleInformationRule" externalInfoUrl="${pmd.website.baseurl}/rules/jsp/basic.html#NoInlineStyleInformation"> or tags, or attributes like "align='center'". ]]> +Style information should be put in CSS files, not in JSPs. Therefore, don't use <B> or <FONT> tags, or attributes like "align='center'". ]]> 3 @@ -267,10 +267,8 @@ and message="Avoiding inlining HTML script content" externalInfoUrl="${pmd.website.baseurl}/rules/jsp/basic.html#NoInlineScript"> - element. +Avoid inlining HTML script content. Consider externalizing the HTML script using the 'src' attribute on the "script" element. Externalized script could be reused between pages. Browsers can also cache the script, reducing overall download bandwidth. - ]]> 3 diff --git a/pmd-matlab/pom.xml b/pmd-matlab/pom.xml index 164c1f5615..ca400e5182 100644 --- a/pmd-matlab/pom.xml +++ b/pmd-matlab/pom.xml @@ -66,14 +66,6 @@ - - - org.apache.maven.plugins - maven-site-plugin - - ${project.build.directory}/generated-xdocs - - diff --git a/pmd-objectivec/pom.xml b/pmd-objectivec/pom.xml index 8ffc06ae31..bb5871f94c 100644 --- a/pmd-objectivec/pom.xml +++ b/pmd-objectivec/pom.xml @@ -66,14 +66,6 @@ - - - org.apache.maven.plugins - maven-site-plugin - - ${project.build.directory}/generated-xdocs - - diff --git a/pmd-plsql/pom.xml b/pmd-plsql/pom.xml index 95c1976fdb..82969d886d 100644 --- a/pmd-plsql/pom.xml +++ b/pmd-plsql/pom.xml @@ -57,10 +57,10 @@ clean - PMD specific tasks: cleaning generated xdocs + PMD specific tasks: cleaning generated markdown - - + + @@ -93,20 +93,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 - - - diff --git a/pmd-python/pom.xml b/pmd-python/pom.xml index 90bc95e1de..9cef154271 100644 --- a/pmd-python/pom.xml +++ b/pmd-python/pom.xml @@ -66,14 +66,6 @@ - - - org.apache.maven.plugins - maven-site-plugin - - ${project.build.directory}/generated-xdocs - - diff --git a/pmd-scala/pom.xml b/pmd-scala/pom.xml index 25bf0e1c6d..447fd245e6 100644 --- a/pmd-scala/pom.xml +++ b/pmd-scala/pom.xml @@ -56,15 +56,6 @@ - - - org.apache.maven.plugins - maven-site-plugin - - ${project.build.directory}/generated-xdocs - - - diff --git a/pmd-vm/pom.xml b/pmd-vm/pom.xml index 13fcc05b4f..452b16a723 100644 --- a/pmd-vm/pom.xml +++ b/pmd-vm/pom.xml @@ -57,10 +57,10 @@ clean - PMD specific tasks: cleaning generated xdocs + PMD specific tasks: cleaning generated markdown - - + + @@ -93,20 +93,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 - - - diff --git a/pmd-xml/pom.xml b/pmd-xml/pom.xml index 52c0fb8ee9..e3e4bf020b 100644 --- a/pmd-xml/pom.xml +++ b/pmd-xml/pom.xml @@ -35,20 +35,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 - - - @@ -60,10 +46,10 @@ clean - PMD specific tasks: cleaning generated xdocs + PMD specific tasks: cleaning generated markdown - - + + diff --git a/pom.xml b/pom.xml index e53fafc1e2..16b03757f7 100644 --- a/pom.xml +++ b/pom.xml @@ -398,7 +398,14 @@ net.sourceforge.pmd pmd-build - 0.8 + 0.9-SNAPSHOT + + + + pmd-pre-site + + + org.apache.maven.plugins