change the org.springframework.boot to 3.4.2

Netflix · Feb 11, 2025 · a12dc33 · a12dc33
1 parent b6560c9
commit a12dc33
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 34 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ plugins {
     id "nebula.netflixoss" version "10.5.1"
     id "org.ajoberstar.grgit" version "4.1.1"
     id "org.ajoberstar.git-publish" version "3.0.1"
-    id "org.springframework.boot" version "${spring_boot_version}" apply false
+    id "org.springframework.boot" version "${spring_boot_3_version}" apply false
     id "org.asciidoctor.jvm.convert" version "3.3.2" apply false
     id "com.gorylenko.gradle-git-properties" version "2.3.2" apply false
     id "com.google.protobuf" version "0.8.18" apply false
@@ -305,25 +305,18 @@ configure((Set<Project>) ext.javaProjects) {
     }
 }
 
-// Configuration for Spring Boot 3
-ext {
-    sb3DependencyManagement = {
-        dependencyManagement {
-            imports {
-                mavenBom module: "org.springframework.boot:spring-boot-dependencies:${spring_boot_3_version}"
-                mavenBom module: "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_3_version}"
-                mavenBom module: "io.awspring.cloud:spring-cloud-aws-dependencies:${spring_cloud_aws_3_version}"
+subprojects {
+    if (project.name != 'genie-agent' || project.name != 'genie-web') {
+        imports {
+            if (project.name == 'genie-agent' || project.name == 'genie-web') {
+                mavenBom "org.springframework.boot:spring-boot-dependencies:${spring_boot_3_version}"
+                mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_3_version}"
+                mavenBom "io.awspring.cloud:spring-cloud-aws-dependencies:${spring_cloud_aws_3_version}"
                 mavenBom "software.amazon.awssdk:bom:2.13.1"
                 mavenBom "io.zipkin.brave:brave-bom:5.13.3"
             }
         }
     }
-
-    sb3Dependencies = {
-        dependencies {
-            // Add other dependencies here
-        }
-    }
 }
 
 /**********************************

diff --git a/genie-agent/build.gradle b/genie-agent/build.gradle
@@ -1,10 +1,6 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
 
-plugins {
-    id "org.springframework.boot" version "${spring_boot_3_version}"
-}
-
 apply plugin: "java-library"
 
 license {
@@ -27,10 +23,6 @@ java {
     }
 }
 
-// Apply Spring Boot 3 configurations
-sb3DependencyManagement()
-sb3Dependencies()
-
 dependencies {
     /*******************************
      * Annotation Processors
@@ -61,7 +53,7 @@ dependencies {
      *******************************/
 
     implementation("io.grpc:grpc-netty")
-    implementation("io.awspring.cloud:spring-cloud-starter-aws")
+    implementation("io.awspring.cloud:spring-cloud-aws-starter")
     implementation("io.zipkin.brave:brave")
     implementation("io.zipkin.brave:brave-instrumentation-grpc")
     implementation("org.apache.commons:commons-lang3")
@@ -70,7 +62,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter")
     implementation("org.springframework.boot:spring-boot-starter-log4j2")
     implementation("org.springframework.boot:spring-boot-starter-validation")
-    implementation("org.springframework.cloud:spring-cloud-starter-sleuth")
 
     /*******************************
      * Compile Only Dependencies

diff --git a/genie-web/build.gradle b/genie-web/build.gradle
@@ -1,10 +1,6 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
 
-plugins {
-    id "org.springframework.boot" version "${spring_boot_3_version}"
-}
-
 apply plugin: "java-library"
 apply plugin: "org.asciidoctor.jvm.convert"
 
@@ -31,10 +27,6 @@ configurations {
     genieAgent
 }
 
-// Apply Spring Boot 3 configurations
-sb3DependencyManagement()
-sb3Dependencies()
-
 dependencies {
     /*******************************
      * Annotation Processors
@@ -92,7 +84,7 @@ dependencies {
     implementation("commons-validator:commons-validator")
     implementation("io.grpc:grpc-netty")
     implementation("io.grpc:grpc-protobuf")
-    implementation("io.awspring.cloud:spring-cloud-starter-aws")
+    implementation("io.awspring.cloud:spring-cloud-aws-starter")
     implementation("io.awspring.cloud:spring-cloud-starter-aws-messaging")
     implementation("io.zipkin.brave:brave")
     implementation("io.zipkin.brave:brave-instrumentation-grpc")