From 413dc0f710c7c5aa7b861ce1d95e56c42743482a Mon Sep 17 00:00:00 2001 From: Charles Moulliard Date: Fri, 26 May 2017 11:03:15 +0200 Subject: [PATCH 1/2] Update pom file to use 1.3.3.BUILD-SNAPSHOT of spring-cloud-build --- pom.xml | 2 +- spring-cloud-kubernetes-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1802509c..c1ab9366 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.springframework.cloud spring-cloud-build - 1.2.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index e331786e..ccd41a62 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.2.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT spring-cloud-kubernetes-dependencies From a173cde4c933f86fc5931a754f56d6dd4ae5b1cb Mon Sep 17 00:00:00 2001 From: Charles Moulliard Date: Fri, 26 May 2017 11:33:59 +0200 Subject: [PATCH 2/2] Replace deprecated annotations with @SpringBootTest & @ContextConfiguration as CI Build was failing --- .../cloud/kubernetes/config/CoreTest.groovy | 18 +++++++++--------- .../kubernetes/ribbon/test/RibbonTest.groovy | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy b/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy index 8d37bee7..547f7ee7 100644 --- a/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy +++ b/spring-cloud-kubernetes-config/src/test/groovy/org/springframework/cloud/kubernetes/config/CoreTest.groovy @@ -24,20 +24,20 @@ import io.fabric8.kubernetes.client.KubernetesClient import io.fabric8.kubernetes.server.mock.KubernetesMockServer import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.context.properties.EnableConfigurationProperties -import org.springframework.boot.test.IntegrationTest -import org.springframework.boot.test.SpringApplicationConfiguration +import org.springframework.boot.test.context.SpringBootTest import org.springframework.core.env.Environment +import org.springframework.test.context.ContextConfiguration import spock.lang.Specification import groovy.util.logging.Slf4j @Slf4j -@SpringApplicationConfiguration(TestApplication.class) -@IntegrationTest([ - "spring.application.name=testapp", - "spring.cloud.kubernetes.client.namespace=testns", - "spring.cloud.kubernetes.client.trustCerts=true", - "spring.cloud.kubernetes.config.namespace=testns", - "spring.cloud.kubernetes.secrets.enableApi=true" +@ContextConfiguration(classes=[TestApplication.class]) +@SpringBootTest(properties=[ + "spring.application.name=testapp", + "spring.cloud.kubernetes.client.namespace=testns", + "spring.cloud.kubernetes.client.trustCerts=true", + "spring.cloud.kubernetes.config.namespace=testns", + "spring.cloud.kubernetes.secrets.enableApi=true" ]) @EnableConfigurationProperties class CoreTest extends Specification { diff --git a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy index 1792d0be..43e0a313 100644 --- a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy +++ b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy @@ -21,19 +21,19 @@ import io.fabric8.kubernetes.api.model.EndpointsBuilder import io.fabric8.kubernetes.client.Config import io.fabric8.kubernetes.client.KubernetesClient import io.fabric8.kubernetes.server.mock.KubernetesMockServer +import org.springframework.boot.test.context.SpringBootTest import org.springframework.cloud.kubernetes.ribbon.KubernetesRibbonClientConfiguration import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.EnableAutoConfiguration -import org.springframework.boot.test.IntegrationTest -import org.springframework.boot.test.SpringApplicationConfiguration import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor import org.springframework.cloud.netflix.ribbon.RibbonClient +import org.springframework.test.context.ContextConfiguration import org.springframework.web.client.RestTemplate import spock.lang.Specification @EnableAutoConfiguration -@SpringApplicationConfiguration(TestApplication.class) -@IntegrationTest( +@ContextConfiguration(classes=[TestApplication.class]) +@SpringBootTest(properties= [ "spring.application.name=testapp", "spring.cloud.kubernetes.client.namespace=testns",