From 7c5e1285125e1ea174b8356894326ba40fe19ebf Mon Sep 17 00:00:00 2001
From: Remko Popma <remkop@yahoo.com>
Date: Sun, 27 Aug 2023 06:52:02 +0900
Subject: [PATCH] BUILD (picocli-spring-boot-starter) enable dependabot for
 Spring 3+ updates

---
 .github/dependabot.yml                   |  7 -------
 dependencies.gradle                      |  3 ---
 picocli-spring-boot-starter/build.gradle | 23 ++++++++++++++---------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8bd043096..5e1304062 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -12,10 +12,3 @@ updates:
     ignore:
       # For Groovy, ignore all updates
       - dependency-name: "org.codehaus.groovy:groovy-all"
-      # For Spring-boot, version 3 requires Java 17
-      - dependency-name: "org.springframework.boot:spring-boot-starter"
-        versions: ["3.+"]
-      - dependency-name: "org.springframework.boot:spring-boot-configuration-processor"
-        versions: ["3.+"]
-      - dependency-name: "org.springframework.boot:spring-boot-starter-test"
-        versions: ["3.+"]
diff --git a/dependencies.gradle b/dependencies.gradle
index 5fb826a90..5ebbe91ef 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -43,9 +43,6 @@ ext {
         springbootstarter    : "org.springframework.boot:spring-boot-starter:$springBootVersion",
         springbootannproc    : "org.springframework.boot:spring-boot-configuration-processor:$springBootVersion",
         springboottest       : "org.springframework.boot:spring-boot-starter-test:$springBootVersion",
-        springbootstarterOld : "org.springframework.boot:spring-boot-starter:2.7.11",
-        springbootannprocOld : "org.springframework.boot:spring-boot-configuration-processor:2.7.11",
-        springboottestOld    : "org.springframework.boot:spring-boot-starter-test:2.7.11",
         jline3               : "org.jline:jline:$jline3Version",
         jline2               : "jline:jline:$jline2Version",
         ivy                  : "org.apache.ivy:ivy:$ivyVersion",
diff --git a/picocli-spring-boot-starter/build.gradle b/picocli-spring-boot-starter/build.gradle
index f9127362a..39c23ca60 100644
--- a/picocli-spring-boot-starter/build.gradle
+++ b/picocli-spring-boot-starter/build.gradle
@@ -9,9 +9,9 @@ ext.moduleName = 'info.picocli.spring.boot'
 
 // Spring 3 requires Java 17
 boolean useJava17 = JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)
-logger.quiet("dependencies.gradle: JavaVersion=${JavaVersion.current()}")
-logger.quiet("dependencies.gradle: JavaVersion.majorVersion=${JavaVersion.current().majorVersion}")
-logger.quiet("dependencies.gradle: useJava17=${useJava17}")
+logger.quiet("picocli-spring-boot-starter/build.gradle: JavaVersion=${JavaVersion.current()}")
+logger.quiet("picocli-spring-boot-starter/build.gradle: JavaVersion.majorVersion=${JavaVersion.current().majorVersion}")
+logger.quiet("picocli-spring-boot-starter/build.gradle: useJava17=${useJava17}")
 
 if (useJava17) {
     logger.quiet("picocli-spring-boot-starter/build.gradle: JavaVersion=${JavaVersion.current()}")
@@ -35,13 +35,18 @@ dependencies {
         logger.quiet("picocli-spring-boot-starter/build.gradle: annotationProcessor ${supportDependencies.springbootannproc}")
         logger.quiet("picocli-spring-boot-starter/build.gradle: testImplementation  ${supportDependencies.springboottest}")
     } else {
-        api                 supportDependencies.springbootstarterOld
-        annotationProcessor supportDependencies.springbootannprocOld
-        testImplementation  supportDependencies.springboottestOld
+        // These should not be updated by dependabot
+        String springbootstarterOld = "org.springframework.boot:spring-boot-starter:2.7.11"
+        String springbootannprocOld = "org.springframework.boot:spring-boot-configuration-processor:2.7.11"
+        String springboottestOld    = "org.springframework.boot:spring-boot-starter-test:2.7.11"
 
-        logger.quiet("picocli-spring-boot-starter/build.gradle: api                 ${supportDependencies.springbootstarterOld}")
-        logger.quiet("picocli-spring-boot-starter/build.gradle: annotationProcessor ${supportDependencies.springbootannprocOld}")
-        logger.quiet("picocli-spring-boot-starter/build.gradle: testImplementation  ${supportDependencies.springboottestOld}")
+        api                 springbootstarterOld
+        annotationProcessor springbootannprocOld
+        testImplementation  springboottestOld
+
+        logger.quiet("picocli-spring-boot-starter/build.gradle: api                 ${springbootstarterOld}")
+        logger.quiet("picocli-spring-boot-starter/build.gradle: annotationProcessor ${springbootannprocOld}")
+        logger.quiet("picocli-spring-boot-starter/build.gradle: testImplementation  ${springboottestOld}")
     }
 }