mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Polish
This commit is contained in:
parent
dcd120c477
commit
c52972ceec
@ -38,12 +38,6 @@ import org.junit.Test;
|
|||||||
import org.junit.rules.ExpectedException;
|
import org.junit.rules.ExpectedException;
|
||||||
import org.junit.rules.TemporaryFolder;
|
import org.junit.rules.TemporaryFolder;
|
||||||
import org.mockito.InOrder;
|
import org.mockito.InOrder;
|
||||||
import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory;
|
|
||||||
import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
|
|
||||||
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
|
|
||||||
import org.springframework.bootstrap.context.embedded.FilterRegistrationBean;
|
|
||||||
import org.springframework.bootstrap.context.embedded.ServletContextInitializer;
|
|
||||||
import org.springframework.bootstrap.context.embedded.ServletRegistrationBean;
|
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.client.ClientHttpRequest;
|
import org.springframework.http.client.ClientHttpRequest;
|
||||||
import org.springframework.http.client.ClientHttpResponse;
|
import org.springframework.http.client.ClientHttpResponse;
|
||||||
@ -146,7 +140,6 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void startBlocksUntilReadyToServe() throws Exception {
|
public void startBlocksUntilReadyToServe() throws Exception {
|
||||||
// FIXME Assume.group(TestGroup.LONG_RUNNING);
|
|
||||||
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
|
ConfigurableEmbeddedServletContainerFactory factory = getFactory();
|
||||||
final Date[] date = new Date[1];
|
final Date[] date = new Date[1];
|
||||||
this.container = factory
|
this.container = factory
|
||||||
|
@ -36,8 +36,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
|
|||||||
@Mojo(name = "executable-war", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
|
@Mojo(name = "executable-war", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, requiresDependencyCollection = ResolutionScope.COMPILE_PLUS_RUNTIME)
|
||||||
public class ExecutableWarMojo extends AbstractExecutableArchiveMojo {
|
public class ExecutableWarMojo extends AbstractExecutableArchiveMojo {
|
||||||
|
|
||||||
// FIXME classes in the wrong place
|
|
||||||
|
|
||||||
private static final Map<String, String> SCOPE_DESTINATIONS;
|
private static final Map<String, String> SCOPE_DESTINATIONS;
|
||||||
static {
|
static {
|
||||||
Map<String, String> map = new HashMap<String, String>();
|
Map<String, String> map = new HashMap<String, String>();
|
||||||
|
@ -35,8 +35,6 @@ import org.apache.maven.plugins.shade.resource.ResourceTransformer;
|
|||||||
*/
|
*/
|
||||||
public class PropertiesMergingResourceTransformer implements ResourceTransformer {
|
public class PropertiesMergingResourceTransformer implements ResourceTransformer {
|
||||||
|
|
||||||
// FIXME move out of core
|
|
||||||
|
|
||||||
private String resource; // Set this in pom configuration with
|
private String resource; // Set this in pom configuration with
|
||||||
// <resource>...</resource>
|
// <resource>...</resource>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user