Skip to content

Commit 08b2c56

Browse files
snicollsnicoll
committed
Order dependencies
Closes gh-44757
1 parent 86d08fb commit 08b2c56

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

Diff for: ‎settings.gradle

+13-13
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,18 @@ settings.gradle.projectsLoaded {
3737
}
3838
}
3939

40+
include "spring-boot-project:spring-boot"
41+
include "spring-boot-project:spring-boot-actuator"
42+
include "spring-boot-project:spring-boot-actuator-autoconfigure"
43+
include "spring-boot-project:spring-boot-autoconfigure"
4044
include "spring-boot-project:spring-boot-dependencies"
45+
include "spring-boot-project:spring-boot-devtools"
46+
include "spring-boot-project:spring-boot-docker-compose"
47+
include "spring-boot-project:spring-boot-docs"
4148
include "spring-boot-project:spring-boot-parent"
49+
include "spring-boot-project:spring-boot-test"
50+
include "spring-boot-project:spring-boot-test-autoconfigure"
51+
include "spring-boot-project:spring-boot-testcontainers"
4252
include "spring-boot-project:spring-boot-tools:spring-boot-antlib"
4353
include "spring-boot-project:spring-boot-tools:spring-boot-autoconfigure-processor"
4454
include "spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"
@@ -56,24 +66,14 @@ include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
5666
include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
5767
include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
5868
include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
59-
include "spring-boot-project:spring-boot"
60-
include "spring-boot-project:spring-boot-autoconfigure"
61-
include "spring-boot-project:spring-boot-actuator"
62-
include "spring-boot-project:spring-boot-actuator-autoconfigure"
63-
include "spring-boot-project:spring-boot-docker-compose"
64-
include "spring-boot-project:spring-boot-devtools"
65-
include "spring-boot-project:spring-boot-docs"
66-
include "spring-boot-project:spring-boot-test"
67-
include "spring-boot-project:spring-boot-testcontainers"
68-
include "spring-boot-project:spring-boot-test-autoconfigure"
69+
include "spring-boot-system-tests:spring-boot-deployment-tests"
70+
include "spring-boot-system-tests:spring-boot-image-tests"
6971
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-configuration-processor-tests"
7072
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests"
71-
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"
7273
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-classic-tests"
74+
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-loader-tests"
7375
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-server-tests"
7476
include "spring-boot-tests:spring-boot-integration-tests:spring-boot-sni-tests"
75-
include "spring-boot-system-tests:spring-boot-deployment-tests"
76-
include "spring-boot-system-tests:spring-boot-image-tests"
7777

