spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.0.x' into 4.1.x

Browse Source
This commit is contained in:
Phillip Webb
2026-08-26 10:45:35 -07:00
parent 9d617d0cae a1cc95e8a6
commit 4cdd2015e7
5 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/spring-boot-docs/build.gradle
+64 -64
View File
@@ -83,70 +83,70 @@ plugins.withType(EclipsePlugin) {
dependencies { dependencies {
compileOnly("org.hamcrest:hamcrest-core") compileOnly("org.hamcrest:hamcrest-core")
dokka(project(path: ":core:spring-boot")) dokka(project(":core:spring-boot"))
dokka(project(path: ":module:spring-boot-resttestclient")) dokka(project(":module:spring-boot-resttestclient"))
implementation(project(path: ":cli:spring-boot-cli")) implementation(project(":cli:spring-boot-cli"))
implementation(project(path: ":core:spring-boot-docker-compose")) implementation(project(":core:spring-boot-docker-compose"))
implementation(project(path: ":core:spring-boot-test")) implementation(project(":core:spring-boot-test"))
implementation(project(path: ":core:spring-boot-test-autoconfigure")) implementation(project(":core:spring-boot-test-autoconfigure"))
implementation(project(path: ":core:spring-boot-testcontainers")) implementation(project(":core:spring-boot-testcontainers"))
implementation(project(path: ":loader:spring-boot-loader-tools")) implementation(project(":loader:spring-boot-loader-tools"))
implementation(project(path: ":module:spring-boot-actuator")) implementation(project(":module:spring-boot-actuator"))
implementation(project(path: ":module:spring-boot-actuator-autoconfigure")) implementation(project(":module:spring-boot-actuator-autoconfigure"))
implementation(project(path: ":module:spring-boot-amqp")) implementation(project(":module:spring-boot-amqp"))
implementation(project(path: ":module:spring-boot-cache")) implementation(project(":module:spring-boot-cache"))
implementation(project(path: ":module:spring-boot-cache-test")) implementation(project(":module:spring-boot-cache-test"))
implementation(project(path: ":module:spring-boot-data-cassandra")) implementation(project(":module:spring-boot-data-cassandra"))
implementation(project(path: ":module:spring-boot-data-cassandra-test")) implementation(project(":module:spring-boot-data-cassandra-test"))
implementation(project(path: ":module:spring-boot-data-couchbase-test")) implementation(project(":module:spring-boot-data-couchbase-test"))
implementation(project(path: ":module:spring-boot-data-elasticsearch")) implementation(project(":module:spring-boot-data-elasticsearch"))
implementation(project(path: ":module:spring-boot-data-elasticsearch-test")) implementation(project(":module:spring-boot-data-elasticsearch-test"))
implementation(project(path: ":module:spring-boot-data-jpa-test")) implementation(project(":module:spring-boot-data-jpa-test"))
implementation(project(path: ":module:spring-boot-data-ldap-test")) implementation(project(":module:spring-boot-data-ldap-test"))
implementation(project(path: ":module:spring-boot-data-mongodb-test")) implementation(project(":module:spring-boot-data-mongodb-test"))
implementation(project(path: ":module:spring-boot-data-neo4j")) implementation(project(":module:spring-boot-data-neo4j"))
implementation(project(path: ":module:spring-boot-data-neo4j-test")) implementation(project(":module:spring-boot-data-neo4j-test"))
implementation(project(path: ":module:spring-boot-data-redis-test")) implementation(project(":module:spring-boot-data-redis-test"))
implementation(project(path: ":module:spring-boot-devtools")) implementation(project(":module:spring-boot-devtools"))
implementation(project(path: ":module:spring-boot-graphql-test")) implementation(project(":module:spring-boot-graphql-test"))
implementation(project(path: ":module:spring-boot-grpc-client")) implementation(project(":module:spring-boot-grpc-client"))
implementation(project(path: ":module:spring-boot-grpc-server")) implementation(project(":module:spring-boot-grpc-server"))
implementation(project(path: ":module:spring-boot-grpc-test")) implementation(project(":module:spring-boot-grpc-test"))
implementation(project(path: ":module:spring-boot-health")) implementation(project(":module:spring-boot-health"))
implementation(project(path: ":module:spring-boot-hibernate")) implementation(project(":module:spring-boot-hibernate"))
implementation(project(path: ":module:spring-boot-http-converter")) implementation(project(":module:spring-boot-http-converter"))
implementation(project(path: ":module:spring-boot-http-codec")) implementation(project(":module:spring-boot-http-codec"))
implementation(project(path: ":module:spring-boot-integration")) implementation(project(":module:spring-boot-integration"))
implementation(project(path: ":module:spring-boot-jackson")) implementation(project(":module:spring-boot-jackson"))
implementation(project(path: ":module:spring-boot-jdbc")) implementation(project(":module:spring-boot-jdbc"))
implementation(project(path: ":module:spring-boot-jdbc-test")) implementation(project(":module:spring-boot-jdbc-test"))
implementation(project(path: ":module:spring-boot-jetty")) implementation(project(":module:spring-boot-jetty"))
implementation(project(path: ":module:spring-boot-jooq-test")) implementation(project(":module:spring-boot-jooq-test"))
implementation(project(path: ":module:spring-boot-jpa")) implementation(project(":module:spring-boot-jpa"))
implementation(project(path: ":module:spring-boot-jms")) implementation(project(":module:spring-boot-jms"))
implementation(project(path: ":module:spring-boot-jsonb")) implementation(project(":module:spring-boot-jsonb"))
implementation(project(path: ":module:spring-boot-ldap")) implementation(project(":module:spring-boot-ldap"))
implementation(project(path: ":module:spring-boot-micrometer-metrics")) implementation(project(":module:spring-boot-micrometer-metrics"))
implementation(project(path: ":module:spring-boot-persistence")) implementation(project(":module:spring-boot-persistence"))
implementation(project(path: ":module:spring-boot-r2dbc")) implementation(project(":module:spring-boot-r2dbc"))
implementation(project(path: ":module:spring-boot-restdocs")) implementation(project(":module:spring-boot-restdocs"))
implementation(project(path: ":module:spring-boot-reactor-netty")) implementation(project(":module:spring-boot-reactor-netty"))
implementation(project(path: ":module:spring-boot-restclient")) implementation(project(":module:spring-boot-restclient"))
implementation(project(path: ":module:spring-boot-restclient-test")) implementation(project(":module:spring-boot-restclient-test"))
implementation(project(path: ":module:spring-boot-resttestclient")) implementation(project(":module:spring-boot-resttestclient"))
implementation(project(path: ":module:spring-boot-security")) implementation(project(":module:spring-boot-security"))
implementation(project(path: ":module:spring-boot-tomcat")) implementation(project(":module:spring-boot-tomcat"))
implementation(project(path: ":module:spring-boot-web-server-test")) implementation(project(":module:spring-boot-web-server-test"))
implementation(project(path: ":module:spring-boot-webclient")) implementation(project(":module:spring-boot-webclient"))
implementation(project(path: ":module:spring-boot-webclient-test")) implementation(project(":module:spring-boot-webclient-test"))
implementation(project(path: ":module:spring-boot-webflux")) implementation(project(":module:spring-boot-webflux"))
implementation(project(path: ":module:spring-boot-webflux-test")) implementation(project(":module:spring-boot-webflux-test"))
implementation(project(path: ":module:spring-boot-webmvc")) implementation(project(":module:spring-boot-webmvc"))
implementation(project(path: ":module:spring-boot-webmvc-test")) implementation(project(":module:spring-boot-webmvc-test"))
implementation(project(path: ":module:spring-boot-webservices")) implementation(project(":module:spring-boot-webservices"))
implementation(project(path: ":module:spring-boot-webservices-test")) implementation(project(":module:spring-boot-webservices-test"))
implementation(project(path: ":module:spring-boot-webtestclient")) implementation(project(":module:spring-boot-webtestclient"))
implementation("ch.qos.logback:logback-classic") implementation("ch.qos.logback:logback-classic")
implementation("com.redis:testcontainers-redis") implementation("com.redis:testcontainers-redis")
implementation("com.zaxxer:HikariCP") implementation("com.zaxxer:HikariCP")
@@ -339,7 +339,7 @@ dependencies {
resolvedBom(project(path: ":platform:spring-boot-dependencies", configuration: "resolvedBom")) resolvedBom(project(path: ":platform:spring-boot-dependencies", configuration: "resolvedBom"))
springApplicationExample(platform(project(":platform:spring-boot-dependencies"))) springApplicationExample(platform(project(":platform:spring-boot-dependencies")))
springApplicationExample(project(path: ":starter:spring-boot-starter-webmvc")) springApplicationExample(project(":starter:spring-boot-starter-webmvc"))
testImplementation(project(":module:spring-boot-actuator-autoconfigure")) testImplementation(project(":module:spring-boot-actuator-autoconfigure"))
testImplementation(project(":test-support:spring-boot-test-support")) testImplementation(project(":test-support:spring-boot-test-support"))
smoke-test/spring-boot-smoke-test-ant/build.gradle
+2 -2
View File
@@ -41,14 +41,14 @@ plugins.withType(EclipsePlugin) {
dependencies { dependencies {
antDependencies "org.apache.ivy:ivy:2.5.0" antDependencies "org.apache.ivy:ivy:2.5.0"
antDependencies project(path: ":build-plugin:spring-boot-antlib") antDependencies project(":build-plugin:spring-boot-antlib")
antDependencies "org.apache.ant:ant-launcher:1.10.7" antDependencies "org.apache.ant:ant-launcher:1.10.7"
antDependencies "org.apache.ant:ant:1.10.7" antDependencies "org.apache.ant:ant:1.10.7"
testRepository(project(path: ":loader:spring-boot-loader", configuration: "mavenRepository")) testRepository(project(path: ":loader:spring-boot-loader", configuration: "mavenRepository"))
testRepository(project(path: ":starter:spring-boot-starter", configuration: "mavenRepository")) testRepository(project(path: ":starter:spring-boot-starter", configuration: "mavenRepository"))
testImplementation(project(path: ":loader:spring-boot-loader-tools")) testImplementation(project(":loader:spring-boot-loader-tools"))
testImplementation("org.assertj:assertj-core") testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.springframework:spring-core") testImplementation("org.springframework:spring-core")
system-test/spring-boot-deployment-system-tests/build.gradle
+1 -1
View File
@@ -40,7 +40,7 @@ dependencies {
} }
implementation(project(":starter:spring-boot-starter-actuator")) implementation(project(":starter:spring-boot-starter-actuator"))
systemTestImplementation(enforcedPlatform(project(path: ":platform:spring-boot-internal-dependencies"))) systemTestImplementation(enforcedPlatform(project(":platform:spring-boot-internal-dependencies")))
systemTestImplementation(project(":module:spring-boot-restclient")) systemTestImplementation(project(":module:spring-boot-restclient"))
systemTestImplementation(project(":module:spring-boot-resttestclient")) systemTestImplementation(project(":module:spring-boot-resttestclient"))
systemTestImplementation(project(":starter:spring-boot-starter-test")) systemTestImplementation(project(":starter:spring-boot-starter-test"))
test-support/spring-boot-docker-test-support/build.gradle
+2 -2
View File
@@ -22,8 +22,8 @@ plugins {
description = "Spring Boot Docker Testing Support" description = "Spring Boot Docker Testing Support"
dependencies { dependencies {
api(platform(project(path: ":platform:spring-boot-internal-dependencies"))) api(platform(project(":platform:spring-boot-internal-dependencies")))
api(project(path: ":test-support:spring-boot-test-support")) api(project(":test-support:spring-boot-test-support"))
compileOnly("org.testcontainers:testcontainers") compileOnly("org.testcontainers:testcontainers")
test-support/spring-boot-test-support/build.gradle
+1 -1
View File
@@ -22,7 +22,7 @@ plugins {
description = "Spring Boot Testing Support" description = "Spring Boot Testing Support"
dependencies { dependencies {
api(platform(project(path: ":platform:spring-boot-internal-dependencies"))) api(platform(project(":platform:spring-boot-internal-dependencies")))
api("com.jayway.jsonpath:json-path") api("com.jayway.jsonpath:json-path")
api("org.assertj:assertj-core") api("org.assertj:assertj-core")
api("org.awaitility:awaitility") api("org.awaitility:awaitility")