From bec5185419cbf7d55b4ee0b56e94f450152a91c0 Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Tue, 10 Dec 2024 13:24:45 +0200 Subject: [PATCH] Update to Boot 3.4.0 Update to Commons-IO 2.18.0 --- gradle.properties | 7 ++++--- settings.gradle | 10 ++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 22eb3c6e..0278f3a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,12 @@ version=3.4.0-SNAPSHOT -springBootVersion=3.4.0-M3 +springBootVersion=3.4.0 nativeBuildToolsVersion=0.10.1 -commonsIoVersion=2.11.0 +commonsIoVersion=2.18.0 jlineVersion=3.26.3 -st4Version=4.3.3 +st4Version=4.3.4 jimfsVersion=1.2 gradleEnterpriseVersion=3.16.2 springGeConventionsVersion=0.0.15 findbugsVersion=3.0.2 org.gradle.caching=true +includeFfm=false \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 545cdaed..5c5591d2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -49,12 +49,18 @@ include 'spring-shell-table' include 'spring-shell-test' include 'spring-shell-test-autoconfigure' +def ffm = settings.properties.hasProperty('includeFfm') && settings.properties.property('includeFfm').asBoolean() + file("${rootDir}/spring-shell-starters").eachDirMatch(~/spring-shell-starter.*/) { - include "spring-shell-starters:${it.name}" + if((!it.name.endsWith('ffm') && !ffm) || ffm) { // skipping + include "spring-shell-starters:${it.name}" + } } file("${rootDir}/spring-shell-samples").eachDirMatch(~/spring-shell-sample.*/) { - include "spring-shell-samples:${it.name}" + if((!it.name.endsWith('ffm') && !ffm) || ffm) { // skipping + include "spring-shell-samples:${it.name}" + } } rootProject.children.each { project ->