Merge branch '5.3.x'

Author: sbrannen

spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/bootstrap/JettyHttpServer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -27,6 +27,7 @@
 
 /**
  * @author Rossen Stoyanchev
+ * @author Sam Brannen
  */
 public class JettyHttpServer extends AbstractHttpServer {
 
@@ -75,7 +76,10 @@ protected void stopInternal() throws Exception {
 		finally {
 			try {
 				if (this.jettyServer.isRunning()) {
-					this.jettyServer.setStopTimeout(5000);
+					// Do not configure a large stop timeout. For example, setting a stop timeout
+					// of 5000 adds an additional 1-2 seconds to the runtime of each test using
+					// the Jetty sever, resulting in 2-4 extra minutes of overall build time.
+					this.jettyServer.setStopTimeout(100);
 					this.jettyServer.stop();
 					this.jettyServer.destroy();
 				}
@@ -90,7 +94,10 @@ protected void stopInternal() throws Exception {
 	protected void resetInternal() {
 		try {
 			if (this.jettyServer.isRunning()) {
-				this.jettyServer.setStopTimeout(5000);
+				// Do not configure a large stop timeout. For example, setting a stop timeout
+				// of 5000 adds an additional 1-2 seconds to the runtime of each test using
+				// the Jetty sever, resulting in 2-4 extra minutes of overall build time.
+				this.jettyServer.setStopTimeout(100);
 				this.jettyServer.stop();
 				this.jettyServer.destroy();
 			}