From 4978f8f7de88f295be1b1a951e72d7cf60e473b0 Mon Sep 17 00:00:00 2001
From: spencergibb <spencer@gibb.us>
Date: Thu, 14 Jan 2021 12:23:05 -0500
Subject: [PATCH] No longer manage xstream dependency version.

xstream is managed as a compile dependency eureka-client now, Spring Cloud Netflix no longer needs to manage it.

See #3955
---
 pom.xml                                                     | 6 ------
 spring-cloud-netflix-eureka-client/pom.xml                  | 5 -----
 spring-cloud-netflix-eureka-server/pom.xml                  | 4 ----
 .../spring-cloud-starter-netflix-eureka-client/pom.xml      | 4 ----
 4 files changed, 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f8fa39cb..4ce63294f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
 		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
 		<sonar.language>java</sonar.language>
 		<eureka-jersey.version>1.19.4</eureka-jersey.version>
-		<xstream.version>1.4.14</xstream.version>
 	</properties>
 	<build>
 		<plugins>
@@ -170,11 +169,6 @@
 				<artifactId>jersey-apache-client4</artifactId>
 				<version>${eureka-jersey.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.thoughtworks.xstream</groupId>
-				<artifactId>xstream</artifactId>
-				<version>${xstream.version}</version>
-			</dependency>
 			<!-- end eureka deps -->
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml
index a1b547e39..1bd650528 100644
--- a/spring-cloud-netflix-eureka-client/pom.xml
+++ b/spring-cloud-netflix-eureka-client/pom.xml
@@ -72,11 +72,6 @@
 			<optional>true</optional>
 		</dependency>
 		<!-- Eureka core deps that are now optional -->
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>com.sun.jersey.contribs</groupId>
 			<artifactId>jersey-apache-client4</artifactId>
diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml
index d36583e76..cd44df9f2 100644
--- a/spring-cloud-netflix-eureka-server/pom.xml
+++ b/spring-cloud-netflix-eureka-server/pom.xml
@@ -95,10 +95,6 @@
 			<groupId>com.fasterxml.jackson.dataformat</groupId>
 			<artifactId>jackson-dataformat-xml</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure-processor</artifactId>
diff --git a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
index fe04232ad..6adf40c3d 100644
--- a/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
+++ b/spring-cloud-starter-netflix/spring-cloud-starter-netflix-eureka-client/pom.xml
@@ -51,9 +51,5 @@
 			<groupId>com.netflix.ribbon</groupId>
 			<artifactId>ribbon-eureka</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file