7878
file("${rootDir}/spring-boot-project/spring-boot-starters").eachDirMatch(~/spring-boot-starter.*/) {
7979
include "spring-boot-project:spring-boot-starters:${it.name}"

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ plugins {
1010
description = "Spring Boot Actuator AutoConfigure"
1111

1212
dependencies {
13-
api(project(":spring-boot-project:spring-boot-actuator"))
1413
api(project(":spring-boot-project:spring-boot"))
14+
api(project(":spring-boot-project:spring-boot-actuator"))
1515
api(project(":spring-boot-project:spring-boot-autoconfigure"))
1616

1717
implementation("com.fasterxml.jackson.core:jackson-databind")

Diff for: ‎spring-boot-project/spring-boot-actuator/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ dependencies {
9292
optional("org.springframework.security:spring-security-web")
9393
optional("org.springframework.session:spring-session-core")
9494

95+
testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
9596
testImplementation(project(":spring-boot-project:spring-boot-test"))
9697
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
97-
testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
9898
testImplementation("org.assertj:assertj-core")
9999
testImplementation("com.jayway.jsonpath:json-path")
100100
testImplementation("io.micrometer:micrometer-observation-test")

Diff for: ‎spring-boot-project/spring-boot-autoconfigure/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ dependencies {
229229
optional("org.thymeleaf.extras:thymeleaf-extras-springsecurity6")
230230
optional("redis.clients:jedis")
231231

232-
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
233232
testImplementation(project(":spring-boot-project:spring-boot-test"))
233+
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
234234
testImplementation(testFixtures(project(":spring-boot-project:spring-boot")))
235235
testImplementation("ch.qos.logback:logback-classic")
236236
testImplementation("commons-fileupload:commons-fileupload")

Diff for: ‎spring-boot-project/spring-boot-dependencies/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -1946,9 +1946,6 @@ bom {
19461946
group("org.springframework.boot") {
19471947
modules = [
19481948
"spring-boot",
1949-
"spring-boot-test",
1950-
"spring-boot-test-autoconfigure",
1951-
"spring-boot-testcontainers",
19521949
"spring-boot-actuator",
19531950
"spring-boot-actuator-autoconfigure",
19541951
"spring-boot-autoconfigure",
@@ -1981,10 +1978,10 @@ bom {
19811978
"spring-boot-starter-data-ldap",
19821979
"spring-boot-starter-data-mongodb",
19831980
"spring-boot-starter-data-mongodb-reactive",
1981+
"spring-boot-starter-data-neo4j",
19841982
"spring-boot-starter-data-r2dbc",
19851983
"spring-boot-starter-data-redis",
19861984
"spring-boot-starter-data-redis-reactive",
1987-
"spring-boot-starter-data-neo4j",
19881985
"spring-boot-starter-data-rest",
19891986
"spring-boot-starter-freemarker",
19901987
"spring-boot-starter-graphql",
@@ -2015,9 +2012,12 @@ bom {
20152012
"spring-boot-starter-undertow",
20162013
"spring-boot-starter-validation",
20172014
"spring-boot-starter-web",
2015+
"spring-boot-starter-web-services",
20182016
"spring-boot-starter-webflux",
20192017
"spring-boot-starter-websocket",
2020-
"spring-boot-starter-web-services"
2018+
"spring-boot-test",
2019+
"spring-boot-test-autoconfigure",
2020+
"spring-boot-testcontainers"
20212021
]
20222022
plugins = [
20232023
"spring-boot-maven-plugin"

Diff for: ‎spring-boot-project/spring-boot-docs/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,17 @@ plugins.withType(EclipsePlugin) {
5050
}
5151

5252
dependencies {
53-
autoConfiguration(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "autoConfigurationMetadata"))
5453
autoConfiguration(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "autoConfigurationMetadata"))
54+
autoConfiguration(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "autoConfigurationMetadata"))
5555
autoConfiguration(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "autoConfigurationMetadata"))
5656
autoConfiguration(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "autoConfigurationMetadata"))
5757

5858
configurationProperties(project(path: ":spring-boot-project:spring-boot", configuration: "configurationPropertiesMetadata"))
5959
configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator", configuration: "configurationPropertiesMetadata"))
6060
configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "configurationPropertiesMetadata"))
6161
configurationProperties(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "configurationPropertiesMetadata"))
62-
configurationProperties(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "configurationPropertiesMetadata"))
6362
configurationProperties(project(path: ":spring-boot-project:spring-boot-devtools", configuration: "configurationPropertiesMetadata"))
63+
configurationProperties(project(path: ":spring-boot-project:spring-boot-docker-compose", configuration: "configurationPropertiesMetadata"))
6464
configurationProperties(project(path: ":spring-boot-project:spring-boot-test-autoconfigure", configuration: "configurationPropertiesMetadata"))
6565
configurationProperties(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "configurationPropertiesMetadata"))
6666

@@ -70,13 +70,13 @@ dependencies {
7070
implementation(project(path: ":spring-boot-project:spring-boot-actuator"))
7171
implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure"))
7272
implementation(project(path: ":spring-boot-project:spring-boot-autoconfigure"))
73+
implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
7374
implementation(project(path: ":spring-boot-project:spring-boot-docker-compose"))
74-
implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
75-
implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
7675
implementation(project(path: ":spring-boot-project:spring-boot-test"))
7776
implementation(project(path: ":spring-boot-project:spring-boot-test-autoconfigure"))
7877
implementation(project(path: ":spring-boot-project:spring-boot-testcontainers"))
79-
implementation(project(path: ":spring-boot-project:spring-boot-devtools"))
78+
implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-cli"))
79+
implementation(project(path: ":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
8080
implementation("ch.qos.logback:logback-classic")
8181
implementation("com.zaxxer:HikariCP")
8282
implementation("io.micrometer:micrometer-jakarta9")

0 commit comments

Comments
 (0)