From 04d29783e325747cc4e9885cc889b8c299888896 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Jun 2010 17:21:50 +0000 Subject: [PATCH] Limiting scope of Findbugs run. Configuring Reporting for PMD, Findbugs, JXR, JavaDoc. Fixing PMD configuration inheritence bug with sub-projects. git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2013 7e9141cc-0065-0410-87d8-b60c137991c4 --- jetty-ajp/pom.xml | 7 +++ jetty-annotations/pom.xml | 7 +++ jetty-client/pom.xml | 7 +++ jetty-continuation/pom.xml | 7 +++ jetty-deploy/pom.xml | 7 +++ jetty-distribution/pom.xml | 35 ++++++++++-- jetty-http/pom.xml | 7 +++ jetty-io/pom.xml | 7 +++ jetty-jaspi/pom.xml | 7 +++ jetty-jmx/pom.xml | 7 +++ jetty-jndi/pom.xml | 7 +++ jetty-jsp-2.1/pom.xml | 7 +++ jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 7 +++ jetty-osgi/jetty-osgi-boot-logback/pom.xml | 7 +++ jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 7 +++ jetty-osgi/jetty-osgi-boot/pom.xml | 7 +++ jetty-osgi/jetty-osgi-httpservice/pom.xml | 7 +++ jetty-plus/pom.xml | 7 +++ jetty-policy/pom.xml | 7 +++ jetty-rewrite/pom.xml | 7 +++ jetty-security/pom.xml | 7 +++ jetty-server/pom.xml | 7 +++ jetty-servlet/pom.xml | 7 +++ jetty-servlets/pom.xml | 7 +++ jetty-start/pom.xml | 7 +++ jetty-util/pom.xml | 7 +++ jetty-webapp/pom.xml | 7 +++ jetty-websocket/pom.xml | 7 +++ jetty-xml/pom.xml | 7 +++ pom.xml | 66 ++++++++++++++++------ 30 files changed, 273 insertions(+), 24 deletions(-) diff --git a/jetty-ajp/pom.xml b/jetty-ajp/pom.xml index 499be149dbb..ebc09a7437c 100644 --- a/jetty-ajp/pom.xml +++ b/jetty-ajp/pom.xml @@ -54,6 +54,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.ajp.* + + diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index 63ac7997bd8..72d58169780 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -38,6 +38,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.annotations.* + + diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 13f498c5142..6978d3e88d1 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -43,6 +43,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.client.* + + diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index b538b143e59..5c3d2b21c23 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -54,6 +54,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.continuation.* + + diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index 2d5b76385a5..2e4a9ad7f92 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -55,6 +55,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.deploy.* + + diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 92361c875dd..017f7988268 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -25,20 +25,27 @@ 1.2.0.v201004190952 - ${project.build.directory}/sources + org.apache.maven.plugins maven-resources-plugin - - true - ${assembly-directory} - + copy-base-assembly-tree generate-resources - resources + copy-resources + + false + true + ${assembly-directory} + + + ${basedir}/src/main/resources + + + @@ -490,6 +497,22 @@ + + + org.apache.maven.plugins + maven-pmd-plugin + + true + + + + + org.codehaus.mojo + findbugs-maven-plugin + + true + + diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 60ca872953a..7c087399d5e 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -67,6 +67,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.http.* + + diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 54f7f1955f1..6e9b7c60cfb 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -56,6 +56,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.io.* + + diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index 3e954fcc2b5..ed23ec1afa7 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -38,6 +38,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.jaspi.* + + diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 26ee5934734..4bbac3ff5ef 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -60,6 +60,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.jmx.* + + diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 40afa63f5e7..42294e1598a 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -43,6 +43,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.jndi.* + + diff --git a/jetty-jsp-2.1/pom.xml b/jetty-jsp-2.1/pom.xml index e1dccc7c97e..9315e3796b6 100644 --- a/jetty-jsp-2.1/pom.xml +++ b/jetty-jsp-2.1/pom.xml @@ -35,6 +35,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.jsp.* + + diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 0e78f8cb3e5..91ef0eab97c 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -87,6 +87,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.osgi.boot.jasper.*,org.eclipse.jetty.osgi.boot.jsp.* + + diff --git a/jetty-osgi/jetty-osgi-boot-logback/pom.xml b/jetty-osgi/jetty-osgi-boot-logback/pom.xml index a7b573b3aea..256d7e2f562 100644 --- a/jetty-osgi/jetty-osgi-boot-logback/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-logback/pom.xml @@ -95,6 +95,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.osgi.boot.logback.* + + diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 28fee7c8721..ea045d2a839 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -65,6 +65,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.osgi.boot.warurl.* + + diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 8d486d473c8..a104abeea93 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -78,6 +78,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.osgi.boot.* + + diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 2480d720a04..1b978e1098d 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -72,6 +72,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.osgi.httpservice.* + + diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 62e39ef9099..b7fe2cd2529 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -67,6 +67,13 @@ org.apache.maven.plugins maven-source-plugin + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.plus.* + + diff --git a/jetty-policy/pom.xml b/jetty-policy/pom.xml index 684dea02607..a544b553237 100644 --- a/jetty-policy/pom.xml +++ b/jetty-policy/pom.xml @@ -111,6 +111,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.policy.* + + diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 75b169de47f..4c8cfdbdfb1 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -55,6 +55,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.rewrite.* + + diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 016955474b5..9fdae8f13c3 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -44,6 +44,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.security.* + + diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 528d5c1407d..dbabb81903d 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -74,6 +74,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.server.* + + diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 00ed88a8151..3bbf6d1d100 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -47,6 +47,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.servlet.* + + diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 5691a56f241..8fc8cbd9cc3 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -39,6 +39,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.servlets.* + + diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index e75d9b16fbe..7b064387879 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -20,6 +20,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.start.* + + diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index df4529363fe..af892deb41e 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -60,6 +60,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.util.* + + diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 29f9fe15105..66e070001d8 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -82,6 +82,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.webapp.* + + diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 6571228ddea..e2f8e717b6b 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -67,6 +67,13 @@ + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.websocket.* + + diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index d4c5eefca7a..4790416039d 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -57,6 +57,13 @@ --> + + org.codehaus.mojo + findbugs-maven-plugin + + org.eclipse.jetty.xml.* + + diff --git a/pom.xml b/pom.xml index cf3f62ba8f1..e7d177e7138 100644 --- a/pom.xml +++ b/pom.xml @@ -142,6 +142,24 @@ + + org.apache.maven.plugins + maven-pmd-plugin + 2.5 + + 1.5 + + jetty/pmd_ruleset.xml + + + + + org.eclipse.jetty.toolchain + jetty-build-support + ${build-support-version} + + + @@ -195,24 +213,6 @@ - - org.apache.maven.plugins - maven-pmd-plugin - 2.5 - - 1.5 - - jetty/pmd_ruleset.xml - - - - - org.eclipse.jetty.toolchain - jetty-build-support - ${build-support-version} - - - org.codehaus.mojo findbugs-maven-plugin @@ -227,6 +227,36 @@ + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.2 + + + org.apache.maven.plugins + maven-javadoc-plugin + + -J-Xmx128m + + + + org.apache.maven.plugins + maven-pmd-plugin + + 1.5 + + jetty/pmd_ruleset.xml + + + + + org.codehaus.mojo + findbugs-maven-plugin + + +