Merge branch '2.1.x'

2019-06-28 23:45:07 -07:00
parent fc7a99d0df 92bff3c328
commit 605599138e
347 changed files with 339 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> {