Merge branch '2.2.x' into 2.3.x

Closes gh-24494

Author: snicoll

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

@@ -142,7 +142,6 @@ task aggregatedJavadoc(type: Javadoc) {
 				"https://docs.spring.io/spring-framework/docs/${versionConstraints["org.springframework:spring-core"]}/javadoc-api/",
 				"https://docs.spring.io/spring-security/site/docs/${versionConstraints["org.springframework.security:spring-security-core"]}/api/",
 				"https://tomcat.apache.org/tomcat-${tomcatDocsVersion}-doc/api/",
-				"https://www.eclipse.org/jetty/javadoc/${versionConstraints["org.eclipse.jetty:jetty-server"]}/",
 				"https://www.thymeleaf.org/apidocs/thymeleaf/${versionConstraints["org.thymeleaf:thymeleaf"]}/"
 			] as String[]
 		}

spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc

@@ -103,7 +103,6 @@
 :gradle-docs: https://docs.gradle.org/current/userguide
 :hibernate-docs: https://docs.jboss.org/hibernate/orm/5.4/userguide/html_single/Hibernate_User_Guide.html
 :java-api: https://docs.oracle.com/javase/8/docs/api
-:jetty-docs: https://www.eclipse.org/jetty/documentation/{jetty-version}
 :jooq-docs: https://www.jooq.org/doc/{jooq-version}/manual-single-page
 :junit5-docs: https://junit.org/junit5/docs/current/user-guide
 :kotlin-docs: https://kotlinlang.org/docs/reference/

spring-boot-project/spring-boot-docs/src/docs/asciidoc/howto.adoc

@@ -841,7 +841,7 @@ Finally, access logging for Jetty can also be configured as follows:
 ----
 
 By default, logs are redirected to `System.err`.
-For more details, see {jetty-docs}/configuring-jetty-request-logs.html[the Jetty documentation].
+For more details, see the Jetty documentation.