Merge branch '4.1.x'

This commit is contained in:
Phillip Webb
2026-08-26 10:48:37 -07:00
5 changed files with 72 additions and 72 deletions
+66 -66
View File
@@ -83,72 +83,72 @@ plugins.withType(EclipsePlugin) {
dependencies {
compileOnly("org.hamcrest:hamcrest-core")
dokka(project(path: ":core:spring-boot"))
dokka(project(path: ":module:spring-boot-resttestclient"))
dokka(project(":core:spring-boot"))
dokka(project(":module:spring-boot-resttestclient"))
implementation(project(path: ":cli:spring-boot-cli"))
implementation(project(path: ":core:spring-boot-docker-compose"))
implementation(project(path: ":core:spring-boot-test"))
implementation(project(path: ":core:spring-boot-test-autoconfigure"))
implementation(project(path: ":core:spring-boot-testcontainers"))
implementation(project(path: ":loader:spring-boot-loader-tools"))
implementation(project(path: ":module:spring-boot-actuator"))
implementation(project(path: ":module:spring-boot-actuator-autoconfigure"))
implementation(project(path: ":module:spring-boot-amqp"))
implementation(project(path: ":module:spring-boot-amqp-rabbitmq"))
implementation(project(path: ":module:spring-boot-cache"))
implementation(project(path: ":module:spring-boot-cache-test"))
implementation(project(path: ":module:spring-boot-data-cassandra"))
implementation(project(path: ":module:spring-boot-data-cassandra-test"))
implementation(project(path: ":module:spring-boot-data-couchbase-test"))
implementation(project(path: ":module:spring-boot-data-elasticsearch"))
implementation(project(path: ":module:spring-boot-data-elasticsearch-test"))
implementation(project(path: ":module:spring-boot-data-jpa-test"))
implementation(project(path: ":module:spring-boot-data-ldap-test"))
implementation(project(path: ":module:spring-boot-data-mongodb-test"))
implementation(project(path: ":module:spring-boot-data-neo4j"))
implementation(project(path: ":module:spring-boot-data-neo4j-test"))
implementation(project(path: ":module:spring-boot-data-redis-test"))
implementation(project(path: ":module:spring-boot-devtools"))
implementation(project(path: ":module:spring-boot-graphql-test"))
implementation(project(path: ":module:spring-boot-grpc-client"))
implementation(project(path: ":module:spring-boot-grpc-server"))
implementation(project(path: ":module:spring-boot-grpc-test"))
implementation(project(path: ":module:spring-boot-health"))
implementation(project(path: ":module:spring-boot-hibernate"))
implementation(project(path: ":module:spring-boot-http-converter"))
implementation(project(path: ":module:spring-boot-http-codec"))
implementation(project(path: ":module:spring-boot-integration"))
implementation(project(path: ":module:spring-boot-jackson"))
implementation(project(path: ":module:spring-boot-jdbc"))
implementation(project(path: ":module:spring-boot-jdbc-test"))
implementation(project(path: ":module:spring-boot-jetty"))
implementation(project(path: ":module:spring-boot-jooq-test"))
implementation(project(path: ":module:spring-boot-jpa"))
implementation(project(path: ":module:spring-boot-jms"))
implementation(project(path: ":module:spring-boot-jsonb"))
implementation(project(path: ":module:spring-boot-ldap"))
implementation(project(path: ":module:spring-boot-micrometer-metrics"))
implementation(project(path: ":module:spring-boot-persistence"))
implementation(project(path: ":module:spring-boot-r2dbc"))
implementation(project(path: ":module:spring-boot-rabbitmq"))
implementation(project(path: ":module:spring-boot-restdocs"))
implementation(project(path: ":module:spring-boot-reactor-netty"))
implementation(project(path: ":module:spring-boot-restclient"))
implementation(project(path: ":module:spring-boot-restclient-test"))
implementation(project(path: ":module:spring-boot-resttestclient"))
implementation(project(path: ":module:spring-boot-security"))
implementation(project(path: ":module:spring-boot-tomcat"))
implementation(project(path: ":module:spring-boot-web-server-test"))
implementation(project(path: ":module:spring-boot-webclient"))
implementation(project(path: ":module:spring-boot-webclient-test"))
implementation(project(path: ":module:spring-boot-webflux"))
implementation(project(path: ":module:spring-boot-webflux-test"))
implementation(project(path: ":module:spring-boot-webmvc"))
implementation(project(path: ":module:spring-boot-webmvc-test"))
implementation(project(path: ":module:spring-boot-webservices"))
implementation(project(path: ":module:spring-boot-webservices-test"))
implementation(project(path: ":module:spring-boot-webtestclient"))
implementation(project(":cli:spring-boot-cli"))
implementation(project(":core:spring-boot-docker-compose"))
implementation(project(":core:spring-boot-test"))
implementation(project(":core:spring-boot-test-autoconfigure"))
implementation(project(":core:spring-boot-testcontainers"))
implementation(project(":loader:spring-boot-loader-tools"))
implementation(project(":module:spring-boot-actuator"))
implementation(project(":module:spring-boot-actuator-autoconfigure"))
implementation(project(":module:spring-boot-amqp"))
implementation(project(":module:spring-boot-amqp-rabbitmq"))
implementation(project(":module:spring-boot-cache"))
implementation(project(":module:spring-boot-cache-test"))
implementation(project(":module:spring-boot-data-cassandra"))
implementation(project(":module:spring-boot-data-cassandra-test"))
implementation(project(":module:spring-boot-data-couchbase-test"))
implementation(project(":module:spring-boot-data-elasticsearch"))
implementation(project(":module:spring-boot-data-elasticsearch-test"))
implementation(project(":module:spring-boot-data-jpa-test"))
implementation(project(":module:spring-boot-data-ldap-test"))
implementation(project(":module:spring-boot-data-mongodb-test"))
implementation(project(":module:spring-boot-data-neo4j"))
implementation(project(":module:spring-boot-data-neo4j-test"))
implementation(project(":module:spring-boot-data-redis-test"))
implementation(project(":module:spring-boot-devtools"))
implementation(project(":module:spring-boot-graphql-test"))
implementation(project(":module:spring-boot-grpc-client"))
implementation(project(":module:spring-boot-grpc-server"))
implementation(project(":module:spring-boot-grpc-test"))
implementation(project(":module:spring-boot-health"))
implementation(project(":module:spring-boot-hibernate"))
implementation(project(":module:spring-boot-http-converter"))
implementation(project(":module:spring-boot-http-codec"))
implementation(project(":module:spring-boot-integration"))
implementation(project(":module:spring-boot-jackson"))
implementation(project(":module:spring-boot-jdbc"))
implementation(project(":module:spring-boot-jdbc-test"))
implementation(project(":module:spring-boot-jetty"))
implementation(project(":module:spring-boot-jooq-test"))
implementation(project(":module:spring-boot-jpa"))
implementation(project(":module:spring-boot-jms"))
implementation(project(":module:spring-boot-jsonb"))
implementation(project(":module:spring-boot-ldap"))
implementation(project(":module:spring-boot-micrometer-metrics"))
implementation(project(":module:spring-boot-persistence"))
implementation(project(":module:spring-boot-r2dbc"))
implementation(project(":module:spring-boot-rabbitmq"))
implementation(project(":module:spring-boot-restdocs"))
implementation(project(":module:spring-boot-reactor-netty"))
implementation(project(":module:spring-boot-restclient"))
implementation(project(":module:spring-boot-restclient-test"))
implementation(project(":module:spring-boot-resttestclient"))
implementation(project(":module:spring-boot-security"))
implementation(project(":module:spring-boot-tomcat"))
implementation(project(":module:spring-boot-web-server-test"))
implementation(project(":module:spring-boot-webclient"))
implementation(project(":module:spring-boot-webclient-test"))
implementation(project(":module:spring-boot-webflux"))
implementation(project(":module:spring-boot-webflux-test"))
implementation(project(":module:spring-boot-webmvc"))
implementation(project(":module:spring-boot-webmvc-test"))
implementation(project(":module:spring-boot-webservices"))
implementation(project(":module:spring-boot-webservices-test"))
implementation(project(":module:spring-boot-webtestclient"))
implementation("ch.qos.logback:logback-classic")
implementation("com.redis:testcontainers-redis")
implementation("com.zaxxer:HikariCP")
@@ -341,7 +341,7 @@ dependencies {
resolvedBom(project(path: ":platform:spring-boot-dependencies", configuration: "resolvedBom"))
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(":test-support:spring-boot-test-support"))