Merge branch '1.5.x'

2017-01-04 23:52:40 -08:00
parent 125d9d6181 45d5b60f6d
commit 4bfecc1307
23 changed files with 450 additions and 284 deletions
--- a/spring-boot-tools/spring-boot-configuration-metadata/pom.xml
+++ b/spring-boot-tools/spring-boot-configuration-metadata/pom.xml
@@ -20,8 +20,8 @@
 	<dependencies>
 		<!-- Compile (should stick to the bare minimum) -->
 		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
+			<groupId>com.vaadin.external.google</groupId>
+			<artifactId>android-json</artifactId>
 		</dependency>
 	</dependencies>
 </project>