From 5b3d88a464c641181171d9c575e74e63f62259f8 Mon Sep 17 00:00:00 2001
From: Sergio del Amo <sergio.delamo@softamo.com>
Date: Mon, 30 Sep 2024 14:57:33 +0200
Subject: [PATCH] =?UTF-8?q?don=E2=80=99t=20define=20spring-boot=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle/libs.versions.toml           |  7 ++++---
 settings.gradle                     |  4 ----
 test-suite-java-spring/build.gradle | 10 ++++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c48c921135..569dc26a6f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,7 +23,6 @@ commons-text = "1.12.0"
 guava = "33.3.1-jre"
 jmustache = "1.16"
 commonmark = "0.23.0"
-spring-boot = "3.3.3"
 
 micronaut = "4.6.5"
 micronaut-platform = "4.6.2"
@@ -91,8 +90,10 @@ commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "co
 commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 commonmark = { module = "org.commonmark:commonmark", version.ref = "commonmark" }
-spring-boot-dependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-boot" }
-
+spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web" }
+spring-boot-starter-validation = { module = "org.springframework.boot:spring-boot-starter-validation" }
+spring-boot-starter-data-rest = { module = "org.springframework.boot:spring-boot-starter-data-rest" }
+spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test" }
 openapi-generator = { module = "org.openapitools:openapi-generator", version.ref = "openapi-generator" }
 swagger-parser = { module = "io.swagger:swagger-parser", version.ref = "swagger-parser" }
 swagger-parser-v3 = { module = "io.swagger.parser.v3:swagger-parser-v3", version.ref = "swagger-parser-v3" }
diff --git a/settings.gradle b/settings.gradle
index 3a38bd9ac9..49da0e78ec 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -8,7 +8,6 @@ pluginManagement {
 
 plugins {
     id 'io.micronaut.build.shared.settings' version '7.2.1'
-    id "dev.aga.gradle.version-catalog-generator" version "1.5.0"
 }
 enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
 
@@ -37,9 +36,6 @@ dependencyResolutionManagement {
     repositories {
         mavenCentral()
     }
-    versionCatalogs {
-        generator.generate("spring") { from(toml("spring-boot-dependencies")) }
-    }
 }
 
 micronautBuild {
diff --git a/test-suite-java-spring/build.gradle b/test-suite-java-spring/build.gradle
index f635c2575d..f89fa60fa3 100644
--- a/test-suite-java-spring/build.gradle
+++ b/test-suite-java-spring/build.gradle
@@ -23,16 +23,18 @@ dependencies {
     compileOnly(mn.micronaut.inject.java)
     compileOnly(mnSerde.micronaut.serde.api)
 
-    implementation(spring.spring.springBootStarterWeb)
-    implementation(spring.spring.springBootStarterValidation)
-    implementation(spring.spring.springBootStarterDataRest)
+    implementation(platform("org.springframework.boot:spring-boot-dependencies:${mnSpring.versions.spring.boot.get()}"))
+    implementation(libs.spring.boot.starter.web)
+    implementation(libs.spring.boot.starter.validation)
+    implementation(libs.spring.boot.starter.data.rest)
 
     testCompileOnly(projects.micronautOpenapiAnnotations)
     testCompileOnly(mn.jackson.annotations)
     testCompileOnly(mn.micronaut.inject.java)
     testCompileOnly(mnSerde.micronaut.serde.api)
 
-    testImplementation(spring.spring.springBootStarterTest)
+    testImplementation("org.springframework.boot:spring-boot-dependencies:${mnSpring.versions.spring.boot.get()}" )
+    testImplementation(libs.spring.boot.starter.test)
     testImplementation(mnTest.junit.jupiter.api)
     testImplementation(projects.micronautOpenapiCommon)