Merge branch '2.5.x' into 2.6.x

Closes gh-30583

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

@@ -59,6 +59,13 @@ If you wish to use Jetty 10, which does support servlet 4.0, you can do so as sh
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-tomcat</artifactId>
 			</exclusion>
+		</exclusions>
+	</dependency>
+	<!-- Use Jetty instead -->
+	<dependency>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-jetty</artifactId>
+		<exclusions>
 			<!-- Exclude the Jetty-9 specific dependencies -->
 			<exclusion>
 				<groupId>org.eclipse.jetty.websocket</groupId>
@@ -70,11 +77,6 @@ If you wish to use Jetty 10, which does support servlet 4.0, you can do so as sh
 			</exclusion>
 		</exclusions>
 	</dependency>
-	<!-- Use Jetty instead -->
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-jetty</artifactId>
-	</dependency>
 ----
 
 Note that along with excluding the Tomcat starter, a couple of Jetty9-specific dependencies also need to be excluded.