Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-11-29 11:19:24 +01:00
commit d5c32333d5

View File

@ -22,12 +22,12 @@ import java.util.ArrayList;
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 @@ public abstract class AbstractEmbeddedServletContainerIntegrationTests {
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 });
}