root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
pull/7010/merge
Andy Wilkinson 8 years ago
parent b1026db330 3ea09d2e04
commit 86034e5c5c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File

5
spring-boot-parent/pom.xml
Unescape Escape View File

@ -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>

1
spring-boot-test/pom.xml
Unescape Escape View File

@ -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>

Write Preview
Loading…
Cancel
Save