Skip to content

Commit e83d867

Browse files
remkopremkop
committed
[BUILD][DOC] (picocli-spring-boot-starter) stay up-to-date with recent Spring 3 versions
1 parent 96fb7cc commit e83d867

File tree

3 files changed

+45
-34
lines changed

3 files changed

+45
-34
lines changed

‎dependencies.gradle

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
// This file works around dependabot issue https://github.com/dependabot/dependabot-core/issues/1618
22
// See https://www.sameerkulkarni.de/posts/dependabot-with-gradle/
33

4-
// Spring Boot 3.0 requires Java 17 as a minimum version
5-
boolean useSpring3 = JavaVersion.current().majorVersion.compareTo("17") >= 0;
6-
logger.quiet("dependencies.gradle: JavaVersion=${JavaVersion.current()}")
7-
logger.quiet("dependencies.gradle: JavaVersion.majorVersion=${JavaVersion.current().majorVersion}")
8-
logger.quiet("dependencies.gradle: useSpring3=${useSpring3}")
9-
104
ext {
115
// PICOCLI VERSION
126

@@ -31,35 +25,38 @@ ext {
3125
junitDepVersion = "4.11"
3226
junitVersion = "4.13.2"
3327
log4j2Version = "2.20.0"
34-
springBootVersion = useSpring3 ? "3.1.2" : "2.7.11" // Spring Boot 3.0 requires Java 17 as a minimum version
28+
springBootVersion = "3.1.2" // Spring Boot 3.0 requires Java 17 as a minimum version
3529
systemRulesVersion = "1.19.0"
3630
systemLambdaVersion = '1.2.1'
3731
junit5Version = '5.9.3'
3832

3933
supportDependencies = [
40-
junit : "junit:junit:$junitVersion",
41-
junit5Api : "org.junit.jupiter:junit-jupiter-api:$junit5Version",
42-
junit5Engine : "org.junit.jupiter:junit-jupiter-engine:$junit5Version",
43-
systemLambda : "com.github.stefanbirkner:system-lambda:$systemLambdaVersion",
44-
hamcrestCore : "org.hamcrest:hamcrest-core:$hamcrestCoreVersion",
45-
jansi : "org.fusesource.jansi:jansi:$jansiVersion",
46-
groovy : "org.codehaus.groovy:groovy-all:$groovyVersion",
47-
systemRules : "com.github.stefanbirkner:system-rules:$systemRulesVersion",
48-
junitParams : "pl.pragmatists:JUnitParams:1.1.1",
49-
springbootstarter : "org.springframework.boot:spring-boot-starter:$springBootVersion",
50-
springbootannproc : "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion",
51-
springboottest : "org.springframework.boot:spring-boot-starter-test:$springBootVersion",
52-
jline3 : "org.jline:jline:$jline3Version",
53-
jline2 : "jline:jline:$jline2Version",
54-
ivy : "org.apache.ivy:ivy:$ivyVersion",
55-
compileTesting : "com.google.testing.compile:compile-testing:$compileTestingVersion",
56-
log4j2api : "org.apache.logging.log4j:log4j-api:$log4j2Version",
57-
log4j2core : "org.apache.logging.log4j:log4j-core:$log4j2Version",
58-
kotlin_stdlib : "org.jetbrains.kotlin:kotlin-stdlib",
59-
scala_lang : "org.scala-lang:scala-library:2.13.10",
60-
validation_api : "jakarta.validation:jakarta.validation-api:3.0.2",
61-
//el_api : "jakarta.el:jakarta.el-api:3.0.3",
62-
el_impl : "org.glassfish:jakarta.el:4.0.2",
34+
junit : "junit:junit:$junitVersion",
35+
junit5Api : "org.junit.jupiter:junit-jupiter-api:$junit5Version",
36+
junit5Engine : "org.junit.jupiter:junit-jupiter-engine:$junit5Version",
37+
systemLambda : "com.github.stefanbirkner:system-lambda:$systemLambdaVersion",
38+
hamcrestCore : "org.hamcrest:hamcrest-core:$hamcrestCoreVersion",
39+
jansi : "org.fusesource.jansi:jansi:$jansiVersion",
40+
groovy : "org.codehaus.groovy:groovy-all:$groovyVersion",
41+
systemRules : "com.github.stefanbirkner:system-rules:$systemRulesVersion",
42+
junitParams : "pl.pragmatists:JUnitParams:1.1.1",
43+
springbootstarter : "org.springframework.boot:spring-boot-starter:$springBootVersion",
44+
springbootannproc : "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion",
45+
springboottest : "org.springframework.boot:spring-boot-starter-test:$springBootVersion",
46+
springbootstarterOld : "org.springframework.boot:spring-boot-starter:2.7.11",
47+
springbootannprocOld : "org.springframework.boot:spring-boot-configuration-processor:2.7.11",
48+
springboottestOld : "org.springframework.boot:spring-boot-starter-test:2.7.11",
49+
jline3 : "org.jline:jline:$jline3Version",
50+
jline2 : "jline:jline:$jline2Version",
51+
ivy : "org.apache.ivy:ivy:$ivyVersion",
52+
compileTesting : "com.google.testing.compile:compile-testing:$compileTestingVersion",
53+
log4j2api : "org.apache.logging.log4j:log4j-api:$log4j2Version",
54+
log4j2core : "org.apache.logging.log4j:log4j-core:$log4j2Version",
55+
kotlin_stdlib : "org.jetbrains.kotlin:kotlin-stdlib",
56+
scala_lang : "org.scala-lang:scala-library:2.13.10",
57+
validation_api : "jakarta.validation:jakarta.validation-api:3.0.2",
58+
//el_api : "jakarta.el:jakarta.el-api:3.0.3",
59+
el_impl : "org.glassfish:jakarta.el:4.0.2",
6360

6461
hibernate_validator_annproc: "org.hibernate.validator:hibernate-validator-annotation-processor:8.0.0.Final",
6562
hibernate_validator : "org.hibernate.validator:hibernate-validator:8.0.0.Final",

‎picocli-spring-boot-starter/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ command line applications with Spring and picocli.
1313

1414
## Dependency Management
1515

16-
Picocli 4.7.4 has been tested with Spring Boot 2.5, 2.6 and 2.7 up to 2.7.5.
16+
Picocli 4.7.4 has been tested with Spring Boot 2.5, 2.6, 2.7, and 3.1 up to 3.1.2.
1717

1818
Add the following dependency:
1919

‎picocli-spring-boot-starter/build.gradle

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,23 @@ if (useJava17) {
2222

2323
dependencies {
2424
api rootProject
25-
api supportDependencies.springbootstarter
26-
annotationProcessor supportDependencies.springbootannproc
27-
testImplementation supportDependencies.springboottest
25+
if (useJava17) {
26+
api supportDependencies.springbootstarter
27+
annotationProcessor supportDependencies.springbootannproc
28+
testImplementation supportDependencies.springboottest
29+
30+
logger.quiet("picocli-spring-boot-starter/build.gradle: api ${supportDependencies.springbootstarter}")
31+
logger.quiet("picocli-spring-boot-starter/build.gradle: annotationProcessor ${supportDependencies.springbootannproc}")
32+
logger.quiet("picocli-spring-boot-starter/build.gradle: testImplementation ${supportDependencies.springboottest}")
33+
} else {
34+
api supportDependencies.springbootstarterOld
35+
annotationProcessor supportDependencies.springbootannprocOld
36+
testImplementation supportDependencies.springboottestOld
37+
38+
logger.quiet("picocli-spring-boot-starter/build.gradle: api ${supportDependencies.springbootstarterOld}")
39+
logger.quiet("picocli-spring-boot-starter/build.gradle: annotationProcessor ${supportDependencies.springbootannprocOld}")
40+
logger.quiet("picocli-spring-boot-starter/build.gradle: testImplementation ${supportDependencies.springboottestOld}")
41+
}
2842
}
2943

3044
jar {

0 commit comments

Comments
 (0)