Merge branch '2.6.x' into 2.7.x
See gh-31987
This commit is contained in:
@@ -278,6 +278,8 @@ task runRemoteSpringApplicationExample(type: org.springframework.boot.build.docs
|
||||
args = ["https://myapp.example.com", "--spring.devtools.remote.secret=secret", "--spring.devtools.livereload.port=0"]
|
||||
output = file("$buildDir/example-output/remote-spring-application.txt")
|
||||
expectedLogging = "Started RemoteSpringApplication in "
|
||||
applicationJar = "/Users/myuser/.m2/repository/org/springframework/boot/spring-boot-devtools/${project.version}/spring-boot-devtools-${project.version}.jar"
|
||||
normalizeLiveReloadPort()
|
||||
}
|
||||
|
||||
task runSpringApplicationExample(type: org.springframework.boot.build.docs.ApplicationRunner) {
|
||||
@@ -286,6 +288,7 @@ task runSpringApplicationExample(type: org.springframework.boot.build.docs.Appli
|
||||
args = ["--server.port=0"]
|
||||
output = file("$buildDir/example-output/spring-application.txt")
|
||||
expectedLogging = "Started MyApplication in "
|
||||
normalizeTomcatPort()
|
||||
}
|
||||
|
||||
task runLoggingFormatExample(type: org.springframework.boot.build.docs.ApplicationRunner) {
|
||||
@@ -294,6 +297,7 @@ task runLoggingFormatExample(type: org.springframework.boot.build.docs.Applicati
|
||||
args = ["--spring.main.banner-mode=off", "--server.port=0"]
|
||||
output = file("$buildDir/example-output/logging-format.txt")
|
||||
expectedLogging = "Started MyApplication in "
|
||||
normalizeTomcatPort()
|
||||
}
|
||||
|
||||
tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
|
||||
|
||||
Reference in New Issue
Block a user