Merge remote-tracking branch 'origin/master' into 2.0.x-rc

sophiaso · sophiaso · commit a5440fe0e8c0 · 2018-03-02T16:31:16.000+08:00
diff --git a/azure-spring-boot/pom.xml b/azure-spring-boot/pom.xml
@@ -30,6 +30,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20171018</version>
+        </dependency>
+
         <!--Cloud Foundry support-->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
