Skip to content

Commit 8b6ec75

Browse files
committed
Fix Spring Boot dependency management in build
We should ensure that we do not depend on the Spring Boot dependency managagement and that docs should build against our project, and not the version managed by Spring Boot.
1 parent 12fcd6c commit 8b6ec75

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ ext {
88
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
99
springFrameworkVersion = "7.0.0-M8"
1010
graphQlJavaVersion = "25.0.beta-5"
11-
springBootVersion = "4.0.0-M1"
1211
}
1312

1413
subprojects {
@@ -20,8 +19,7 @@ subprojects {
2019
ext.javadocLinks = [
2120
"https://docs.oracle.com/en/java/javase/17/docs/api/",
2221
"https://javadoc.io/doc/com.graphql-java/graphql-java/${graphQlJavaVersion}/",
23-
"https://docs.spring.io/spring-framework/docs/${springFrameworkVersion}/javadoc-api/",
24-
"https://docs.spring.io/spring-boot/${springBootVersion}/api/java/",
22+
"https://docs.spring.io/spring-framework/docs/${springFrameworkVersion}/javadoc-api/"
2523
] as String[]
2624

2725
repositories {

spring-graphql-docs/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ configurations {
1515
matching { it.name.endsWith("Classpath") }.all { it.extendsFrom(dependencyManagement) }
1616
}
1717

18+
def springBootVersion = "4.0.0-M1"
19+
1820
dependencies {
1921
dependencyManagement(enforcedPlatform(dependencies.project(path: ":platform")))
2022
api project(':spring-graphql')
@@ -25,7 +27,9 @@ dependencies {
2527
implementation 'org.springframework:spring-messaging'
2628
implementation 'org.springframework.data:spring-data-commons'
2729
implementation 'com.querydsl:querydsl-core'
28-
implementation "org.springframework.boot:spring-boot-starter-graphql:${springBootVersion}"
30+
implementation ("org.springframework.boot:spring-boot-graphql:${springBootVersion}") {
31+
exclude group: 'org.springframework.graphql'
32+
}
2933
implementation "org.springframework.boot:spring-boot-starter-web:${springBootVersion}"
3034
implementation 'tools.jackson.core:jackson-databind'
3135
implementation 'io.rsocket:rsocket-core'

0 commit comments

Comments
 (0)