Merge branch '1.5.x'

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/server/CompressionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 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.
@@ -18,6 +18,10 @@ package org.springframework.boot.web.server;
 
 import org.apache.coyote.http11.Http11NioProtocol;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.junit.runner.classpath.ClassPathOverrides;
+import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -26,6 +30,8 @@ import static org.assertj.core.api.Assertions.assertThat;
  *
  * @author Andy Wilkinson
  */
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathOverrides("org.apache.tomcat.embed:tomcat-embed-core:8.5.24")
 public class CompressionTests {
 
 	@Test