From bc0eef9ae2c2f300054d7c0baf22091c184e0c69 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Wed, 24 Feb 2016 09:15:35 +0000
Subject: [PATCH] Exclude jackson XML from eureka client by default

Any client that wants to can include it back again, but generally
it only causes problems (XML returned from apps instead of
JSON by Spring MVC for instance). In general it only causes problems
for services whose clients use "Accept: application/xml,*/*", for
instance (like a browser).

See gh-306
---
 spring-cloud-netflix-dependencies/pom.xml  | 4 ++++
 spring-cloud-netflix-eureka-server/pom.xml | 4 ++++
 spring-cloud-starter-eureka-server/pom.xml | 4 ----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 63ab4951b..64d18b66d 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -283,6 +283,10 @@
 						<groupId>com.google.code.findbugs</groupId>
 						<artifactId>jsr305</artifactId>
 					</exclusion>
+					<exclusion>
+						<artifactId>jackson-dataformat-xml</artifactId>
+						<groupId>com.fasterxml.jackson.dataformat</groupId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<!-- Eureka core dep that is now optional -->
diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index 307bb4fc4..ea6dc33d8 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -83,6 +83,10 @@
 			<artifactId>javax.inject</artifactId>
 		</dependency>
 		<!-- Eureka deps that are now optional in eureka -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.dataformat</groupId>
+			<artifactId>jackson-dataformat-xml</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
diff --git a/spring-cloud-starter-eureka-server/pom.xml b/spring-cloud-starter-eureka-server/pom.xml
index 7a2592d8d..17af867af 100644
--- a/spring-cloud-starter-eureka-server/pom.xml
+++ b/spring-cloud-starter-eureka-server/pom.xml
@@ -40,9 +40,5 @@
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-eureka</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-		</dependency>
 	</dependencies>
 </project>