GitHub-Spring
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polish

pull/7/head
Phillip Webb 13 years ago
parent
dcd120c477
commit
c52972ceec
3 changed files with 0 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
  2. 2
      spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java
  3. 2
      spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java

7
spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
Unescape View File

@ -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

2
spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java
Unescape View File

@ -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>();

2
spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java
Unescape View File

@ -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>

Write Preview
Loading…
Cancel
Save