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 @@
spring-cloud-dependencies-parent
org.springframework.cloud
- 1.1.2.BUILD-SNAPSHOT
+ 1.2.0.BUILD-SNAPSHOT
spring-cloud-contract-dependencies
@@ -17,10 +17,10 @@
2.1.7
0.4.7
1.1.0
- 1.0.2.RELEASE
+ Brooklyn.BUILD-SNAPSHOT
1.0.3.BUILD-SNAPSHOT
- 1.1.5.BUILD-SNAPSHOT
- 1.0.3.BUILD-SNAPSHOT
+ 1.2.0.BUILD-SNAPSHOT
+ 1.1.0.BUILD-SNAPSHOT
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"])