From 034b38f56525a9f567bf2996a39d82f0b525719d Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Thu, 13 Sep 2018 16:57:49 +0200
Subject: [PATCH] Upgrade boot to 2.1.0.M3.

---
 pom.xml                                                 | 6 ------
 samples/standalone/contracts/com/example/server/pom.xml | 2 +-
 samples/standalone/dsl/http-client/build.gradle         | 2 +-
 samples/standalone/dsl/http-server/build.gradle         | 2 +-
 samples/standalone/dsl/http-server/pom.xml              | 2 +-
 samples/standalone/messaging/stream-sink/build.gradle   | 2 +-
 samples/standalone/messaging/stream-sink/pom.xml        | 2 +-
 samples/standalone/messaging/stream-source/build.gradle | 2 +-
 samples/standalone/messaging/stream-source/pom.xml      | 2 +-
 samples/standalone/pact/pact-http-client/build.gradle   | 2 +-
 samples/standalone/pact/pact-http-server/build.gradle   | 2 +-
 samples/standalone/pact/pact-http-server/pom.xml        | 2 +-
 samples/standalone/restdocs/http-client/build.gradle    | 2 +-
 samples/standalone/restdocs/http-client/pom.xml         | 2 +-
 samples/standalone/restdocs/http-server/build.gradle    | 2 +-
 samples/standalone/restdocs/http-server/pom.xml         | 2 +-
 samples/standalone/webclient/http-client/build.gradle   | 2 +-
 samples/standalone/webclient/http-client/pom.xml        | 2 +-
 samples/standalone/webclient/http-server/build.gradle   | 2 +-
 samples/standalone/webclient/http-server/pom.xml        | 2 +-
 samples/standalone/yml/http-client/build.gradle         | 2 +-
 samples/standalone/yml/http-server/build.gradle         | 2 +-
 samples/standalone/yml/http-server/pom.xml              | 2 +-
 23 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index cf35a25857..8e21d63686 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
 		<cglib.version>3.2.4</cglib.version>
 		<spock-spring.version>1.0-groovy-2.4</spock-spring.version>
 		<spock-global-unroll.version>0.5.1</spock-global-unroll.version>
-		<spring-rabbit.version>2.1.0.M2</spring-rabbit.version>
 		<hoverfly-junit.version>0.2.2</hoverfly-junit.version>
 		<commons-text.version>1.1</commons-text.version>
 		<handlebars.version>4.0.6</handlebars.version>
@@ -116,11 +115,6 @@
 				<artifactId>spock-global-unroll</artifactId>
 				<version>${spock-global-unroll.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.amqp</groupId>
-				<artifactId>spring-rabbit</artifactId>
-				<version>${spring-rabbit.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>io.specto</groupId>
 				<artifactId>hoverfly-junit</artifactId>
diff --git a/samples/standalone/contracts/com/example/server/pom.xml b/samples/standalone/contracts/com/example/server/pom.xml
index 46e83e1cb4..2395a29078 100644
--- a/samples/standalone/contracts/com/example/server/pom.xml
+++ b/samples/standalone/contracts/com/example/server/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle
index 632fc1e96d..965b4ba0e8 100644
--- a/samples/standalone/dsl/http-client/build.gradle
+++ b/samples/standalone/dsl/http-client/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 	}
 }
 
diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle
index cb9fdbcf70..d862bcbad7 100644
--- a/samples/standalone/dsl/http-server/build.gradle
+++ b/samples/standalone/dsl/http-server/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 // end::repos[]
 	dependencies {
 		classpath 'org.codehaus.groovy:groovy-all:2.5.0-beta-1'
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml
index 692483290d..4606d0d081 100644
--- a/samples/standalone/dsl/http-server/pom.xml
+++ b/samples/standalone/dsl/http-server/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
diff --git a/samples/standalone/messaging/stream-sink/build.gradle b/samples/standalone/messaging/stream-sink/build.gradle
index 4ed306b40d..5be2258844 100644
--- a/samples/standalone/messaging/stream-sink/build.gradle
+++ b/samples/standalone/messaging/stream-sink/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 	}
 }
 
diff --git a/samples/standalone/messaging/stream-sink/pom.xml b/samples/standalone/messaging/stream-sink/pom.xml
index b1ed1d69d6..17649b10d2 100644
--- a/samples/standalone/messaging/stream-sink/pom.xml
+++ b/samples/standalone/messaging/stream-sink/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle
index 3bc8fbd40a..f2aa0e04c8 100644
--- a/samples/standalone/messaging/stream-source/build.gradle
+++ b/samples/standalone/messaging/stream-source/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 // Example of using Rest Assured 3.x. If you don't add this section Rest Assured 2.9.0 will be used
 //		classpath "com.jayway.restassured:rest-assured:2.9.0"
diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml
index c45a710c42..cc9ef8dcb2 100644
--- a/samples/standalone/messaging/stream-source/pom.xml
+++ b/samples/standalone/messaging/stream-source/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/samples/standalone/pact/pact-http-client/build.gradle b/samples/standalone/pact/pact-http-client/build.gradle
index 5f80e75981..966ed826b3 100644
--- a/samples/standalone/pact/pact-http-client/build.gradle
+++ b/samples/standalone/pact/pact-http-client/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 	}
 }
 
diff --git a/samples/standalone/pact/pact-http-server/build.gradle b/samples/standalone/pact/pact-http-server/build.gradle
index 77f0c962e7..06ab496988 100644
--- a/samples/standalone/pact/pact-http-server/build.gradle
+++ b/samples/standalone/pact/pact-http-server/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 		//tag::pact_dependency[]
 		classpath "org.springframework.cloud:spring-cloud-contract-pact:${findProperty('verifierVersion') ?: verifierVersion}"
diff --git a/samples/standalone/pact/pact-http-server/pom.xml b/samples/standalone/pact/pact-http-server/pom.xml
index ee2b7cbeda..b1e2cfaeb9 100644
--- a/samples/standalone/pact/pact-http-server/pom.xml
+++ b/samples/standalone/pact/pact-http-server/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
diff --git a/samples/standalone/restdocs/http-client/build.gradle b/samples/standalone/restdocs/http-client/build.gradle
index 843d6d68ae..2d5845673e 100644
--- a/samples/standalone/restdocs/http-client/build.gradle
+++ b/samples/standalone/restdocs/http-client/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 	}
 }
 
diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml
index 87282005b2..15d9591f13 100644
--- a/samples/standalone/restdocs/http-client/pom.xml
+++ b/samples/standalone/restdocs/http-client/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle
index 61478d402d..a09b44a009 100644
--- a/samples/standalone/restdocs/http-server/build.gradle
+++ b/samples/standalone/restdocs/http-server/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 		maven { url "http://repo.spring.io/plugins-staging-local/" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${project.findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml
index 7fdd22744d..e14eafa6e6 100644
--- a/samples/standalone/restdocs/http-server/pom.xml
+++ b/samples/standalone/restdocs/http-server/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
diff --git a/samples/standalone/webclient/http-client/build.gradle b/samples/standalone/webclient/http-client/build.gradle
index 69bcfe6ad2..afe320c7f1 100644
--- a/samples/standalone/webclient/http-client/build.gradle
+++ b/samples/standalone/webclient/http-client/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 	}
 }
 
diff --git a/samples/standalone/webclient/http-client/pom.xml b/samples/standalone/webclient/http-client/pom.xml
index cd865fd7b8..bc978e4ebb 100644
--- a/samples/standalone/webclient/http-client/pom.xml
+++ b/samples/standalone/webclient/http-client/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
diff --git a/samples/standalone/webclient/http-server/build.gradle b/samples/standalone/webclient/http-server/build.gradle
index f31960b114..f5357518b9 100644
--- a/samples/standalone/webclient/http-server/build.gradle
+++ b/samples/standalone/webclient/http-server/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 		maven { url "http://repo.spring.io/plugins-staging-local/" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 	}
 }
 
diff --git a/samples/standalone/webclient/http-server/pom.xml b/samples/standalone/webclient/http-server/pom.xml
index 4fa059f70d..d958fc57b5 100644
--- a/samples/standalone/webclient/http-server/pom.xml
+++ b/samples/standalone/webclient/http-server/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
diff --git a/samples/standalone/yml/http-client/build.gradle b/samples/standalone/yml/http-client/build.gradle
index 0e035eaeee..912f68376e 100644
--- a/samples/standalone/yml/http-client/build.gradle
+++ b/samples/standalone/yml/http-client/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 		maven { url "http://repo.spring.io/release" }
 	}
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 	}
 }
 
diff --git a/samples/standalone/yml/http-server/build.gradle b/samples/standalone/yml/http-server/build.gradle
index 49c98fa6cd..72bbc8343e 100644
--- a/samples/standalone/yml/http-server/build.gradle
+++ b/samples/standalone/yml/http-server/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 	}
 // end::repos[]
 	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M2"
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:2.1.0.M3"
 		classpath "org.springframework.cloud:spring-cloud-contract-gradle-plugin:${findProperty('verifierVersion') ?: verifierVersion}"
 	}
 }
diff --git a/samples/standalone/yml/http-server/pom.xml b/samples/standalone/yml/http-server/pom.xml
index 6b982b9ef7..2063051cf3 100644
--- a/samples/standalone/yml/http-server/pom.xml
+++ b/samples/standalone/yml/http-server/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.M2</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>