From 6437ba94bad8c1021d3ef4c51fe59e4d9efe00de Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 27 Aug 2018 08:18:22 +0100 Subject: [PATCH 1/4] [tile] Update versions for checkstyle and sevntu --- tile/tile.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tile/tile.xml b/tile/tile.xml index e0393c8..e75d05e 100644 --- a/tile/tile.xml +++ b/tile/tile.xml @@ -1,8 +1,8 @@ 3.0.0 - 8.10 - 1.29.0 + 8.12 + 1.32.0 DEV-SNAPSHOT 5-complexity net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml From 058a5393542fd34abff4770497c2e56c3fe89c45 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 27 Aug 2018 08:18:41 +0100 Subject: [PATCH 2/4] Update CHANGELOG --- CHANGELOG | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 715f1e2..bf3c15c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,19 +4,21 @@ CHANGELOG 4.1.2 ----- -* Upgrade `kemitix-parent` to 5.1.1 -* Upgrade `kemitix-maven-tiles` to 0.9.0 -* Upgrade `sevntu` to 1.30.0 -* Upgrade `lombok` to 1.18.0 -* Upgrade `spring-boot` to 1.5.14 -* Upgrade `mockito` to 2.19.0 -* Upgrade `assertj` to 3.10.0 -* Upgrade `conditional` to 0.4.0 -* Upgrade `fast-claspath-scanner` to 3.1.6 -* Upgrade `javax-annotation-api` to 1.3.2 -* Replaced Spring IO Platform dependency management with Spring Boot version -* Add badges to README +* Upgrade checkstyle to 8.12 +* Upgrade `sevntu` to 1.32.0 * Switch to trunk-based development +* Upgrade `kemitix-parent` to 5.1.1 +* [tile] Upgrade `kemitix-maven-tiles` to 0.9.0 +* [tile] Bump tiles-maven-plugin from 2.11 to 2.12 +* [builder] Replaced Spring IO Platform dependency management with Spring Boot version +* [builder] Bump spring-boot to 2.0.4.RELEASE +* [builder] Upgrade `lombok` to 1.18.2 +* [builder] Bump mockito-core from 2.19.0 to 2.21.0 +* [builder] Upgrade `assertj` to 3.11.0 +* [builder] Upgrade `conditional` to 0.6.0 +* [builder] Upgrade `fast-classpath-scanner` to `classgraph` +* [builder] Upgrade `javax-annotation-api` to 1.3.2 +* Add badges to README 4.1.1 ----- From 1eba91f3ba1db907b6493c588d49e9a1ad16e531 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 27 Aug 2018 09:02:57 +0100 Subject: [PATCH 3/4] Use tile filtering to specify dependencies in pom This will enable better detection of dependency upgrades. --- tile/pom.xml | 36 ++++++++++++++++++++++++++++++++++++ tile/tile.xml | 18 +++++------------- 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/tile/pom.xml b/tile/pom.xml index edc0657..5291db0 100644 --- a/tile/pom.xml +++ b/tile/pom.xml @@ -19,8 +19,43 @@ 2.12 0.8.1 + + 3.0.0 + 8.12 + 1.32.0 + + DEV-SNAPSHOT + 5-complexity + net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + provided + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + provided + + + com.github.sevntu-checkstyle + sevntu-checkstyle-maven-plugin + ${sevntu.version} + provided + + + net.kemitix.checkstyle + kemitix-checkstyle-ruleset + ${project.version} + provided + + + @@ -29,6 +64,7 @@ ${tiles-maven-plugin.version} true + true net.kemitix.tiles:maven-plugins:${kemitix-tiles.version} diff --git a/tile/tile.xml b/tile/tile.xml index e75d05e..54a3aee 100644 --- a/tile/tile.xml +++ b/tile/tile.xml @@ -1,37 +1,29 @@ - - 3.0.0 - 8.12 - 1.32.0 - DEV-SNAPSHOT - 5-complexity - net/kemitix/checkstyle-${kemitix.checkstyle.ruleset.level}.xml - org.apache.maven.plugins maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} + @maven-checkstyle-plugin.version@ com.puppycrawl.tools checkstyle - ${checkstyle.version} + @checkstyle.version@ com.github.sevntu-checkstyle sevntu-checkstyle-maven-plugin - ${sevntu.version} + @sevntu.version@ net.kemitix.checkstyle ruleset - ${kemitix.checkstyle.ruleset.version} + @kemitix.checkstyle.ruleset.version@ - ${kemitix.checkstyle.ruleset.location} + @kemitix.checkstyle.ruleset.location@ ${build.sourceDirectory} From 75c840abdf62b06faf3be17001b9679754be458d Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 27 Aug 2018 09:18:18 +0100 Subject: [PATCH 4/4] [tile] fix typo refering to ruleset --- tile/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tile/pom.xml b/tile/pom.xml index 5291db0..1b030da 100644 --- a/tile/pom.xml +++ b/tile/pom.xml @@ -50,7 +50,7 @@ net.kemitix.checkstyle - kemitix-checkstyle-ruleset + ruleset ${project.version} provided