From 349f9065445f70d905ea0a9d3f4bcc9fcf3c5004 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Thu, 26 Apr 2018 13:23:02 +0200
Subject: [PATCH 1/3] Updated libs

---
 pom.xml                               | 4 ++--
 samples/wiremock-jetty/pom.xml        | 2 +-
 samples/wiremock-native/pom.xml       | 2 +-
 samples/wiremock-tomcat/pom.xml       | 2 +-
 samples/wiremock-undertow-ssl/pom.xml | 2 +-
 samples/wiremock-undertow/pom.xml     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 88bd612cac..c08f7b4afe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.3.8.RELEASE</version>
+		<version>1.3.9.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
@@ -26,7 +26,7 @@
 		<activemq.version>5.12.1</activemq.version>
 		<camel.version>2.18.3</camel.version>
 		<checkstyle.version>2.17</checkstyle.version>
-		<spring-cloud-build.version>1.3.8.RELEASE</spring-cloud-build.version>
+		<spring-cloud-build.version>1.3.9.BUILD-SNAPSHOT</spring-cloud-build.version>
 		<spring-cloud-zookeeper.version>1.2.1.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
 		<spring-cloud-stream.version>Ditmars.BUILD-SNAPSHOT</spring-cloud-stream.version>
 		<spring-cloud-netflix.version>1.4.4.BUILD-SNAPSHOT</spring-cloud-netflix.version>
diff --git a/samples/wiremock-jetty/pom.xml b/samples/wiremock-jetty/pom.xml
index 21efcc5086..7cdbb8a5ff 100644
--- a/samples/wiremock-jetty/pom.xml
+++ b/samples/wiremock-jetty/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>1.5.11.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/samples/wiremock-native/pom.xml b/samples/wiremock-native/pom.xml
index 997e0a31f1..66d983afbc 100644
--- a/samples/wiremock-native/pom.xml
+++ b/samples/wiremock-native/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>1.5.11.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/samples/wiremock-tomcat/pom.xml b/samples/wiremock-tomcat/pom.xml
index 554c99ce62..5b939daa90 100644
--- a/samples/wiremock-tomcat/pom.xml
+++ b/samples/wiremock-tomcat/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>1.5.11.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/samples/wiremock-undertow-ssl/pom.xml b/samples/wiremock-undertow-ssl/pom.xml
index ac362206fe..046590d5c2 100644
--- a/samples/wiremock-undertow-ssl/pom.xml
+++ b/samples/wiremock-undertow-ssl/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>1.5.11.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
diff --git a/samples/wiremock-undertow/pom.xml b/samples/wiremock-undertow/pom.xml
index bea37129f5..97c0fde3f0 100644
--- a/samples/wiremock-undertow/pom.xml
+++ b/samples/wiremock-undertow/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
+		<version>1.5.11.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

From 0e51f97c2f89127b3d4c6d253d23e7aefbd8743a Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Thu, 26 Apr 2018 13:23:17 +0200
Subject: [PATCH 2/3] Made stub runner executable jar; fixes gh-630

---
 spring-cloud-contract-stub-runner-boot/pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-cloud-contract-stub-runner-boot/pom.xml b/spring-cloud-contract-stub-runner-boot/pom.xml
index 87daf7c5b7..4f7395014c 100644
--- a/spring-cloud-contract-stub-runner-boot/pom.xml
+++ b/spring-cloud-contract-stub-runner-boot/pom.xml
@@ -23,6 +23,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<executable>true</executable>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

From 72f5ba2722b7b004357e06171bf7515039a5a3ff Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Wed, 2 May 2018 10:39:37 -0400
Subject: [PATCH 3/3] StubRunner config with role infra

---
 .../spring/cloud/ribbon/StubRunnerRibbonConfiguration.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java
index 990bc64f4d..fb6aa3f371 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java
@@ -20,17 +20,20 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerList;
+import org.springframework.context.annotation.Role;
 
 @Configuration
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 class StubRunnerRibbonConfiguration {
 	@Bean
-	StubRunnerRibbonBeanPostProcessor stubRunnerRibbonBeanPostProcessor(BeanFactory beanFactory) {
+	static StubRunnerRibbonBeanPostProcessor stubRunnerRibbonBeanPostProcessor(BeanFactory beanFactory) {
 		return new StubRunnerRibbonBeanPostProcessor(beanFactory);
 	}