Merge branch '1.5.x' into 2.0.x

2018-05-21 17:18:49 -07:00
parent c1236ed81b 9f4f229b83
commit 6d8b4710d7
7 changed files with 27 additions and 19 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomApplicationTests.java
@@ -51,7 +51,6 @@ import static org.assertj.core.api.Assertions.assertThat;
@DirtiesContext
 public class JerseyAutoConfigurationCustomApplicationTests {

-
 	@Autowired
 	private TestRestTemplate restTemplate;