root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x 

Closes gh-36876
This commit is contained in:
Stephane Nicoll 2023-08-09 16:06:33 +02:00
parent 63fc5a9d71 94c7140001
commit 6800f15aa6
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docs/build.gradle
View File

@ -266,7 +266,7 @@ task runRemoteSpringApplicationExample(type: org.springframework.boot.build.docs
task runSpringApplicationExample(type: org.springframework.boot.build.docs.ApplicationRunner) { task runSpringApplicationExample(type: org.springframework.boot.build.docs.ApplicationRunner) {
classpath = configurations.springApplicationExample + sourceSets.main.output classpath = configurations.springApplicationExample + sourceSets.main.output
mainClass = "org.springframework.boot.docs.features.springapplication.MyApplication" mainClass = "org.springframework.boot.docs.features.logexample.MyApplication"
args = ["--server.port=0"] args = ["--server.port=0"]
output = file("$buildDir/example-output/spring-application.txt") output = file("$buildDir/example-output/spring-application.txt")
expectedLogging = "Started MyApplication in " expectedLogging = "Started MyApplication in "
@ -275,7 +275,7 @@ task runSpringApplicationExample(type: org.springframework.boot.build.docs.Appli
task runLoggingFormatExample(type: org.springframework.boot.build.docs.ApplicationRunner) { task runLoggingFormatExample(type: org.springframework.boot.build.docs.ApplicationRunner) {
classpath = configurations.springApplicationExample + sourceSets.main.output classpath = configurations.springApplicationExample + sourceSets.main.output
mainClass = "org.springframework.boot.docs.features.springapplication.MyApplication" mainClass = "org.springframework.boot.docs.features.logexample.MyApplication"
args = ["--spring.main.banner-mode=off", "--server.port=0"] args = ["--spring.main.banner-mode=off", "--server.port=0"]
output = file("$buildDir/example-output/logging-format.txt") output = file("$buildDir/example-output/logging-format.txt")
expectedLogging = "Started MyApplication in " expectedLogging = "Started MyApplication in "

34
spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/features/logexample/MyApplication.java Normal file
View File

@ -0,0 +1,34 @@
/*
* Copyright 2012-2023 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.docs.features.logexample;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**
* Sample application used to collect logs for the reference doc.
*
* @author Stephane Nicoll
*/
@SpringBootApplication
public class MyApplication {
public static void main(String[] args) {
SpringApplication.run(MyApplication.class, args);
}
}