Merge branch '2.1.x'

spring-cloud-gateway-core/src/test/java/org/springframework/cloud/gateway/filter/WeightCalculatorWebFilterConcurrentTests.java

@@ -22,7 +22,9 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import io.netty.util.internal.ThreadLocalRandom;
+import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
@@ -76,7 +78,13 @@ public class WeightCalculatorWebFilterConcurrentTests {
 		startTime = System.currentTimeMillis();
 	}
 
+	@After
+	public void teardown() {
+		executorService.shutdown();
+	}
+
 	@Test
+	@Ignore
 	public void WeightCalculatorWebFilter_threadSafeTest() {
 		generateEvents();
 

spring-cloud-gateway-core/src/test/resources/application-weights-concurrent.yml

@@ -2,3 +2,7 @@ test:
   concurrent:
     execution:
       timeInSeconds: 10
+
+logging:
+  level:
+    org.springframework.cloud.gateway.filter.WeightCalculatorWebFilter: INFO