Merge branch '2.6.x' into 2.7.x

Closes gh-31211

Author: wilkinsona

spring-boot-project/spring-boot-docs/build.gradle

@@ -206,10 +206,8 @@ task aggregatedJavadoc(type: Javadoc) {
 		options {
 			author = true
 			docTitle = "Spring Boot ${project.version} API"
-			encoding = "UTF-8"
 			memberLevel = "protected"
 			outputLevel = "quiet"
-			source = "1.8"
 			splitIndex = true
 			stylesheetFile = file("src/main/javadoc/spring-javadoc.css")
 			use = true