Merge branch '2.0.x'

2018-10-02 10:30:33 -07:00
parent ab8d286200 3ff20b2440
commit 42cb0effc4
7 changed files with 20 additions and 9 deletions
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml
@@ -14,6 +14,7 @@
 	<description>Parent pom providing dependency and plugin management for applications
 		built with Maven</description>
 	<properties>
+		<main.basedir>${basedir}/../../..</main.basedir>
 		<java.version>1.8</java.version>
 		<resource.delimiter>@</resource.delimiter> <!-- delimiter that doesn't clash with Spring ${} placeholders -->
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>