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

Merge branch 'Finchley.M1' into Finchley

Browse Source 
# Conflicts:
#	spring-cloud-dependencies/pom.xml
This commit is contained in:
Spencer Gibb
2017-07-06 10:33:37 -06:00
parent 472c7073b9 af82b2d3ba
commit e8b8bab4af
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-build</artifactId>
<version>Finchley.BUILD-SNAPSHOT</version>
<version>Finchley.M1</version>
</parent>
<packaging>pom</packaging>
<name>Spring Cloud Starter Docs</name>

4
pom.xml
View File

@@ -6,11 +6,11 @@
<packaging>pom</packaging>
<name>Spring Cloud Starter Build</name>
<description>Spring Cloud Starter Build</description>
<version>Finchley.BUILD-SNAPSHOT</version>
<version>Finchley.M1</version>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.0.0.BUILD-SNAPSHOT</version>
<version>2.0.0.M1</version>
<relativePath />
</parent>

4
spring-cloud-starter-parent/pom.xml
View File

@@ -9,7 +9,7 @@
</parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-parent</artifactId>
<version>Finchley.BUILD-SNAPSHOT</version>
<version>Finchley.M1</version>
<name>spring-cloud-starter-parent</name>
<description>Spring Cloud Starter Parent</description>
<packaging>pom</packaging>
@@ -20,7 +20,7 @@
</organization>
<properties>
<main.basedir>${basedir}/../..</main.basedir>
<spring-cloud.version>Finchley.BUILD-SNAPSHOT</spring-cloud.version>
<spring-cloud.version>Finchley.M1</spring-cloud.version>
</properties>
<dependencyManagement>
<dependencies>