Merge branch '2.0.x'

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -36,7 +36,7 @@
 		<!-- Dependency versions -->
 		<activemq.version>5.15.7</activemq.version>
 		<antlr2.version>2.7.7</antlr2.version>
-		<appengine-sdk.version>1.9.67</appengine-sdk.version>
+		<appengine-sdk.version>1.9.68</appengine-sdk.version>
 		<artemis.version>2.6.3</artemis.version>
 		<aspectj.version>1.9.2</aspectj.version>
 		<assertj.version>3.11.1</assertj.version>
@@ -104,7 +104,7 @@
 		<jedis.version>2.9.0</jedis.version>
 		<jersey.version>2.27</jersey.version>
 		<jest.version>6.3.1</jest.version>
-		<jetty.version>9.4.12.v20180830</jetty.version>
+		<jetty.version>9.4.14.v20181114</jetty.version>
 		<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
 		<jetty-el.version>8.5.33</jetty-el.version>
 		<jetty-reactive-httpclient.version>1.0.1</jetty-reactive-httpclient.version>