mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Merge branch '2.5.x' into 2.6.x
Closes gh-28941
This commit is contained in:
commit
8f3659c147
@ -17,10 +17,11 @@ configurations.all {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
|
||||||
|
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-security"))
|
||||||
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) {
|
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-web")) {
|
||||||
exclude group: "org.hibernate.validator"
|
exclude group: "org.hibernate.validator"
|
||||||
}
|
}
|
||||||
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-actuator"))
|
|
||||||
|
|
||||||
systemTestImplementation(enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent")))
|
systemTestImplementation(enforcedPlatform(project(path: ":spring-boot-project:spring-boot-parent")))
|
||||||
systemTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
|
systemTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
|
||||||
|
@ -1 +1,6 @@
|
|||||||
|
spring:
|
||||||
|
security:
|
||||||
|
user:
|
||||||
|
name: test
|
||||||
|
password: test
|
||||||
management.endpoints.web.exposure.include: '*'
|
management.endpoints.web.exposure.include: '*'
|
||||||
|
@ -95,6 +95,7 @@ abstract class AbstractDeploymentTests {
|
|||||||
TestRestTemplate rest = new TestRestTemplate(new RestTemplateBuilder()
|
TestRestTemplate rest = new TestRestTemplate(new RestTemplateBuilder()
|
||||||
.rootUri("http://" + this.container.getHost() + ":" + this.container.getMappedPort(this.port)
|
.rootUri("http://" + this.container.getHost() + ":" + this.container.getMappedPort(this.port)
|
||||||
+ "/spring-boot")
|
+ "/spring-boot")
|
||||||
|
.basicAuthentication("test", "test")
|
||||||
.requestFactory(() -> new HttpComponentsClientHttpRequestFactory(HttpClients.custom()
|
.requestFactory(() -> new HttpComponentsClientHttpRequestFactory(HttpClients.custom()
|
||||||
.setRetryHandler(new StandardHttpRequestRetryHandler(10, false)).build())));
|
.setRetryHandler(new StandardHttpRequestRetryHandler(10, false)).build())));
|
||||||
try {
|
try {
|
||||||
|
@ -0,0 +1,39 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2012-2021 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.boot.deployment;
|
||||||
|
|
||||||
|
import org.testcontainers.junit.jupiter.Container;
|
||||||
|
import org.testcontainers.junit.jupiter.Testcontainers;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deployment tests for Tomcat 8.5 (a Servlet 3.1 container).
|
||||||
|
*
|
||||||
|
* @author Andy Wilkinson
|
||||||
|
*/
|
||||||
|
@Testcontainers(disabledWithoutDocker = true)
|
||||||
|
class Tomcat85DeploymentTests extends AbstractDeploymentTests {
|
||||||
|
|
||||||
|
@Container
|
||||||
|
static WarDeploymentContainer container = new WarDeploymentContainer("tomcat:8.5.73-jdk8-openjdk",
|
||||||
|
"/usr/local/tomcat/webapps", DEFAULT_PORT);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
WarDeploymentContainer getContainer() {
|
||||||
|
return container;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user