Skip to content

Commit c12b46f

Browse files
committed
Replace dependency management plugin with Gradle platform support
1 parent 666a4fe commit c12b46f

File tree

7 files changed

+62
-50
lines changed

7 files changed

+62
-50
lines changed

build.gradle

Lines changed: 10 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id 'io.spring.dependency-management' version '1.0.12.RELEASE'
32
id 'org.jetbrains.kotlin.jvm' version '1.6.21' apply false
43
}
54

@@ -12,8 +11,6 @@ ext {
1211
description = "Spring for GraphQL"
1312

1413
subprojects {
15-
apply plugin: 'io.spring.dependency-management'
16-
1714
group = 'org.springframework.graphql'
1815

1916
repositories {
@@ -56,53 +53,17 @@ configure(moduleProjects) {
5653
}
5754
}
5855

59-
dependencyManagement {
60-
imports {
61-
mavenBom "com.fasterxml.jackson:jackson-bom:2.13.3"
62-
mavenBom "io.projectreactor:reactor-bom:2020.0.21"
63-
mavenBom "org.springframework:spring-framework-bom:5.3.22"
64-
mavenBom "org.springframework.data:spring-data-bom:2021.2.2"
65-
mavenBom "org.springframework.security:spring-security-bom:5.7.2"
66-
mavenBom "com.querydsl:querydsl-bom:5.0.0"
67-
mavenBom "io.rsocket:rsocket-bom:1.1.2"
68-
mavenBom "org.jetbrains.kotlin:kotlin-bom:1.6.21"
69-
mavenBom "org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"
70-
mavenBom "org.junit:junit-bom:5.8.2"
71-
mavenBom "org.testcontainers:testcontainers-bom:1.17.3"
72-
}
73-
dependencies {
74-
dependency "com.graphql-java:graphql-java:${graphQlJavaVersion}"
75-
dependency "javax.annotation:javax.annotation-api:1.3.2"
76-
dependency "javax.servlet:javax.servlet-api:4.0.1"
77-
dependency "com.google.code.findbugs:jsr305:3.0.2"
78-
dependency "org.assertj:assertj-core:3.22.0"
79-
dependency "com.jayway.jsonpath:json-path:2.7.0"
80-
dependency "org.skyscreamer:jsonassert:1.5.1"
81-
dependency "com.h2database:h2:2.1.214"
82-
dependency "javax.validation:validation-api:2.0.1.Final"
83-
dependency "org.hibernate:hibernate-core:5.6.10.Final"
84-
dependency "org.hibernate.validator:hibernate-validator:6.2.3.Final"
85-
dependencySet(group: 'org.mongodb', version: '4.6.1') {
86-
entry 'bson'
87-
entry 'mongodb-driver-core'
88-
entry 'mongodb-driver-reactivestreams'
89-
entry 'mongodb-driver-sync'
90-
}
91-
dependencySet(group: 'org.apache.logging.log4j', version: '2.17.2') {
92-
entry 'log4j-api'
93-
entry 'log4j-core'
94-
entry 'log4j-jul'
95-
entry 'log4j-slf4j-impl'
96-
}
97-
dependencySet(group: 'org.mockito', version: '4.5.1') {
98-
entry 'mockito-core'
99-
entry 'mockito-inline'
100-
entry 'mockito-junit-jupiter'
101-
}
102-
}
103-
generatedPomCustomization {
104-
enabled = false
56+
configurations {
57+
dependencyManagement {
58+
canBeConsumed = false
59+
canBeResolved = false
60+
visible = false
10561
}
62+
matching { it.name.endsWith("Classpath") }.all { it.extendsFrom(dependencyManagement) }
63+
}
64+
65+
dependencies {
66+
dependencyManagement(enforcedPlatform(dependencies.project(path: ":platform")))
10667
}
10768

10869
ext.javadocLinks = [

platform/build.gradle

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
plugins {
2+
id 'java-platform'
3+
}
4+
5+
javaPlatform {
6+
allowDependencies()
7+
}
8+
9+
dependencies {
10+
api(platform("com.fasterxml.jackson:jackson-bom:2.13.3"))
11+
api(platform("io.projectreactor:reactor-bom:2020.0.21"))
12+
api(platform("org.springframework:spring-framework-bom:5.3.22"))
13+
api(platform("org.springframework.data:spring-data-bom:2021.2.2"))
14+
api(platform("org.springframework.security:spring-security-bom:5.7.2"))
15+
api(platform("com.querydsl:querydsl-bom:5.0.0"))
16+
api(platform("io.rsocket:rsocket-bom:1.1.2"))
17+
api(platform("org.jetbrains.kotlin:kotlin-bom:1.6.21"))
18+
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
19+
api(platform("org.junit:junit-bom:5.8.2"))
20+
api(platform("org.mockito:mockito-bom:4.5.1"))
21+
api(platform("org.testcontainers:testcontainers-bom:1.17.3"))
22+
api(platform("org.apache.logging.log4j:log4j-bom:2.17.2"))
23+
24+
constraints {
25+
api("com.graphql-java:graphql-java:${graphQlJavaVersion}")
26+
27+
api("javax.annotation:javax.annotation-api:1.3.2")
28+
api("javax.servlet:javax.servlet-api:4.0.1")
29+
api("javax.validation:validation-api:2.0.1.Final")
30+
31+
api("com.google.code.findbugs:jsr305:3.0.2")
32+
33+
api("org.assertj:assertj-core:3.22.0")
34+
api("com.jayway.jsonpath:json-path:2.7.0")
35+
api("org.skyscreamer:jsonassert:1.5.1")
36+
37+
api("com.h2database:h2:2.1.214")
38+
api("org.hibernate:hibernate-core:5.6.10.Final")
39+
api("org.hibernate.validator:hibernate-validator:6.2.3.Final")
40+
api("org.mongodb:bson:4.6.1")
41+
api("org.mongodb:mongodb-driver-core:4.6.1")
42+
api("org.mongodb:mongodb-driver-reactivestreams:4.6.1")
43+
api("org.mongodb:mongodb-driver-sync:4.6.1")
44+
}
45+
46+
}

samples/webflux-security/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id 'org.springframework.boot' version "${bootVersion}"
3+
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
34
id 'java'
45
}
56
group = 'com.example'

samples/webflux-websocket/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id 'org.springframework.boot' version "${bootVersion}"
3+
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
34
id 'java'
45
}
56
group = 'com.example'

samples/webmvc-http-security/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id 'org.springframework.boot' version "${bootVersion}"
3+
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
34
id 'java'
45
}
56
group = 'com.example'

samples/webmvc-http/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id 'org.springframework.boot' version "${bootVersion}"
3+
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
34
id 'java'
45
}
56
group = 'com.example'

settings.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ plugins {
2424
}
2525

2626
rootProject.name = 'spring-graphql'
27-
include 'spring-graphql',
27+
include 'platform',
28+
'spring-graphql',
2829
'spring-graphql-test',
2930
'spring-graphql-docs',
3031
'samples:webmvc-http',

0 commit comments

Comments
 (0)