From 42e24136efd822b5a81f47ad5eacde5fde38ef56 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Thu, 27 Apr 2017 11:29:56 -0700
Subject: [PATCH] Drop `spring-social-web-thymeleaf3`

Drop `spring-social-web-thymeleaf3` dependency since it's been merged
into `spring-social-web` as of Spring Social 2.0.

Fixes gh-9017
---
 spring-boot-autoconfigure/pom.xml                     |  5 -----
 spring-boot-dependencies/pom.xml                      | 11 -----------
 .../spring-boot-starter-social-facebook/pom.xml       | 10 ----------
 .../spring-boot-starter-social-linkedin/pom.xml       | 10 ----------
 .../spring-boot-starter-social-twitter/pom.xml        | 10 ----------
 5 files changed, 46 deletions(-)

diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index 84eb9a2e64..784782fb92 100755
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -556,11 +556,6 @@
 			<artifactId>spring-social-web</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.social</groupId>
-			<artifactId>spring-social-web-thymeleaf3</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-facebook</artifactId>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index b2ecf5174c..09f82991e1 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -2276,17 +2276,6 @@
 				<artifactId>spring-social-web</artifactId>
 				<version>${spring-social.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.social</groupId>
-				<artifactId>spring-social-web-thymeleaf3</artifactId>
-				<version>${spring-social.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>thymeleaf-spring4</artifactId>
-						<groupId>org.thymeleaf</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.social</groupId>
 				<artifactId>spring-social-facebook</artifactId>
diff --git a/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml b/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
index 971954ea39..0d66a3aca6 100644
--- a/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
@@ -38,16 +38,6 @@
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-web</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.social</groupId>
-			<artifactId>spring-social-web-thymeleaf3</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>thymeleaf</artifactId>
-					<groupId>org.thymeleaf</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-facebook</artifactId>
diff --git a/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml b/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
index 34e774f3a3..adbae495ac 100644
--- a/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
@@ -38,16 +38,6 @@
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-web</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.social</groupId>
-			<artifactId>spring-social-web-thymeleaf3</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>thymeleaf</artifactId>
-					<groupId>org.thymeleaf</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-linkedin</artifactId>
diff --git a/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml b/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
index 999ea0ed20..7898a81d2b 100644
--- a/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
@@ -38,16 +38,6 @@
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-web</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.social</groupId>
-			<artifactId>spring-social-web-thymeleaf3</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>thymeleaf</artifactId>
-					<groupId>org.thymeleaf</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.social</groupId>
 			<artifactId>spring-social-twitter</artifactId>