Merge branch '2.2.x'

pom.xml

@@ -30,7 +30,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>
@@ -134,11 +133,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>

spring-cloud-netflix-dependencies/pom.xml

@@ -14,7 +14,7 @@
 	<name>spring-cloud-netflix-dependencies</name>
 	<description>Spring Cloud Netflix Dependencies</description>
 	<properties>
-		<eureka.version>1.10.10</eureka.version>
+		<eureka.version>1.10.11</eureka.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>

spring-cloud-netflix-eureka-server/pom.xml

@@ -81,10 +81,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>

spring-cloud-starter-netflix-eureka-client/pom.xml

@@ -63,9 +63,5 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-loadbalancer</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.thoughtworks.xstream</groupId>
-			<artifactId>xstream</artifactId>
-		</dependency>
 	</dependencies>
 </project>