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

Merge branch '2.1.x'

Browse Source 
Closes gh-17335
Closes gh-17292
This commit is contained in:
Andy Wilkinson
2019-06-27 11:46:52 +01:00
parent 867c35a2f6 91786bc712
commit 66f1344f7c
11 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java
View File

@@ -50,12 +50,12 @@ class HazelcastAutoConfigurationClientTests {
private static HazelcastInstance hazelcastServer;
@BeforeAll
public static void init() {
static void init() {
hazelcastServer = Hazelcast.newHazelcastInstance();
}
@AfterAll
public static void close() {
static void close() {
if (hazelcastServer != null) {
hazelcastServer.shutdown();
}

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java
View File

@@ -58,7 +58,7 @@ class KafkaAutoConfigurationIntegrationTests {
private AnnotationConfigApplicationContext context;
@BeforeAll
public static void setUp() {
static void setUp() {
embeddedKafka.afterPropertiesSet();
}
@@ -70,7 +70,7 @@ class KafkaAutoConfigurationIntegrationTests {
}
@AfterAll
public static void tearDown() {
static void tearDown() {
embeddedKafka.destroy();
}