From 354389932a2848f5b2d04a511db5b4e5219026d9 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 7 Nov 2014 09:47:12 -0800
Subject: [PATCH] Move tomcat websocket dependency

Relocate tomcat-embed-websocket from spring-boot-starter-websocket
to spring-boot-starter-tomcat.

Fixes gh-1847
---
 .../org/springframework/boot/gradle/WarPackagingTests.java    | 3 ++-
 spring-boot-starters/spring-boot-starter-tomcat/pom.xml       | 4 ++++
 spring-boot-starters/spring-boot-starter-websocket/pom.xml    | 4 ----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java b/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
index 86b29f7b91..fe74fb62fe 100644
--- a/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
+++ b/spring-boot-integration-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
@@ -48,7 +48,8 @@ public class WarPackagingTests {
 
 	private static final Set<String> TOMCAT_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<String>(
 			Arrays.asList("spring-boot-starter-tomcat-", "tomcat-embed-core-",
-					"tomcat-embed-el-", "tomcat-embed-logging-juli-"));
+					"tomcat-embed-el-", "tomcat-embed-logging-juli-",
+					"tomcat-embed-websocket-"));
 
 	private static final Set<String> JETTY_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<String>(
 			Arrays.asList("spring-boot-starter-jetty-", "jetty-util-", "jetty-xml-",
diff --git a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
index b4c8a9b832..032def8138 100644
--- a/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
@@ -30,5 +30,9 @@
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-logging-juli</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-websocket</artifactId>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-boot-starters/spring-boot-starter-websocket/pom.xml b/spring-boot-starters/spring-boot-starter-websocket/pom.xml
index dd47ffa13d..405d0d3ad5 100644
--- a/spring-boot-starters/spring-boot-starter-websocket/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-websocket/pom.xml
@@ -40,9 +40,5 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-websocket</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-websocket</artifactId>
-		</dependency>
 	</dependencies>
 </project>