Merge branch '1.5.x'

Author: snicoll

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java

@@ -22,12 +22,12 @@
 import java.util.List;
 import java.util.Map;
 
-import org.codehaus.plexus.util.StringUtils;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 
 import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.util.StringUtils;
 import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriTemplateHandler;
@@ -66,7 +66,7 @@ private static List<Object> createParameters(String packaging, String container,
 				AbstractApplicationLauncher launcher = launcherClass
 						.getDeclaredConstructor(ApplicationBuilder.class)
 						.newInstance(applicationBuilder);
-				String name = StringUtils.capitalise(container) + ": "
+				String name = StringUtils.capitalize(container) + ": "
 						+ launcher.getDescription(packaging);
 				parameters.add(new Object[] { name, launcher });
 			}