Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x'

Browse Source 
Closes gh-33756
This commit is contained in:
Moritz Halbritter
2023-01-11 13:42:11 +01:00
parent ff3b0de02f 0237351fd0
commit 52760f6b78
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/QuartzEndpointDocumentationTests.java
View File

@@ -266,8 +266,8 @@ class QuartzEndpointDocumentationTests extends MockMvcEndpointDocumentationTests
"Whether the job should be re-executed if a 'recovery' or 'fail-over' situation is encountered."),
fieldWithPath("data.*").description("Job data map as key/value pairs, if any."),
fieldWithPath("triggers").description("An array of triggers associated to the job, if any."),
fieldWithPath("triggers.[].group").description("Name of the the trigger group."),
fieldWithPath("triggers.[].name").description("Name of the the trigger."),
fieldWithPath("triggers.[].group").description("Name of the trigger group."),
fieldWithPath("triggers.[].name").description("Name of the trigger."),
previousFireTime("triggers.[]."), nextFireTime("triggers.[]."), priority("triggers.[]."))));
}

2
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/exchanges/HttpExchange.java
View File

@@ -101,7 +101,7 @@ public final class HttpExchange {
/**
* Returns the principal.
* @return the the request
* @return the request
*/
public Principal getPrincipal() {
return this.principal;

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/getting-started/system-requirements.adoc
View File

@@ -43,7 +43,7 @@ You can also deploy Spring Boot applications to any servlet 5.0+ compatible cont
Spring Boot applications can be <<native-image#native-image.introducing-graalvm-native-images,converted into a Native Image>> using using GraalVM {graal-version} or above.
Images can be created using the https://github.com/graalvm/native-build-tools[native build tools] Gradle/Maven plugins or `native-image` tool provided by GraalVM.
You can also create native images using the the https://github.com/paketo-buildpacks/native-image[native-image Paketo buildpack].
You can also create native images using the https://github.com/paketo-buildpacks/native-image[native-image Paketo buildpack].
The following versions are supported: