Merge remote-tracking branch 'upstream/master' into gh-304-add-discovery-clients-order-support

This commit is contained in:
Olga Maciaszek-Sharma
2018-09-07 13:53:39 +02:00
8 changed files with 22 additions and 12 deletions

View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cloudfoundry</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<dependencies>
@@ -40,6 +40,11 @@
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>