Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2016-12-30 12:17:28 -08:00
321 changed files with 501 additions and 334 deletions

View File

@@ -19,6 +19,7 @@
<ant.version>1.9.3</ant.version>
</properties>
<dependencies>
<!-- Compile -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -27,16 +28,17 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-loader-tools</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-antlib</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
</dependency>
<!-- Test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-loader-tools</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
@@ -100,4 +102,4 @@
</plugin>
</plugins>
</build>
</project>
</project>