Merge branch '2.1.x'

2019-03-15 18:09:47 -07:00
parent 1893eeef4f 28175c8635
commit 3d0219c315
35 changed files with 73 additions and 89 deletions
--- a/spring-boot-samples/spring-boot-sample-jersey/src/test/java/sample/jersey/JerseyApplicationPathAndManagementPortTests.java
+++ b/spring-boot-samples/spring-boot-sample-jersey/src/test/java/sample/jersey/JerseyApplicationPathAndManagementPortTests.java
@@ -41,10 +41,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class JerseyApplicationPathAndManagementPortTests {

 	@LocalServerPort
-	private int port = 9010;
+	private int port;

 	@LocalManagementPort
-	private int managementPort = 9011;
+	private int managementPort;

 	@Autowired
 	private TestRestTemplate testRestTemplate;