Merge remote-tracking branch 'origin/3.0.x'

This commit is contained in:
Olga MaciaszekSharma
2021-09-09 13:51:32 +02:00

View File

@@ -14,7 +14,8 @@
<name>spring-cloud-netflix-dependencies</name>
<description>Spring Cloud Netflix Dependencies</description>
<properties>
<eureka.version>1.10.14</eureka.version>
<eureka.version>1.10.16</eureka.version>
<xstream.version>1.4.18</xstream.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -110,8 +111,19 @@
<artifactId>*</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<!-- TODO: Move back to Eureka dependency when 1.10.17 released -->
<exclusion>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- TODO: Move back to Eureka dependency when 1.10.17 released -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>${xstream.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<profiles>