From 148a239cb3c48a12546158e38b32f58307600e73 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 21 Aug 2017 13:18:07 +0200
Subject: [PATCH] Upgrade to Spring Cloud Finchley M2.

See gh-145.
---
 pom.xml                                  | 38 ++++--------------------
 spring-cloud-vault-config-consul/pom.xml |  2 +-
 spring-cloud-vault-dependencies/pom.xml  | 15 ++++------
 3 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0ce08f59..48534892 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.0.0.M1</version>
+		<version>2.0.0.M2</version>
 		<relativePath/>
 		<!-- lookup parent from repository -->
 	</parent>
@@ -41,7 +41,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring-cloud-commons.version>2.0.0.M1</spring-cloud-commons.version>
+		<spring-cloud-commons.version>2.0.0.M2</spring-cloud-commons.version>
 		<httpclient.version>4.5.3</httpclient.version>
 		<httpcore.version>4.4.6</httpcore.version>
 		<netty.version>4.1.13.Final</netty.version>
@@ -74,31 +74,6 @@
 				<scope>test</scope>
 			</dependency>
 
-			<!-- Pin versions until next milestone -->
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-framework-bom</artifactId>
-				<version>5.0.0.BUILD-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>io.projectreactor</groupId>
-				<artifactId>reactor-bom</artifactId>
-				<version>Bismuth-BUILD-SNAPSHOT</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>com.fasterxml.jackson</groupId>
-				<artifactId>jackson-bom</artifactId>
-				<version>2.9.0.pr4</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
 			<!-- HTTP Client Libraries -->
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
@@ -225,12 +200,9 @@
 
 	<repositories>
 		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/libs-milestone</url>
 		</repository>
 	</repositories>
 
diff --git a/spring-cloud-vault-config-consul/pom.xml b/spring-cloud-vault-config-consul/pom.xml
index c74edd67..f81df730 100644
--- a/spring-cloud-vault-config-consul/pom.xml
+++ b/spring-cloud-vault-config-consul/pom.xml
@@ -16,7 +16,7 @@
 	<description>Spring Cloud Vault Config Consul support</description>
 
 	<properties>
-		<spring-cloud-consul.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-consul.version>
+		<spring-cloud-consul.version>2.0.0.M1</spring-cloud-consul.version>
 	</properties>
 
 	<dependencies>
diff --git a/spring-cloud-vault-dependencies/pom.xml b/spring-cloud-vault-dependencies/pom.xml
index 6ad63325..6b1eee5f 100644
--- a/spring-cloud-vault-dependencies/pom.xml
+++ b/spring-cloud-vault-dependencies/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
-		<version>2.0.0.M1</version>
+		<version>2.0.0.M2</version>
 		<relativePath />
 		<!-- lookup parent from repository -->
 	</parent>
@@ -125,13 +125,10 @@
 	</build>
 
 	<repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
+	    <repository>
+	        <id>spring-milestones</id>
+	        <name>Spring Milestones</name>
+	        <url>https://repo.spring.io/libs-milestone</url>
+	    </repository>
 	</repositories>
 </project>