SpringCloud/spring-cloud-cloudfoundry
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2018-09-07 13:53:39 +02:00
parent 8fb072505b 571dc29f16
commit d836655b31
8 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/pom.xml
View File

@@ -5,7 +5,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>
</parent>
<artifactId>spring-cloud-cloudfoundry-docs</artifactId>
<packaging>pom</packaging>

8
pom.xml
View File

@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-cloudfoundry</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>2.0.2.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -18,8 +18,8 @@
<cf-java-client.version>3.9.0.RELEASE</cf-java-client.version>
<bintray.package>cloudfoundry</bintray.package>
<main.basedir>${basedir}</main.basedir>
<spring-cloud-netflix.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-commons.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-netflix.version>2.0.1.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-commons.version>2.0.1.BUILD-SNAPSHOT</spring-cloud-commons.version>
</properties>
<scm>

2
spring-cloud-cloudfoundry-commons/pom.xml
View File

@@ -9,7 +9,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>

4
spring-cloud-cloudfoundry-dependencies/pom.xml
View File

@@ -5,11 +5,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>2.0.2.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-cloudfoundry-dependencies</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>spring-cloud-cloudfoundry-dependencies</name>
<description>Spring Cloud Cloudfoundry Dependencies</description>

7
spring-cloud-cloudfoundry-discovery/pom.xml
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>

2
spring-cloud-cloudfoundry-sample/pom.xml
View File

@@ -9,7 +9,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>
<build>

7
spring-cloud-cloudfoundry-web/pom.xml
View File

@@ -10,7 +10,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>
@@ -30,6 +30,11 @@
<artifactId>spring-boot-starter-actuator</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>

2
spring-cloud-starter-cloudfoundry/pom.xml
View File

@@ -5,7 +5,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>
<artifactId>spring-cloud-starter-cloudfoundry</artifactId>