From 8f943c5a204059aa901e189fd647d4ace43533a4 Mon Sep 17 00:00:00 2001
From: Benoit Lacelle <benoit.lacelle@solven.eu>
Date: Thu, 10 Aug 2017 15:10:59 +0200
Subject: [PATCH 1/2] Add missing dependency management for Jetty

See gh-9989
---
 spring-boot-dependencies/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 373218fe5d6..51ae31cdedd 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1640,6 +1640,11 @@
 				<artifactId>javax-websocket-server-impl</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty.websocket</groupId>
+				<artifactId>javax-websocket-client-impl</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jetty.websocket</groupId>
 				<artifactId>websocket-client</artifactId>
@@ -1650,6 +1655,11 @@
 				<artifactId>websocket-server</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
+			<dependency>
+	            <groupId>org.eclipse.jetty.websocket</groupId>
+	            <artifactId>websocket-servlet</artifactId>
+				<version>${jetty.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.ehcache</groupId>
 				<artifactId>ehcache</artifactId>

From 4956829ba9e1f6d0f877ffab2cde7a023d894401 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 11 Aug 2017 12:26:16 +0200
Subject: [PATCH 2/2] Polish "Add missing dependency management for Jetty"

Closes gh-9989
---
 spring-boot-dependencies/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 51ae31cdedd..a8ef474cdc9 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1637,12 +1637,12 @@
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jetty.websocket</groupId>
-				<artifactId>javax-websocket-server-impl</artifactId>
+				<artifactId>javax-websocket-client-impl</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jetty.websocket</groupId>
-				<artifactId>javax-websocket-client-impl</artifactId>
+				<artifactId>javax-websocket-server-impl</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
 			<dependency>
@@ -1656,8 +1656,8 @@
 				<version>${jetty.version}</version>
 			</dependency>
 			<dependency>
-	            <groupId>org.eclipse.jetty.websocket</groupId>
-	            <artifactId>websocket-servlet</artifactId>
+				<groupId>org.eclipse.jetty.websocket</groupId>
+				<artifactId>websocket-servlet</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
 			<dependency>