From c713bb03538747982c7143fcf167da8f84df2751 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 14 Jun 2015 17:45:18 +0200 Subject: [PATCH 1/9] Move reporting plugin version numbers into properties Former-commit-id: a3cbc3ba8647dc2118e6c35f2819c87eb2f98e6f --- dependency-check-utils/pom.xml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml index 9dd12c78c..01881551f 100644 --- a/dependency-check-utils/pom.xml +++ b/dependency-check-utils/pom.xml @@ -39,6 +39,15 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. UTF-8 + 2.5.3 + 2.11 + 2.6 + 2.9.1 + 2.4 + 3.0.1 + 2.16 + 2.4 + 2.1 @@ -104,7 +113,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${reporting.javadoc-plugin.version} false Copyright© 2012-15 Jeremy Long. All Rights Reserved. @@ -121,7 +130,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.codehaus.mojo versions-maven-plugin - 2.1 + ${reporting.versions-plugin.version} @@ -134,17 +143,17 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-jxr-plugin - 2.4 + ${reporting.jxr-plugin.version} org.codehaus.mojo cobertura-maven-plugin - 2.6 + ${reporting.cobertura-plugin.version} org.apache.maven.plugins maven-surefire-report-plugin - 2.16 + ${reporting.surefire-report-plugin.version} @@ -156,7 +165,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.codehaus.mojo taglist-maven-plugin - 2.4 + ${reporting.taglist-plugin.version} @@ -180,7 +189,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-checkstyle-plugin - 2.11 + ${reporting.checkstyle-plugin.version} false false @@ -193,7 +202,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-pmd-plugin - 3.0.1 + ${reporting.pmd-plugin.version} 1.6 true @@ -212,7 +221,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. org.codehaus.mojo findbugs-maven-plugin - 2.5.3 + ${reporting.findbugs-plugin.version} org.owasp.dependencycheck.utils.* From ebd98b90949737c90aed54e277352e33f11a97a9 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 21 Jun 2015 14:01:31 +0200 Subject: [PATCH 2/9] Move reporting-plugin-version properties to root pom Former-commit-id: eeff5c2d0f0fce884c3c12b071d030e4f0107302 --- dependency-check-utils/pom.xml | 9 --------- pom.xml | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml index 01881551f..f80e2e7c3 100644 --- a/dependency-check-utils/pom.xml +++ b/dependency-check-utils/pom.xml @@ -39,15 +39,6 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. UTF-8 - 2.5.3 - 2.11 - 2.6 - 2.9.1 - 2.4 - 3.0.1 - 2.16 - 2.4 - 2.1 diff --git a/pom.xml b/pom.xml index c1f21d987..69f64c921 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,15 @@ Copyright (c) 2012 - Jeremy Long 4.7.2 1.7.12 1.1.3 + 2.11 + 2.6 + 2.5.3 + 2.9.1 + 2.4 + 3.0.1 + 2.16 + 2.4 + 2.1 From 358ac463930d1daf344549e7e4e51a60cf8fbad7 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 21 Jun 2015 14:18:40 +0200 Subject: [PATCH 3/9] Replace reporting plugin version numbers with properties in core module Former-commit-id: dbd8588f6f259e03203700ebc2075fb8b84ff575 --- dependency-check-core/pom.xml | 20 ++++++++++---------- pom.xml | 2 ++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml index a1cf447ee..c38321a85 100644 --- a/dependency-check-core/pom.xml +++ b/dependency-check-core/pom.xml @@ -226,7 +226,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + ${reporting.project-info-reports-plugin.version} @@ -240,7 +240,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${reporting.javadoc-plugin.version} false Copyright© 2012-15 Jeremy Long. All Rights Reserved. @@ -257,7 +257,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.codehaus.mojo versions-maven-plugin - 2.1 + ${reporting.versions-plugin.version} @@ -270,17 +270,17 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-jxr-plugin - 2.4 + ${reporting.jxr-plugin.version} org.codehaus.mojo cobertura-maven-plugin - 2.6 + ${reporting.cobertura-plugin.version} org.apache.maven.plugins maven-surefire-report-plugin - 2.16 + ${reporting.surefire-report-plugin.version} @@ -299,7 +299,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.codehaus.mojo taglist-maven-plugin - 2.4 + ${reporting.taglist-plugin.version} @@ -323,7 +323,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-checkstyle-plugin - 2.11 + ${reporting.checkstyle-plugin.version} false false @@ -336,7 +336,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-pmd-plugin - 3.1 + ${reporting.pmd-plugin.version} 1.6 true @@ -355,7 +355,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.codehaus.mojo findbugs-maven-plugin - 2.5.3 + ${reporting.findbugs-plugin.version} diff --git a/pom.xml b/pom.xml index 69f64c921..2dae9aeff 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,8 @@ Copyright (c) 2012 - Jeremy Long 2.9.1 2.4 3.0.1 + + 2.7 2.16 2.4 2.1 From f421f3012299ac5bff2d1c6e052172c8c754893c Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 21 Jun 2015 14:38:41 +0200 Subject: [PATCH 4/9] Add (and sync) reporting plugins for jenkins module Former-commit-id: 0148cb4c9576f800f684299141e2e97b7d493bdd --- dependency-check-jenkins/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-jenkins/pom.xml b/dependency-check-jenkins/pom.xml index 2671eab44..112975051 100644 --- a/dependency-check-jenkins/pom.xml +++ b/dependency-check-jenkins/pom.xml @@ -76,7 +76,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.6 + ${reporting.project-info-reports-plugin.version} From b0df41213a7ae2f593a45b66de6420029f153812 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 21 Jun 2015 14:42:15 +0200 Subject: [PATCH 5/9] Use properties in reporting version numbers in root pom Former-commit-id: 77b71beee1caeaa94712a8e3392952ea4bc78689 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2dae9aeff..a66a1285a 100644 --- a/pom.xml +++ b/pom.xml @@ -341,7 +341,7 @@ Copyright (c) 2012 - Jeremy Long org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + ${reporting.project-info-reports-plugin.version} From 0b2059462becb3918a3603c280ea848bb6581096 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 21 Jun 2015 17:31:42 +0200 Subject: [PATCH 6/9] Replaced version numbers for reporting plugins in ant module Former-commit-id: 6eaa38d2988142c07b92e94933564d652b7852d3 --- dependency-check-ant/pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml index dc10e0231..a18b4c19a 100644 --- a/dependency-check-ant/pom.xml +++ b/dependency-check-ant/pom.xml @@ -276,7 +276,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + ${reporting.project-info-reports-plugin.version} @@ -290,7 +290,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${reporting.javadoc-plugin.version} false Copyright© 2012-15 Jeremy Long. All Rights Reserved. @@ -307,7 +307,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.codehaus.mojo versions-maven-plugin - 2.1 + ${reporting.versions-plugin.version} @@ -320,17 +320,17 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-jxr-plugin - 2.4 + ${reporting.jxr-plugin.version} org.codehaus.mojo cobertura-maven-plugin - 2.6 + ${reporting.cobertura-plugin.version} org.apache.maven.plugins maven-surefire-report-plugin - 2.16 + ${reporting.surefire-report-plugin.version} @@ -342,7 +342,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.codehaus.mojo taglist-maven-plugin - 2.4 + ${reporting.taglist-plugin.version} @@ -366,7 +366,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-checkstyle-plugin - 2.11 + ${reporting.checkstyle-plugin.version} false false @@ -379,7 +379,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-pmd-plugin - 3.0.1 + ${reporting.pmd-plugin.version} 1.6 true @@ -398,7 +398,7 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. org.codehaus.mojo findbugs-maven-plugin - 2.5.3 + ${reporting.findbugs-plugin.version} From 8fd32ebd5e39b9329bce3bc42f24ae5e7f873883 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 21 Jun 2015 17:42:13 +0200 Subject: [PATCH 7/9] Replaced version numbers for reporting plugins in cli module Former-commit-id: c686c6f452ff1c514924d3c7dee59eaac4463af1 --- dependency-check-cli/pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml index 8758bd827..ae36fd738 100644 --- a/dependency-check-cli/pom.xml +++ b/dependency-check-cli/pom.xml @@ -181,7 +181,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + ${reporting.project-info-reports-plugin.version} @@ -195,7 +195,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${reporting.javadoc-plugin.version} false Copyright© 2012-15 Jeremy Long. All Rights Reserved. @@ -212,7 +212,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.codehaus.mojo versions-maven-plugin - 2.1 + ${reporting.versions-plugin.version} @@ -225,17 +225,17 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-jxr-plugin - 2.4 + ${reporting.jxr-plugin.version} org.codehaus.mojo cobertura-maven-plugin - 2.6 + ${reporting.cobertura-plugin.version} org.apache.maven.plugins maven-surefire-report-plugin - 2.16 + ${reporting.surefire-report-plugin.version} @@ -247,7 +247,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.codehaus.mojo taglist-maven-plugin - 2.4 + ${reporting.taglist-plugin.version} @@ -271,7 +271,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-checkstyle-plugin - 2.11 + ${reporting.checkstyle-plugin.version} false false @@ -284,7 +284,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-pmd-plugin - 3.1 + ${reporting.pmd-plugin.version} 1.6 true @@ -303,7 +303,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. org.codehaus.mojo findbugs-maven-plugin - 2.5.3 + ${reporting.findbugs-plugin.version} From 4f43793e174e66415cd658b0e671bfb56a347e73 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 21 Jun 2015 17:43:04 +0200 Subject: [PATCH 8/9] Bonus: fixed copyright symbol Former-commit-id: 49d9f8af2055135238aa656cb69e20089a22e9fe --- dependency-check-cli/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml index ae36fd738..2fa1b66c9 100644 --- a/dependency-check-cli/pom.xml +++ b/dependency-check-cli/pom.xml @@ -198,7 +198,7 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. ${reporting.javadoc-plugin.version} false - Copyright© 2012-15 Jeremy Long. All Rights Reserved. + Copyright© 2012-15 Jeremy Long. All Rights Reserved. From c1ae4f8cc2f39ca401b10c806cb30582ee309384 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 21 Jun 2015 17:52:48 +0200 Subject: [PATCH 9/9] Replaced version numbers for reporting plugins in maven module Former-commit-id: e7ec67e0692d4233a2d6d651f50b0cd250c4587b --- dependency-check-maven/pom.xml | 22 +++++++++++----------- pom.xml | 4 +++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml index 7e93fef11..ea50f8cf3 100644 --- a/dependency-check-maven/pom.xml +++ b/dependency-check-maven/pom.xml @@ -130,7 +130,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + ${reporting.project-info-reports-plugin.version} @@ -144,7 +144,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-plugin-plugin - 3.2 + ${reporting.maven-plugin-plugin.version} dependency-check @@ -152,7 +152,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + ${reporting.javadoc-plugin.version} false Copyright© 2012-15 Jeremy Long. All Rights Reserved. @@ -169,7 +169,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.codehaus.mojo versions-maven-plugin - 2.1 + ${reporting.versions-plugin.version} @@ -182,17 +182,17 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-jxr-plugin - 2.4 + ${reporting.jxr-plugin.version} org.codehaus.mojo cobertura-maven-plugin - 2.6 + ${reporting.cobertura-plugin.version} org.apache.maven.plugins maven-surefire-report-plugin - 2.16 + ${reporting.surefire-report-plugin.version} @@ -204,7 +204,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.codehaus.mojo taglist-maven-plugin - 2.4 + ${reporting.taglist-plugin.version} @@ -228,7 +228,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-checkstyle-plugin - 2.11 + ${reporting.checkstyle-plugin.version} false false @@ -241,7 +241,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.apache.maven.plugins maven-pmd-plugin - 3.1 + ${reporting.pmd-plugin.version} 1.6 true @@ -261,7 +261,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.codehaus.mojo findbugs-maven-plugin - 2.5.3 + ${reporting.findbugs-plugin.version} diff --git a/pom.xml b/pom.xml index a66a1285a..6aefafccf 100644 --- a/pom.xml +++ b/pom.xml @@ -134,8 +134,10 @@ Copyright (c) 2012 - Jeremy Long 2.5.3 2.9.1 2.4 + + 3.2 3.0.1 - + 2.7 2.16 2.4