Merge remote-tracking branch 'origin/master' into 2.3.0

This commit is contained in:
wing328
2017-06-28 15:35:24 +08:00
50 changed files with 516 additions and 34 deletions

View File

@@ -9,7 +9,7 @@
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<swagger-core-version>1.5.12</swagger-core-version>
<swagger-core-version>1.5.15</swagger-core-version>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>