From 069e22049d8cf3872896fac26b82c1db93198b46 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sat, 21 Feb 2015 16:35:45 +0100 Subject: [PATCH 1/3] Upgrade jmockit to latest version Former-commit-id: 8e429f8b304f6c4db4ed7a88ee775f78e80260b3 --- dependency-check-maven/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml index 2fead7d15..1c5592f11 100644 --- a/dependency-check-maven/pom.xml +++ b/dependency-check-maven/pom.xml @@ -294,7 +294,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.jmockit jmockit - 1.14 + 1.15 test From 0f3ffaf27034d11fe66746fa048eac36dc99de42 Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 22 Feb 2015 12:46:54 +0100 Subject: [PATCH 2/3] Use dependencyManagement to keep track of version numbers Former-commit-id: 954e599f46ab4a18e00cbd09a968e2d5dd6e0d0d --- pom.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0a184a269..f8220f91a 100644 --- a/pom.xml +++ b/pom.xml @@ -370,17 +370,29 @@ Copyright (c) 2012 - Jeremy Long + + + + junit + junit + 4.12 + + + org.hamcrest + hamcrest-core + 1.3 + + + junit junit - 4.12 test org.hamcrest hamcrest-core - 1.3 test From b53de8c69bc62ec92fd483145aa6ed85a14b220e Mon Sep 17 00:00:00 2001 From: Hans Joachim Desserud Date: Sun, 22 Feb 2015 12:50:52 +0100 Subject: [PATCH 3/3] Move jmockit to dependencyManagement so that we get a common version in all places it is used Former-commit-id: 2cfab936074b17a8f9b080a5272c6da757e32921 --- dependency-check-core/pom.xml | 1 - dependency-check-maven/pom.xml | 1 - pom.xml | 5 +++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml index df16e546b..afe4144ad 100644 --- a/dependency-check-core/pom.xml +++ b/dependency-check-core/pom.xml @@ -354,7 +354,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. org.jmockit jmockit - 1.14 test diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml index 1c5592f11..8854e6549 100644 --- a/dependency-check-maven/pom.xml +++ b/dependency-check-maven/pom.xml @@ -294,7 +294,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. org.jmockit jmockit - 1.15 test diff --git a/pom.xml b/pom.xml index f8220f91a..128f7219a 100644 --- a/pom.xml +++ b/pom.xml @@ -382,6 +382,11 @@ Copyright (c) 2012 - Jeremy Long hamcrest-core 1.3 + + org.jmockit + jmockit + 1.15 +