root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #3297 from Quantas/master 

* pr/3297:
  Prevent restart when META-INF/maven/** changes
This commit is contained in:
Stephane Nicoll 2015-06-23 14:07:30 +02:00
parent 92a6e3188b 487ab1a60a
commit dc7d17091a
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java
View File

@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
@ConfigurationProperties(prefix = "spring.devtools")
public class DevToolsProperties {
private static final String DEFAULT_RESTART_EXCLUDES = "META-INF/resources/**,resources/**,static/**,public/**,templates/**";
private static final String DEFAULT_RESTART_EXCLUDES = "META-INF/maven/**,META-INF/resources/**,resources/**,static/**,public/**,templates/**";
private static final long DEFAULT_RESTART_POLL_INTERVAL = 1000;

14
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategyTests.java
View File

@ -19,8 +19,7 @@ package org.springframework.boot.devtools.classpath;
import java.io.File;
import org.junit.Test;
import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy;
import org.springframework.boot.devtools.classpath.PatternClassPathRestartStrategy;
import org.springframework.boot.devtools.filewatch.ChangedFile;
import org.springframework.boot.devtools.filewatch.ChangedFile.Type;
@ -31,6 +30,7 @@ import static org.junit.Assert.assertThat;
* Tests for {@link PatternClassPathRestartStrategy}.
*
* @author Phillip Webb
* @author Andrew Landsverk
*/
public class PatternClassPathRestartStrategyTests {
@ -66,6 +66,16 @@ public class PatternClassPathRestartStrategyTests {
assertRestartRequired(strategy, "src/folder/file.txt", true);
}
@Test
public void pomChange() throws Exception {
ClassPathRestartStrategy strategy = createStrategy("META-INF/maven/**");
assertRestartRequired(strategy, "pom.xml", true);
assertRestartRequired(strategy,
"META-INF/maven/org.springframework.boot/spring-boot-devtools/pom.xml", false);
assertRestartRequired(strategy,
"META-INF/maven/org.springframework.boot/spring-boot-devtools/pom.properties", false);
}
private ClassPathRestartStrategy createStrategy(String pattern) {
return new PatternClassPathRestartStrategy(pattern);
}

8
spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View File

@ -828,10 +828,10 @@ commercially supported.
==== Excluding resources
Certain resources don't necessarily need to trigger a restart when they are changed. For
example, Thymeleaf templates can just be edited in-place. By default changing resources
in `/META-INF/resources` ,`/resources` ,`/static` ,`/public` or `/templates` will not
trigger a restart. If you want to customize these exclusions you can use the
`spring.devtools.restart.exclude` property. For example, to exclude only `/static` and
`/public` you would set the following:
in `/META-INF/maven`, ``/META-INF/resources` ,`/resources` ,`/static` ,`/public` or
`/templates` will not trigger a restart. If you want to customize these exclusions you
can use the `spring.devtools.restart.exclude` property. For example, to exclude only
`/static` and `/public` you would set the following:
[indent=0]
----