Merge branch '2.0.x' into 2.1.x

wilkinsona · wilkinsona · commit 80f2e2260e43 · 2019-03-06T15:11:09.000Z
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -104,7 +104,7 @@
 		<jedis.version>2.9.3</jedis.version>
 		<jersey.version>2.27</jersey.version>
 		<jest.version>6.3.1</jest.version>
-		<jetty.version>9.4.15.v20190215</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.35.1</jetty-el.version>
 		<jetty-reactive-httpclient.version>1.0.3</jetty-reactive-httpclient.version>
