Merge branch '2.0.x' into 2.1.x

2019-06-28 23:30:29 -07:00
parent 6425fb6ec8 cfeb0239b7
commit 92bff3c328
343 changed files with 338 additions and 140 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootPlugin.java
@@ -44,6 +44,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootWar;
 * @author Dave Syer
 * @author Andy Wilkinson
 * @author Danny Hyun
+ * @since 1.2.7
 */
 public class SpringBootPlugin implements Plugin<Project> {