SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bumping to Camden versions of apps

Browse Source 
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...
This commit is contained in:
Marcin Grzejszczak
2016-08-26 16:43:40 +02:00
parent 64d6d3ef6c
commit 6a7aebf1ad
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-contract-dependencies/pom.xml
View File

@@ -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>

10
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/ribbon/StubRunnerRibbonConfiguration.java
View File

@@ -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 {
}
};
}
}

2
spring-cloud-contract-stub-runner/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/StubRunnerSpringCloudAutoConfigurationSpec.groovy
View File

@@ -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"])