mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-09-20 14:39:36 +00:00
Andy Wilkinson
7af147d091
Previously, CloudFoundryActuatorAutoConfiguration required RestTemplateBuilder, using it to create the RestTemplate that's used the security interceptor. Following the modularization, RestTemplateBuilder is only present when spring-boot-restclient is on the classpath. In its absence, CloudFoundryActuatorAutoConfiguration would fail. This commit address this problem by using RestClient.Builder (and RestClient) instead of RestTemplateBuilder (and RestTemplate). This allows CloudFoundryActuatorAutoConfiguration to work without spring-boot-restclient as RestClient.Builder and RestClient are provided by spring-web that will always be there in an MVC webapp. Fixes gh-48826
59 lines
2.2 KiB
Groovy
59 lines
2.2 KiB
Groovy
/*
|
|
* Copyright 2012-present the original author or authors.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the License);
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* https://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
plugins {
|
|
id "java-library"
|
|
id "org.springframework.boot.auto-configuration"
|
|
id "org.springframework.boot.deployed"
|
|
id "org.springframework.boot.optional-dependencies"
|
|
}
|
|
|
|
description = "Spring Boot Cloud Foundry"
|
|
|
|
dependencies {
|
|
api(project(":core:spring-boot"))
|
|
api(project(":module:spring-boot-actuator"))
|
|
api(project(":module:spring-boot-actuator-autoconfigure"))
|
|
|
|
optional(project(":module:spring-boot-health"))
|
|
optional(project(":module:spring-boot-security"))
|
|
optional(project(":module:spring-boot-webclient"))
|
|
optional(project(":module:spring-boot-webflux"))
|
|
optional(project(":module:spring-boot-webmvc"))
|
|
optional("io.projectreactor:reactor-core")
|
|
optional("io.projectreactor.netty:reactor-netty-http")
|
|
optional("jakarta.servlet:jakarta.servlet-api")
|
|
|
|
testImplementation(project(":core:spring-boot-test"))
|
|
testImplementation(project(":module:spring-boot-http-converter"))
|
|
testImplementation(project(":module:spring-boot-jackson"))
|
|
testImplementation(project(":module:spring-boot-reactor-netty"))
|
|
testImplementation(project(":module:spring-boot-restclient-test"))
|
|
testImplementation(project(":module:spring-boot-tomcat"))
|
|
testImplementation(project(":test-support:spring-boot-test-support"))
|
|
testImplementation("com.squareup.okhttp3:mockwebserver")
|
|
testImplementation("io.projectreactor:reactor-test")
|
|
testImplementation("org.springframework.security:spring-security-test")
|
|
|
|
testCompileOnly("com.google.code.findbugs:jsr305")
|
|
|
|
testRuntimeOnly("ch.qos.logback:logback-classic")
|
|
}
|
|
|
|
tasks.named("compileTestJava") {
|
|
options.nullability.checking = "tests"
|
|
}
|