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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Andy Wilkinson
2016-11-17 19:28:01 +00:00
parent 7b742fd792 918e122ddc
commit eff0fc0221
17 changed files with 917 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,11 @@
<artifactId>jline</artifactId>
<version>2.11</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.5.4</version>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>

1
spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
View File

@@ -6,6 +6,7 @@
<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
<suppress files="LaunchScriptTestApplication\.java" checks="HideUtilityClassConstructor" />
<suppress files="DevToolsTestApplication\.java" checks="HideUtilityClassConstructor" />
<suppress files="SignalUtils\.java" checks="IllegalImport" />
<suppress files="[\\/]src[\\/]test[\\/]java[\\/]cli[\\/]command[\\/]" checks="ImportControl" />
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]sample[\\/]" checks="ImportControl" />