From 0c8cb13817ab36be89f6cb6dcd334b708ac49054 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 11 Jan 2022 14:05:12 -0500 Subject: [PATCH] Updates to use wiremock-jre8-standalone This has jetty shaded, so no class def not found errors. Also removes apparently unused spock-spring --- pom.xml | 8 -------- spring-cloud-kubernetes-client-config/pom.xml | 2 +- spring-cloud-kubernetes-client-discovery/pom.xml | 2 +- spring-cloud-kubernetes-client-loadbalancer/pom.xml | 2 +- .../spring-cloud-kubernetes-configserver/pom.xml | 2 +- .../spring-cloud-kubernetes-discoveryserver/pom.xml | 2 +- spring-cloud-kubernetes-dependencies/pom.xml | 2 +- spring-cloud-kubernetes-discovery/pom.xml | 2 +- spring-cloud-kubernetes-fabric8-autoconfig/pom.xml | 5 ----- spring-cloud-kubernetes-fabric8-config/pom.xml | 5 ----- spring-cloud-kubernetes-fabric8-discovery/pom.xml | 5 ----- .../pom.xml | 2 +- 12 files changed, 8 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index bf673105..56555ee9 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,6 @@ 4.4.0 2.4.12 3.0.2 - 1.3-groovy-2.5 **/*IT.java @@ -165,13 +164,6 @@ ${groovy.version} - - org.spockframework - spock-spring - ${spock-spring.version} - test - - org.springframework.cloud spring-cloud-test-support diff --git a/spring-cloud-kubernetes-client-config/pom.xml b/spring-cloud-kubernetes-client-config/pom.xml index 1b6ef261..1e437fec 100644 --- a/spring-cloud-kubernetes-client-config/pom.xml +++ b/spring-cloud-kubernetes-client-config/pom.xml @@ -83,7 +83,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone test diff --git a/spring-cloud-kubernetes-client-discovery/pom.xml b/spring-cloud-kubernetes-client-discovery/pom.xml index 488434b2..c1eda7bf 100644 --- a/spring-cloud-kubernetes-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-client-discovery/pom.xml @@ -67,7 +67,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone test diff --git a/spring-cloud-kubernetes-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-client-loadbalancer/pom.xml index d1a07b6b..537d4df5 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-client-loadbalancer/pom.xml @@ -37,7 +37,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone test diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml index fdb82705..dbfccb85 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configserver/pom.xml @@ -39,7 +39,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone test diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml index 94d12e88..a6ba2b9e 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/pom.xml @@ -43,7 +43,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone test diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml index aa0d425d..dbe182ed 100644 --- a/spring-cloud-kubernetes-dependencies/pom.xml +++ b/spring-cloud-kubernetes-dependencies/pom.xml @@ -247,7 +247,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone ${wiremock.version} test diff --git a/spring-cloud-kubernetes-discovery/pom.xml b/spring-cloud-kubernetes-discovery/pom.xml index 4c15e617..51e00d61 100644 --- a/spring-cloud-kubernetes-discovery/pom.xml +++ b/spring-cloud-kubernetes-discovery/pom.xml @@ -46,7 +46,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone test diff --git a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml index d555b318..4d2f22c3 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml +++ b/spring-cloud-kubernetes-fabric8-autoconfig/pom.xml @@ -108,11 +108,6 @@ kubernetes-server-mock test - - org.spockframework - spock-spring - test - org.springframework.boot spring-boot-starter-actuator diff --git a/spring-cloud-kubernetes-fabric8-config/pom.xml b/spring-cloud-kubernetes-fabric8-config/pom.xml index d6966b4b..77ff6ad9 100644 --- a/spring-cloud-kubernetes-fabric8-config/pom.xml +++ b/spring-cloud-kubernetes-fabric8-config/pom.xml @@ -133,11 +133,6 @@ - - org.spockframework - spock-spring - test - org.springframework.boot spring-boot-starter-webflux diff --git a/spring-cloud-kubernetes-fabric8-discovery/pom.xml b/spring-cloud-kubernetes-fabric8-discovery/pom.xml index 0dc28ea5..ecc43af0 100644 --- a/spring-cloud-kubernetes-fabric8-discovery/pom.xml +++ b/spring-cloud-kubernetes-fabric8-discovery/pom.xml @@ -95,11 +95,6 @@ - - org.spockframework - spock-spring - test - org.springframework.boot spring-boot-configuration-processor diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml index 32c6665e..b2323d96 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml @@ -50,7 +50,7 @@ com.github.tomakehurst - wiremock-jre8 + wiremock-jre8-standalone ${wiremock.version} test