Merge branch '4.2.x'

Author: ryanjbaxter

spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/discovery/watcher/presence/DefaultDependencyPresenceOnStartupVerifierTests.java

@@ -19,10 +19,10 @@
 import java.util.Collections;
 
 import org.apache.curator.x.discovery.ServiceCache;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.assertj.core.api.BDDAssertions.then;
+import static org.assertj.core.api.Fail.fail;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
@@ -42,7 +42,7 @@ public void should_throw_exception_if_obligatory_dependencies_are_missing() {
 		// when:
 		try {
 			dependencyVerifier.verifyDependencyPresence(SERVICE_NAME, serviceCache, true);
-			Assert.fail("Should throw no instances running exception");
+			fail("Should throw no instances running exception");
 		}
 		catch (Exception e) {
 			// then: