Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2017-02-08 15:01:28 +01:00
parent ba05f4012c da8362a2da
commit 5f05e9793b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-dependencies/pom.xml
View File

@@ -250,11 +250,6 @@
<artifactId>spring-boot-test-autoconfigure</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test-support</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-actuator</artifactId>

6
spring-boot-parent/pom.xml
View File

@@ -41,6 +41,12 @@
</ciManagement>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test-support</artifactId>
<version>1.5.2.BUILD-SNAPSHOT</version>
</dependency>
<!-- Additional Dependencies the consumers of spring-boot-dependencies
will generally not need -->
<dependency> <!-- deprecated but recent version required by 3rd party libs -->

2
spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/SkipPatternJarScanner.java
View File

@@ -40,7 +40,7 @@ class SkipPatternJarScanner extends StandardJarScanner {
SkipPatternJarScanner(JarScanner jarScanner, Set<String> patterns) {
Assert.notNull(jarScanner, "JarScanner must not be null");
Assert.notNull(jarScanner, "Patterns must not be null");
Assert.notNull(patterns, "Patterns must not be null");
this.jarScanner = jarScanner;
StandardJarScanFilter filter = new StandardJarScanFilter();
filter.setTldSkip(StringUtils.collectionToCommaDelimitedString(patterns));