Merge branch '2.1.x'

Author: wilkinsona

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

@@ -119,7 +119,7 @@
 		<jedis.version>3.0.1</jedis.version>
 		<jersey.version>2.28</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>