Skip to content

Commit 4fe4941

Browse files
author
Binbing Hou
committed
change the org.springframework.boot to 3.4.2
1 parent b6560c9 commit 4fe4941

File tree

3 files changed

+8
-33
lines changed

3 files changed

+8
-33
lines changed

build.gradle

+8-15
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818
id "nebula.netflixoss" version "10.5.1"
1919
id "org.ajoberstar.grgit" version "4.1.1"
2020
id "org.ajoberstar.git-publish" version "3.0.1"
21-
id "org.springframework.boot" version "${spring_boot_version}" apply false
21+
id "org.springframework.boot" version "${spring_boot_3_version}" apply false
2222
id "org.asciidoctor.jvm.convert" version "3.3.2" apply false
2323
id "com.gorylenko.gradle-git-properties" version "2.3.2" apply false
2424
id "com.google.protobuf" version "0.8.18" apply false
@@ -305,25 +305,18 @@ configure((Set<Project>) ext.javaProjects) {
305305
}
306306
}
307307

308-
// Configuration for Spring Boot 3
309-
ext {
310-
sb3DependencyManagement = {
311-
dependencyManagement {
312-
imports {
313-
mavenBom module: "org.springframework.boot:spring-boot-dependencies:${spring_boot_3_version}"
314-
mavenBom module: "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_3_version}"
315-
mavenBom module: "io.awspring.cloud:spring-cloud-aws-dependencies:${spring_cloud_aws_3_version}"
308+
subprojects {
309+
if (project.name != 'genie-agent' || project.name != 'genie-web') {
310+
imports {
311+
if (project.name == 'genie-agent' || project.name == 'genie-web') {
312+
mavenBom "org.springframework.boot:spring-boot-dependencies:${spring_boot_3_version}"
313+
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${spring_cloud_3_version}"
314+
mavenBom "io.awspring.cloud:spring-cloud-aws-dependencies:${spring_cloud_aws_3_version}"
316315
mavenBom "software.amazon.awssdk:bom:2.13.1"
317316
mavenBom "io.zipkin.brave:brave-bom:5.13.3"
318317
}
319318
}
320319
}
321-
322-
sb3Dependencies = {
323-
dependencies {
324-
// Add other dependencies here
325-
}
326-
}
327320
}
328321

329322
/**********************************

genie-agent/build.gradle

-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import org.apache.tools.ant.filters.ReplaceTokens
22
import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
33

4-
plugins {
5-
id "org.springframework.boot" version "${spring_boot_3_version}"
6-
}
7-
84
apply plugin: "java-library"
95

106
license {
@@ -27,10 +23,6 @@ java {
2723
}
2824
}
2925

30-
// Apply Spring Boot 3 configurations
31-
sb3DependencyManagement()
32-
sb3Dependencies()
33-
3426
dependencies {
3527
/*******************************
3628
* Annotation Processors
@@ -61,7 +53,6 @@ dependencies {
6153
*******************************/
6254

6355
implementation("io.grpc:grpc-netty")
64-
implementation("io.awspring.cloud:spring-cloud-starter-aws")
6556
implementation("io.zipkin.brave:brave")
6657
implementation("io.zipkin.brave:brave-instrumentation-grpc")
6758
implementation("org.apache.commons:commons-lang3")
@@ -70,7 +61,6 @@ dependencies {
7061
implementation("org.springframework.boot:spring-boot-starter")
7162
implementation("org.springframework.boot:spring-boot-starter-log4j2")
7263
implementation("org.springframework.boot:spring-boot-starter-validation")
73-
implementation("org.springframework.cloud:spring-cloud-starter-sleuth")
7464

7565
/*******************************
7666
* Compile Only Dependencies

genie-web/build.gradle

-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import org.apache.tools.ant.filters.ReplaceTokens
22
import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
33

4-
plugins {
5-
id "org.springframework.boot" version "${spring_boot_3_version}"
6-
}
7-
84
apply plugin: "java-library"
95
apply plugin: "org.asciidoctor.jvm.convert"
106

@@ -31,10 +27,6 @@ configurations {
3127
genieAgent
3228
}
3329

34-
// Apply Spring Boot 3 configurations
35-
sb3DependencyManagement()
36-
sb3Dependencies()
37-
3830
dependencies {
3931
/*******************************
4032
* Annotation Processors

0 commit comments

Comments
 (0)