Merge branch '2.1.x'

Closes gh-16967
This commit is contained in:
Andy Wilkinson 2019-05-25 08:11:10 +01:00
commit f3ebd71b29
1 changed files with 2 additions and 2 deletions

View File

@ -9,8 +9,8 @@
</parent> </parent>
<artifactId>spring-boot-project</artifactId> <artifactId>spring-boot-project</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Spring Boot Build</name> <name>Spring Boot Project</name>
<description>Spring Boot Build</description> <description>Spring Boot Project</description>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
</properties> </properties>