don’t define spring-boot version

micronaut-projects · Oct 1, 2024 · 553aa2a · 553aa2a
1 parent 438b377
commit 553aa2a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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/src/main/docs/guide/spring/springWithGradle.adoc b/src/main/docs/guide/spring/springWithGradle.adoc
@@ -8,9 +8,10 @@ dependencies {
     // add to annotationProcessor and compileOnly blocks next libraries:
 
     annotationProcessor("io.micronaut:micronaut-inject-java:$micronautCoreVersion")
-    annotationProcessor("io.micronaut.spring:micronaut-spring-annotation:$micronautSpringVersion")
-    annotationProcessor("io.micronaut.spring:micronaut-spring-web-annotation:$micronautSpringVersion")
-    annotationProcessor("io.micronaut.spring:micronaut-spring-boot-annotation:$micronautSpringVersion")
+    annotationProcessor(platfom("io.micronaut.spring:micronaut-spring-bom:$micronautSpringVersion"))
+    annotationProcessor("io.micronaut.spring:micronaut-spring-annotation")
+    annotationProcessor("io.micronaut.spring:micronaut-spring-web-annotation")
+    annotationProcessor("io.micronaut.spring:micronaut-spring-boot-annotation")
     annotationProcessor("io.micronaut.openapi:micronaut-openapi:$micronautOpenapiVersion")
 
     compileOnly("io.micronaut:micronaut-inject-java:$micronautCoreVersion")

diff --git 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)