Skip to content

S
spring-boot
Commit 86034e5c authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.5.x'

parents b1026db3 3ea09d2e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
spring-boot-parent/pom.xml
View file @ 86034e5c
...@@ -207,6 +207,11 @@ ...@@ -207,6 +207,11 @@
<artifactId>gradle-plugins</artifactId> <artifactId>gradle-plugins</artifactId>
<version>${gradle.version}</version> <version>${gradle.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId>
<version>1.0.4</version>
</dependency>
<dependency> <dependency>
<groupId>org.zeroturnaround</groupId> <groupId>org.zeroturnaround</groupId>
<artifactId>zt-zip</artifactId> <artifactId>zt-zip</artifactId>
......
spring-boot-test/pom.xml
View file @ 86034e5c
...@@ -115,7 +115,6 @@ ...@@ -115,7 +115,6 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-runtime</artifactId> <artifactId>kotlin-runtime</artifactId>
<version>1.0.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment