Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-31177
This commit is contained in:
Andy Wilkinson
2022-05-26 15:53:38 +01:00
parent b3a4982f31 ee45fd2fc8
commit 455ee0ce22
70 changed files with 151 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServerTests.java
View File

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.never;
class OptionalLiveReloadServerTests {
@Test
void nullServer() throws Exception {
void nullServer() {
OptionalLiveReloadServer server = new OptionalLiveReloadServer(null);
server.startServer();
server.triggerReload();

2
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java
View File

@@ -79,7 +79,7 @@ class RestarterTests {
}
@Test
void testRestart(CapturedOutput output) throws Exception {
void testRestart(CapturedOutput output) {
Restarter.clearInstance();
Thread thread = new Thread(SampleApplication::main);
thread.start();