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

Update to 1.4.x version of the kubernetes-client. Use fabric8 mockwebserver.

Browse Source
This commit is contained in:
Ioannis Canellos
2016-08-25 15:31:31 +03:00
parent 8b9f473133
commit 80aa624989
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -77,7 +77,8 @@
<properties>
<!-- Dependency Versions -->
<commons-logging.version>1.2</commons-logging.version>
<kubernetes-client.version>1.3.83</kubernetes-client.version>
<kubernetes-client.version>1.4.6</kubernetes-client.version>
<mockwebserver.version>0.0.4</mockwebserver.version>
<lombok.version>1.16.8</lombok.version>
<servlet-api.version>2.5</servlet-api.version>
<spock-spring.version>1.0-groovy-2.3</spock-spring.version>
@@ -200,6 +201,13 @@
</dependency>
<!-- Testing Dependencies -->
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>mockwebserver</artifactId>
<version>${mockwebserver.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>

2
spring-cloud-kubernetes-core/pom.xml
View File

@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<groupId>io.fabric8</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>

3
spring-cloud-kubernetes-ribbon/pom.xml
View File

@@ -118,11 +118,10 @@
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<groupId>io.fabric8</groupId>
<artifactId>mockwebserver</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-spring</artifactId>

4
spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy
View File

@@ -72,11 +72,11 @@ class RibbonTest extends Specification {
.withName("testapp-a")
.endMetadata()
.addNewSubset()
.addNewAddresse().withIp(mockEndpointA.getServer().hostName).endAddresse()
.addNewAddress().withIp(mockEndpointA.getServer().hostName).endAddress()
.addNewPort("http", mockEndpointA.getServer().port, "http")
.endSubset()
.addNewSubset()
.addNewAddresse().withIp(mockEndpointB.getServer().hostName).endAddresse()
.addNewAddress().withIp(mockEndpointB.getServer().hostName).endAddress()
.addNewPort("http", mockEndpointB.getServer().port, "http")
.endSubset()
.build()).always()