Merge branch '2.0.x' into 2.1.x

2019-06-04 14:21:09 -07:00
parent 930d110178 7fc01971ed
commit 0ef331018e
31 changed files with 38 additions and 17 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/src/main/kotlin/org/test/SampleApplication.kt
+++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-kotlin-module/src/main/kotlin/org/test/SampleApplication.kt
@@ -19,4 +19,4 @@ package org.test;

 fun main(args: Array<String>) {

-}
+}