From 22602f42f2fac3eafd069b92fbccc7fbb5931d26 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Wed, 7 Jan 2015 20:42:07 -0500 Subject: [PATCH] moved the reports from the site plugin to the reporting section Former-commit-id: 885270d15bd24e921ddc97b112d612aaa7c48ac4 --- dependency-check-ant/pom.xml | 290 ++++++++++++++++----------------- dependency-check-cli/pom.xml | 273 +++++++++++++++---------------- dependency-check-core/pom.xml | 278 ++++++++++++++----------------- dependency-check-maven/pom.xml | 277 ++++++++++++++----------------- dependency-check-utils/pom.xml | 256 +++++++++++++---------------- 5 files changed, 628 insertions(+), 746 deletions(-) diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml index 9fc16aa77..27d689811 100644 --- a/dependency-check-ant/pom.xml +++ b/dependency-check-ant/pom.xml @@ -190,6 +190,14 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-jar-plugin + org.apache.maven.plugins maven-shade-plugin @@ -217,10 +225,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-jar-plugin - org.codehaus.mojo cobertura-maven-plugin @@ -265,156 +269,138 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-compiler-plugin - - - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.doxia - doxia-module-markdown - 1.5 - - - - true - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - index - summary - license - help - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - Copyright© 2012-14 Jeremy Long. All Rights Reserved. - - - - default - - javadoc - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - - dependency-updates-report - plugin-updates-report - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.4 - - - org.codehaus.mojo - cobertura-maven-plugin - 2.6 - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.16 - - - - report-only - - - - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - - Todo Work - - - todo - ignoreCase - - - FIXME - exact - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.11 - - false - ${basedir}/../src/main/config/checkstyle-checks.xml - ${basedir}/../src/main/config/checkstyle-header.txt - ${basedir}/../src/main/config/checkstyle-suppressions.xml - checkstyle.suppressions.file - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.0.1 - - 1.6 - true - utf-8 - - **/generated/*.java - - - ../src/main/config/dcrules.xml - /rulesets/java/basic.xml - /rulesets/java/imports.xml - /rulesets/java/unusedcode.xml - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.3 - - - - + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + + index + summary + license + help + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + Copyright© 2012-15 Jeremy Long. All Rights Reserved. + + + + default + + javadoc + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + dependency-updates-report + plugin-updates-report + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.4 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.6 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.16 + + + + report-only + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + Todo Work + + + todo + ignoreCase + + + FIXME + exact + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.11 + + false + ${basedir}/../src/main/config/checkstyle-checks.xml + ${basedir}/../src/main/config/checkstyle-header.txt + ${basedir}/../src/main/config/checkstyle-suppressions.xml + checkstyle.suppressions.file + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.0.1 + + 1.6 + true + utf-8 + + **/generated/*.java + + + ../src/main/config/dcrules.xml + /rulesets/java/basic.xml + /rulesets/java/imports.xml + /rulesets/java/unusedcode.xml + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.5.3 + + + org.owasp diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml index 27fd15a7c..a9c46682c 100644 --- a/dependency-check-cli/pom.xml +++ b/dependency-check-cli/pom.xml @@ -127,149 +127,6 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-compiler-plugin - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.doxia - doxia-module-markdown - 1.5 - - - - true - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - index - summary - license - help - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - Copyright© 2012-14 Jeremy Long. All Rights Reserved. - - - - default - - javadoc - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - - dependency-updates-report - plugin-updates-report - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.4 - - - org.codehaus.mojo - cobertura-maven-plugin - 2.6 - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.16 - - - - report-only - - - - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - - Todo Work - - - todo - ignoreCase - - - FIXME - exact - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.11 - - false - ${basedir}/../src/main/config/checkstyle-checks.xml - ${basedir}/../src/main/config/checkstyle-header.txt - ${basedir}/../src/main/config/checkstyle-suppressions.xml - checkstyle.suppressions.file - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.1 - - 1.6 - true - utf-8 - - **/generated/*.java - - - ../src/main/config/dcrules.xml - /rulesets/java/basic.xml - /rulesets/java/imports.xml - /rulesets/java/unusedcode.xml - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.3 - - - - org.codehaus.mojo appassembler-maven-plugin @@ -318,6 +175,136 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + + index + summary + license + help + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + Copyright© 2012-14 Jeremy Long. All Rights Reserved. + + + + default + + javadoc + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + dependency-updates-report + plugin-updates-report + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.4 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.6 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.16 + + + + report-only + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + Todo Work + + + todo + ignoreCase + + + FIXME + exact + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.11 + + false + ${basedir}/../src/main/config/checkstyle-checks.xml + ${basedir}/../src/main/config/checkstyle-header.txt + ${basedir}/../src/main/config/checkstyle-suppressions.xml + checkstyle.suppressions.file + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.1 + + 1.6 + true + utf-8 + + **/generated/*.java + + + ../src/main/config/dcrules.xml + /rulesets/java/basic.xml + /rulesets/java/imports.xml + /rulesets/java/unusedcode.xml + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.5.3 + + + commons-cli diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml index b17199ae9..09e609540 100644 --- a/dependency-check-core/pom.xml +++ b/dependency-check-core/pom.xml @@ -208,161 +208,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.doxia - doxia-module-markdown - 1.5 - - - - true - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - index - summary - license - help - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - Copyright© 2012-14 Jeremy Long. All Rights Reserved. - - - - default - - javadoc - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - - dependency-updates-report - plugin-updates-report - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.4 - - - org.codehaus.mojo - cobertura-maven-plugin - 2.6 - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.16 - - - - report-only - - - - integration-tests - - report-only - failsafe-report-only - - - - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - - Todo Work - - - todo - ignoreCase - - - FIXME - exact - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.11 - - false - ${basedir}/../src/main/config/checkstyle-checks.xml - ${basedir}/../src/main/config/checkstyle-header.txt - ${basedir}/../src/main/config/checkstyle-suppressions.xml - checkstyle.suppressions.file - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.1 - - 1.6 - true - utf-8 - - **/generated/*.java - - - ../src/main/config/dcrules.xml - /rulesets/java/basic.xml - /rulesets/java/imports.xml - /rulesets/java/unusedcode.xml - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.3 - - - org.codehaus.mojo - javancss-maven-plugin - 2.0 - - - - org.apache.maven.plugins maven-compiler-plugin @@ -372,6 +217,128 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + Copyright© 2012-14 Jeremy Long. All Rights Reserved. + + + + default + + javadoc + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + dependency-updates-report + plugin-updates-report + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.4 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.6 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.16 + + + + report-only + + + + integration-tests + + report-only + failsafe-report-only + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + Todo Work + + + todo + ignoreCase + + + FIXME + exact + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.11 + + false + ${basedir}/../src/main/config/checkstyle-checks.xml + ${basedir}/../src/main/config/checkstyle-header.txt + ${basedir}/../src/main/config/checkstyle-suppressions.xml + checkstyle.suppressions.file + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.1 + + 1.6 + true + utf-8 + + **/generated/*.java + + + ../src/main/config/dcrules.xml + /rulesets/java/basic.xml + /rulesets/java/imports.xml + /rulesets/java/unusedcode.xml + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.5.3 + + + org.owasp @@ -688,7 +655,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. provided true - diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml index a3124762a..fec44e48e 100644 --- a/dependency-check-maven/pom.xml +++ b/dependency-check-maven/pom.xml @@ -119,165 +119,136 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.doxia - doxia-module-markdown - 1.5 - - - - true - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - index - summary - license - help - - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.2 - - dependency-check - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - Copyright© 2012-14 Jeremy Long. All Rights Reserved. - - - - default - - javadoc - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - - dependency-updates-report - plugin-updates-report - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.4 - - - org.codehaus.mojo - cobertura-maven-plugin - 2.6 - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.16 - - - - report-only - - - - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - - Todo Work - - - todo - ignoreCase - - - FIXME - exact - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.11 - - false - ${basedir}/../src/main/config/checkstyle-checks.xml - ${basedir}/../src/main/config/checkstyle-header.txt - ${basedir}/../src/main/config/checkstyle-suppressions.xml - checkstyle.suppressions.file - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.1 - - 1.6 - true - utf-8 - - **/generated/**/*.java - **/HelpMojo.java - - - ../src/main/config/dcrules.xml - /rulesets/java/basic.xml - /rulesets/java/imports.xml - /rulesets/java/unusedcode.xml - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.3 - - - - org.apache.maven.plugins maven-compiler-plugin - + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.2 + + dependency-check + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + Copyright© 2012-14 Jeremy Long. All Rights Reserved. + + + + default + + javadoc + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + dependency-updates-report + plugin-updates-report + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.4 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.6 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.16 + + + + report-only + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + Todo Work + + + todo + ignoreCase + + + FIXME + exact + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.11 + + false + ${basedir}/../src/main/config/checkstyle-checks.xml + ${basedir}/../src/main/config/checkstyle-header.txt + ${basedir}/../src/main/config/checkstyle-suppressions.xml + checkstyle.suppressions.file + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.1 + + 1.6 + true + utf-8 + + **/generated/**/*.java + **/HelpMojo.java + + + ../src/main/config/dcrules.xml + /rulesets/java/basic.xml + /rulesets/java/imports.xml + /rulesets/java/unusedcode.xml + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.5.3 + + + org.owasp diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml index a376f4571..a07756df2 100644 --- a/dependency-check-utils/pom.xml +++ b/dependency-check-utils/pom.xml @@ -97,154 +97,126 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-compiler-plugin + + + + org.apache.maven.plugins - maven-site-plugin - 3.3 - - - org.apache.maven.doxia - doxia-module-markdown - 1.5 - - + maven-javadoc-plugin + 2.9.1 - true - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - index - summary - license - help - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - Copyright© 2012-14 Jeremy Long. All Rights Reserved. - - - - default - - javadoc - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - - dependency-updates-report - plugin-updates-report - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.4 - - - org.codehaus.mojo - cobertura-maven-plugin - 2.6 - - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.16 - - - - report-only - - - - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - - Todo Work - - - todo - ignoreCase - - - FIXME - exact - - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.11 - - false - ${basedir}/../src/main/config/checkstyle-checks.xml - ${basedir}/../src/main/config/checkstyle-header.txt - ${basedir}/../src/main/config/checkstyle-suppressions.xml - checkstyle.suppressions.file - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.0.1 - - 1.6 - true - utf-8 - - **/org/owasp/dependencycheck/org/apache/**/*.java - - - ../src/main/config/dcrules.xml - /rulesets/java/basic.xml - /rulesets/java/imports.xml - /rulesets/java/unusedcode.xml - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.3 - - org.owasp.dependencycheck.utils.* - - - + Copyright© 2012-14 Jeremy Long. All Rights Reserved. + + + + default + + javadoc + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + dependency-updates-report + plugin-updates-report + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.4 + + + org.codehaus.mojo + cobertura-maven-plugin + 2.6 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.16 + + + + report-only + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + Todo Work + + + todo + ignoreCase + + + FIXME + exact + + + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.11 + + false + ${basedir}/../src/main/config/checkstyle-checks.xml + ${basedir}/../src/main/config/checkstyle-header.txt + ${basedir}/../src/main/config/checkstyle-suppressions.xml + checkstyle.suppressions.file + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.0.1 + + 1.6 + true + utf-8 + + **/org/owasp/dependencycheck/org/apache/**/*.java + + + ../src/main/config/dcrules.xml + /rulesets/java/basic.xml + /rulesets/java/imports.xml + /rulesets/java/unusedcode.xml + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.5.3 + + org.owasp.dependencycheck.utils.* - + commons-io