Merge branch '2.1.x'

This commit is contained in:
Olga Maciaszek-Sharma
2019-05-10 15:50:50 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId>
<artifactId>spring-cloud-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

View File

@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-netflix-core</artifactId>
<artifactId>spring-cloud-netflix-hystrix</artifactId>
<optional>true</optional>
</dependency>
<dependency>