From 79c1871eb3b4d0ed9daa4699162db207659756c9 Mon Sep 17 00:00:00 2001 From: erabii Date: Wed, 30 Nov 2022 20:37:23 +0200 Subject: [PATCH] fix wiremock dependency (#1153) --- .../composites/build-controllers-project/action.yaml | 2 +- .../spring-cloud-kubernetes-configuration-watcher/pom.xml | 5 +++-- .../kubernetes/fabric8/catalog/watch/CatalogWatchIT.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/composites/build-controllers-project/action.yaml b/.github/workflows/composites/build-controllers-project/action.yaml index 0b11f0a4..307451c8 100644 --- a/.github/workflows/composites/build-controllers-project/action.yaml +++ b/.github/workflows/composites/build-controllers-project/action.yaml @@ -7,5 +7,5 @@ runs: shell: bash run: | cd spring-cloud-kubernetes-controllers - .././mvnw -T 1C clean install + .././mvnw -T 1C -U clean install cd .. diff --git a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml index 938f28b3..19a4f8b0 100644 --- a/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml +++ b/spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml @@ -51,10 +51,11 @@ - org.springframework.cloud - spring-cloud-starter-contract-stub-runner + com.github.tomakehurst + wiremock-jre8-standalone test + io.projectreactor reactor-test diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java index b41ab369..7cb38816 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java +++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/CatalogWatchIT.java @@ -59,7 +59,7 @@ class CatalogWatchIT { private static final String NAMESPACE = "default"; private static final K3sContainer K3S = Commons.container() - .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(CatalogWatchIT.class))); + .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(CatalogWatchIT.class))); private static KubernetesClient client;