Skip to content

Commit 7c5e128

Browse files
committed
BUILD (picocli-spring-boot-starter) enable dependabot for Spring 3+ updates
1 parent 211c24d commit 7c5e128

File tree

3 files changed

+14
-19
lines changed

3 files changed

+14
-19
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,3 @@ updates:
1212
ignore:
1313
# For Groovy, ignore all updates
1414
- dependency-name: "org.codehaus.groovy:groovy-all"
15-
# For Spring-boot, version 3 requires Java 17
16-
- dependency-name: "org.springframework.boot:spring-boot-starter"
17-
versions: ["3.+"]
18-
- dependency-name: "org.springframework.boot:spring-boot-configuration-processor"
19-
versions: ["3.+"]
20-
- dependency-name: "org.springframework.boot:spring-boot-starter-test"
21-
versions: ["3.+"]

dependencies.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ ext {
4343
springbootstarter : "org.springframework.boot:spring-boot-starter:$springBootVersion",
4444
springbootannproc : "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion",
4545
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",
4946
jline3 : "org.jline:jline:$jline3Version",
5047
jline2 : "jline:jline:$jline2Version",
5148
ivy : "org.apache.ivy:ivy:$ivyVersion",

picocli-spring-boot-starter/build.gradle

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ ext.moduleName = 'info.picocli.spring.boot'
99

1010
// Spring 3 requires Java 17
1111
boolean useJava17 = JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)
12-
logger.quiet("dependencies.gradle: JavaVersion=${JavaVersion.current()}")
13-
logger.quiet("dependencies.gradle: JavaVersion.majorVersion=${JavaVersion.current().majorVersion}")
14-
logger.quiet("dependencies.gradle: useJava17=${useJava17}")
12+
logger.quiet("picocli-spring-boot-starter/build.gradle: JavaVersion=${JavaVersion.current()}")
13+
logger.quiet("picocli-spring-boot-starter/build.gradle: JavaVersion.majorVersion=${JavaVersion.current().majorVersion}")
14+
logger.quiet("picocli-spring-boot-starter/build.gradle: useJava17=${useJava17}")
1515

1616
if (useJava17) {
1717
logger.quiet("picocli-spring-boot-starter/build.gradle: JavaVersion=${JavaVersion.current()}")
@@ -35,13 +35,18 @@ dependencies {
3535
logger.quiet("picocli-spring-boot-starter/build.gradle: annotationProcessor ${supportDependencies.springbootannproc}")
3636
logger.quiet("picocli-spring-boot-starter/build.gradle: testImplementation ${supportDependencies.springboottest}")
3737
} else {
38-
api supportDependencies.springbootstarterOld
39-
annotationProcessor supportDependencies.springbootannprocOld
40-
testImplementation supportDependencies.springboottestOld
38+
// These should not be updated by dependabot
39+
String springbootstarterOld = "org.springframework.boot:spring-boot-starter:2.7.11"
40+
String springbootannprocOld = "org.springframework.boot:spring-boot-configuration-processor:2.7.11"
41+
String springboottestOld = "org.springframework.boot:spring-boot-starter-test:2.7.11"
4142

42-
logger.quiet("picocli-spring-boot-starter/build.gradle: api ${supportDependencies.springbootstarterOld}")
43-
logger.quiet("picocli-spring-boot-starter/build.gradle: annotationProcessor ${supportDependencies.springbootannprocOld}")
44-
logger.quiet("picocli-spring-boot-starter/build.gradle: testImplementation ${supportDependencies.springboottestOld}")
43+
api springbootstarterOld
44+
annotationProcessor springbootannprocOld
45+
testImplementation springboottestOld
46+
47+
logger.quiet("picocli-spring-boot-starter/build.gradle: api ${springbootstarterOld}")
48+
logger.quiet("picocli-spring-boot-starter/build.gradle: annotationProcessor ${springbootannprocOld}")
49+
logger.quiet("picocli-spring-boot-starter/build.gradle: testImplementation ${springboottestOld}")
4550
}
4651
}
4752

0 commit comments

Comments
 (0)