diff --git a/spring-cloud-kubernetes-integration-tests/pom.xml b/spring-cloud-kubernetes-integration-tests/pom.xml index c4ad2d6c..9c14c349 100644 --- a/spring-cloud-kubernetes-integration-tests/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/pom.xml @@ -18,7 +18,7 @@ 17 3.2.13 - 1.16.3 + 1.18.0 @@ -36,30 +36,6 @@ - - com.github.docker-java - docker-java-core - ${docker-java.version} - test - - - com.github.docker-java - docker-java-transport-httpclient5 - ${docker-java.version} - test - - - org.testcontainers - testcontainers - ${testcontainers.version} - test - - - org.testcontainers - junit-jupiter - ${testcontainers.version} - test - org.testcontainers k3s diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml index 663ab892..741e6e2c 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-catalog-watcher/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-kubernetes-client-discovery - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,15 +24,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml index 798afa00..a417c200 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml @@ -21,10 +21,6 @@ org.springframework.cloud spring-cloud-starter-bootstrap - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -33,39 +29,10 @@ org.springframework.boot spring-boot-starter-actuator - - io.kubernetes - client-java - - - io.kubernetes - client-java-extended - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - k3s - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml index 92534a7e..201ed51b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-configmap-test-app/pom.xml @@ -16,54 +16,15 @@ org.springframework.boot spring-boot-starter-test - test - - org.springframework.cloud - spring-cloud-kubernetes-test-support - test - - - io.kubernetes - client-java - test - - - io.kubernetes - client-java-extended - test - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test - - - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - k3s - test - - org.springframework.boot spring-boot-starter-webflux - test + + + + org.springframework.cloud + spring-cloud-kubernetes-test-support @@ -112,7 +73,4 @@ - - - diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml index 9fbfe5dd..bc192f4b 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-configmap-event-reload/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-starter-kubernetes-client-config - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,45 +24,14 @@ org.springframework.boot spring-boot-starter-actuator - org.springframework.cloud spring-cloud-starter-bootstrap - io.kubernetes - client-java - - - io.kubernetes - client-java-extended - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test - - - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - k3s - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml index 07666d06..4cb31ee4 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/pom.xml @@ -17,8 +17,8 @@ spring-cloud-kubernetes-client-discovery - org.springframework.cloud - spring-cloud-kubernetes-test-support + org.springframework.boot + spring-boot-starter-test org.springframework.boot @@ -28,15 +28,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml index c4ad1dc3..3a634df0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml @@ -11,16 +11,11 @@ spring-cloud-kubernetes-client-loadbalancer-it - org.springframework.cloud spring-cloud-starter-kubernetes-client-loadbalancer - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-web @@ -29,44 +24,14 @@ org.springframework.boot spring-boot-starter-actuator - - io.kubernetes - client-java - - - io.kubernetes - client-java-extended - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test - - org.springframework.boot spring-boot-starter-webflux - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - k3s - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml index d49deb8e..3b426f71 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discoveryclient-it/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-starter-kubernetes-client-all - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,39 +24,10 @@ org.springframework.boot spring-boot-starter-actuator - - io.kubernetes - client-java - - - io.kubernetes - client-java-extended - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - k3s - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml index 4805f4af..c2907ec0 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload-multiple-apps/spring-cloud-kubernetes-client-configuration-watcher-secrets-test-app/pom.xml @@ -16,54 +16,15 @@ org.springframework.boot spring-boot-starter-test - test - - org.springframework.cloud - spring-cloud-kubernetes-test-support - test - - - io.kubernetes - client-java - test - - - io.kubernetes - client-java-extended - test - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test - - - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - k3s - test - - org.springframework.boot spring-boot-starter-webflux - test + + + + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml index 947797b3..85aa6527 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-secrets-event-reload/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-starter-kubernetes-client-config - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,39 +24,10 @@ org.springframework.boot spring-boot-starter-actuator - - io.kubernetes - client-java - - - io.kubernetes - client-java-extended - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test - - org.testcontainers - testcontainers - test - - - org.testcontainers - junit-jupiter - test - - - org.testcontainers - k3s - test + org.springframework.cloud + spring-cloud-kubernetes-test-support 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 0cd3a21d..a7e77ba8 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 @@ -36,12 +36,6 @@ org.springframework.boot spring-boot-starter-test - test - - - org.springframework.cloud - spring-cloud-kubernetes-test-support - test com.github.tomakehurst @@ -56,41 +50,8 @@ - io.kubernetes - client-java - - - org.slf4j - slf4j-api - - - test - - - io.kubernetes - client-java-extended - - - com.github.docker-java - docker-java-core - test - - - org.slf4j - slf4j-api - - - - - com.github.docker-java - docker-java-transport-httpclient5 - test - - - org.slf4j - slf4j-api - - + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml index 98609f0a..cfc7073f 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-starter-kubernetes-client - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,23 +24,10 @@ org.springframework.boot spring-boot-starter-actuator + - io.kubernetes - client-java - - - io.kubernetes - client-java-extended - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml index 7e0a7be5..ff939a88 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-discoveryclient-it/pom.xml @@ -24,34 +24,17 @@ org.springframework.boot spring-boot-starter-actuator - - org.springframework.cloud - spring-cloud-kubernetes-test-support - - - io.kubernetes - client-java - - - io.kubernetes - client-java-extended - - - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test - org.springframework.boot spring-boot-starter-webflux test + + org.springframework.cloud + spring-cloud-kubernetes-test-support + + diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml index adf75d2f..941aa063 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-kubernetes-fabric8-discovery - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,15 +24,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml index 1e42ee3b..d1e7b360 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-event-reload/pom.xml @@ -17,10 +17,6 @@ org.springframework.cloud spring-cloud-kubernetes-fabric8-config - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -36,14 +32,8 @@ - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml index 792f2141..1e2fec84 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap-polling-reload/pom.xml @@ -17,10 +17,6 @@ org.springframework.cloud spring-cloud-kubernetes-fabric8-config - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -29,15 +25,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml index ece6e537..3ac5afce 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-configmap/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-starter-kubernetes-fabric8-all - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,15 +24,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml index 35b222b3..a92e6419 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery-with-bootstrap/pom.xml @@ -20,10 +20,6 @@ org.springframework.cloud spring-cloud-starter-bootstrap - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -32,15 +28,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml index 4d6ea092..8e559b60 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-kubernetes-fabric8-discovery - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,15 +24,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml index 3bdebfa7..45322d8e 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-loadbalancer/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-kubernetes-fabric8-loadbalancer - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,15 +24,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml index 474eb263..32145d86 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-secrets-event-reload/pom.xml @@ -17,10 +17,6 @@ org.springframework.cloud spring-cloud-kubernetes-fabric8-config - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -29,15 +25,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml index db6d95c3..d5cfe38d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-simple-core/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-starter-kubernetes-fabric8-all - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,15 +24,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml index 52288a43..92a9b8af 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-istio-it/pom.xml @@ -16,10 +16,6 @@ org.springframework.cloud spring-cloud-kubernetes-fabric8-istio - - org.springframework.cloud - spring-cloud-kubernetes-test-support - org.springframework.boot spring-boot-starter-webflux @@ -28,15 +24,10 @@ org.springframework.boot spring-boot-starter-actuator + - com.github.docker-java - docker-java-core - test - - - com.github.docker-java - docker-java-transport-httpclient5 - test + org.springframework.cloud + spring-cloud-kubernetes-test-support diff --git a/spring-cloud-kubernetes-test-support/pom.xml b/spring-cloud-kubernetes-test-support/pom.xml index 6ebdc918..c1b8dab9 100644 --- a/spring-cloud-kubernetes-test-support/pom.xml +++ b/spring-cloud-kubernetes-test-support/pom.xml @@ -13,20 +13,13 @@ 4.0.3 + 1.18.0 org.springframework.boot spring-boot-starter-test - - org.junit.vintage - junit-vintage-engine - - - io.kubernetes - client-java - io.kubernetes client-java-extended @@ -42,15 +35,10 @@ ${awaitility.version} - - org.testcontainers - testcontainers - 1.18.0 - org.testcontainers k3s - 1.18.0 + ${testcontainers.version}