From 6a7aebf1ad6cfb6a980a51c1a07f6c42ccf192e1 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Fri, 26 Aug 2016 16:43:40 +0200
Subject: [PATCH] Bumping to Camden versions of apps

TODO: currently to make things work I had to pass ribbon.eureka.enabled=false, I'll have to think if I can somehow override it. The problem is that I have a lot of stuff on the classpath...
---
 spring-cloud-contract-dependencies/pom.xml             |  8 ++++----
 .../cloud/ribbon/StubRunnerRibbonConfiguration.java    | 10 ++++++----
 .../StubRunnerSpringCloudAutoConfigurationSpec.groovy  |  2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml
index 89f696c3d0..3f120a4f90 100644
--- a/spring-cloud-contract-dependencies/pom.xml
+++ b/spring-cloud-contract-dependencies/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>1.1.2.BUILD-SNAPSHOT</version>
+		<version>1.2.0.BUILD-SNAPSHOT</version>
         <relativePath/>
 	</parent>
 	<artifactId>spring-cloud-contract-dependencies</artifactId>
@@ -17,10 +17,10 @@
 		<wiremock.version>2.1.7</wiremock.version>
 		<jsonassert.version>0.4.7</jsonassert.version>
 		<aether.version>1.1.0</aether.version>
-		<spring-cloud-stream.version>1.0.2.RELEASE</spring-cloud-stream.version>
+		<spring-cloud-stream.version>Brooklyn.BUILD-SNAPSHOT</spring-cloud-stream.version>
 		<spring-cloud-zookeeper.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-zookeeper.version>
-		<spring-cloud-netflix.version>1.1.5.BUILD-SNAPSHOT</spring-cloud-netflix.version>
-		<spring-cloud-consul.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-consul.version>
+		<spring-cloud-netflix.version>1.2.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-consul.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-consul.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
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 b03d729a5f..d93f49429a 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
@@ -16,15 +16,16 @@
 
 package org.springframework.cloud.contract.stubrunner.spring.cloud.ribbon;
 
-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
 
 @Configuration
 class StubRunnerRibbonConfiguration {
@@ -48,4 +49,5 @@ class StubRunnerRibbonConfiguration {
 			}
 		};
 	}
+
 }
diff --git a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy
index b4a795ee25..bf228cc9e1 100644
--- a/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy
+++ b/spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy
@@ -38,12 +38,14 @@ import spock.lang.Specification
 /**
  * @author Marcin Grzejszczak
  */
+//TODO: Document that ribbon.eureka.enabled=false needs to be set or override it somehow
 @ContextConfiguration(classes = Config, loader = SpringBootContextLoader)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = ["stubrunner.camel.enabled=false",
 				"spring.cloud.zookeeper.enabled=false",
 				"spring.cloud.consul.enabled=false",
 				"eureka.client.enabled=false",
+				"ribbon.eureka.enabled=false",
 				"stubrunner.cloud.stubbed.discovery.enabled=true",
 				"spring.cloud.consul.discovery.enabled=false",
 				"spring.cloud.zookeeper.discovery.enabled=false"])