Merge branch '2.2.x'

Closes gh-19930
This commit is contained in:
Stephane Nicoll 2020-01-26 08:44:01 +01:00
commit d1867c1b8b

View File

@ -12,7 +12,7 @@ javaPlatform {
dependencies { dependencies {
api(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies"))) api(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
api(enforcedPlatform("org.testcontainers:testcontainers-bom:1.12.4")) api(enforcedPlatform("org.testcontainers:testcontainers-bom:1.12.5"))
constraints { constraints {
api("com.vaadin.external.google:android-json:0.0.20131108.vaadin1") api("com.vaadin.external.google:android-json:0.0.20131108.vaadin1")