Merge branch '1.5.x'

8 years ago · 86034e5c5c
parent b1026db330 3ea09d2e04
commit 86034e5c5c
2 changed files with 5 additions and 1 deletions
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@ -207,6 +207,11 @@
 				<artifactId>gradle-plugins</artifactId>
 				<version>${gradle.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<artifactId>kotlin-runtime</artifactId>
+				<version>1.0.4</version>
+			</dependency>
 			<dependency>
 				<groupId>org.zeroturnaround</groupId>
 				<artifactId>zt-zip</artifactId>
--- a/spring-boot-test/pom.xml
+++ b/spring-boot-test/pom.xml
@ -115,7 +115,6 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-runtime</artifactId>
-			<version>1.0.4</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>