From ff2e4b9c95b93cb584478a5a2ffc045f0c2871e2 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 17 Jun 2017 08:29:05 +0100 Subject: [PATCH 1/6] builder: move dependency management to parent pom --- builder/pom.xml | 33 +-------------------------------- pom.xml | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 32 deletions(-) diff --git a/builder/pom.xml b/builder/pom.xml index 7e78680..db2a912 100644 --- a/builder/pom.xml +++ b/builder/pom.xml @@ -31,26 +31,6 @@ 2016 - - Brussels-SR2 - 1.5.3.RELEASE - 2.3.5 - 1.0.0 - 4.3.0 - - - - - - io.spring.platform - platform-bom - ${spring-platform.version} - pom - import - - - - org.springframework.boot @@ -74,39 +54,28 @@ com.speedment.common mapstream - ${mapstream.version} org.springframework.boot spring-boot-starter-test test - - org.assertj - assertj-core - ${assertj.version} - test - me.andrz map-builder - ${map-builder.version} test com.puppycrawl.tools checkstyle - ${checkstyle.version} - compile com.github.sevntu-checkstyle sevntu-checks - ${sevntu.version} - + diff --git a/pom.xml b/pom.xml index 5361cf7..8a4a976 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,12 @@ 7.8 1.24.0 + Brussels-SR2 + 1.5.3.RELEASE + 2.3.5 + 1.0.0 + 4.3.0 + 1.10.19 3.8.0 @@ -50,6 +56,28 @@ + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + com.github.sevntu-checkstyle + sevntu-checks + ${sevntu.version} + + + io.spring.platform + platform-bom + ${spring-platform.version} + pom + import + + + com.speedment.common + mapstream + ${mapstream.version} + org.mockito mockito-core @@ -60,6 +88,11 @@ assertj-core ${assertj.version} + + me.andrz + map-builder + ${map-builder.version} + From d4854f6c0d467c5d983628b85ad1c2479e778514 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 17 Jun 2017 08:36:22 +0100 Subject: [PATCH 2/6] regressions: pom.xml: delegate immutables version to parent pom --- pom.xml | 6 ++++++ regressions/pom.xml | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8a4a976..9a14db6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ 2.3.5 1.0.0 4.3.0 + 2.4.4 1.10.19 3.8.0 @@ -93,6 +94,11 @@ map-builder ${map-builder.version} + + org.immutables + value + ${immutables-value.version} + diff --git a/regressions/pom.xml b/regressions/pom.xml index fddbb48..4ed33ba 100644 --- a/regressions/pom.xml +++ b/regressions/pom.xml @@ -16,14 +16,12 @@ ${project.version} 5-complexity true - 2.4.4 org.immutables value - ${immutables.version} provided From caf3c89d25000d25be2c862b2cf4486634769f53 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 17 Jun 2017 08:36:40 +0100 Subject: [PATCH 3/6] pom.xml: upgrade spring boot/platform to 1.5.4 and Brussels-SR3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9a14db6..5d9b351 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,8 @@ 7.8 1.24.0 - Brussels-SR2 - 1.5.3.RELEASE + Brussels-SR3 + 1.5.4.RELEASE 2.3.5 1.0.0 4.3.0 From bbb5accb96d75a23bf4e370545aa9f98a8405897 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 17 Jun 2017 08:51:13 +0100 Subject: [PATCH 4/6] pom.xml: upgrade checkstyle to 7.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d9b351..44e2e84 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.17 - 7.8 + 7.8.1 1.24.0 Brussels-SR3 From a37bcdb5c739513ea278f63d3caf11e1609e34ae Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 17 Jun 2017 08:51:57 +0100 Subject: [PATCH 5/6] pom.xml: upgrade immutables to 2.5.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44e2e84..003bfc0 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 2.3.5 1.0.0 4.3.0 - 2.4.4 + 2.5.3 1.10.19 3.8.0 From b4637154c3762d4fc3f057625c220628f27b69dc Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 17 Jun 2017 08:52:13 +0100 Subject: [PATCH 6/6] pom.xml: upgrade mockito to 2.8.47 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 003bfc0..1c0b0da 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 4.3.0 2.5.3 - 1.10.19 + 2.8.47 3.8.0