From 7e550aa8ea2d55f8ee049adc4b071e65381656de Mon Sep 17 00:00:00 2001 From: Timon Borter Date: Wed, 18 Dec 2024 10:11:22 +0100 Subject: [PATCH] fix(deps): updated dependency versions noteable breaking change included: * `io.fabric8` from 6.13.4 to 7.0.1 --- .../kubernetes/KubernetesActorTest.java | 2 +- .../KubernetesServiceConfiguration.java | 2 +- .../kubernetes/xml/AbstractXmlActionTest.java | 2 +- .../yaml/AbstractYamlActionTest.java | 2 +- .../integration/KubernetesExecuteIT.xml | 2 +- .../integration/KubernetesSendReceiveIT.xml | 2 +- pom.xml | 20 +++++++++---------- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/KubernetesActorTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/KubernetesActorTest.java index efa7474318..f9d2fecb22 100644 --- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/KubernetesActorTest.java +++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/KubernetesActorTest.java @@ -22,7 +22,7 @@ import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.mockwebserver.Context; -import okhttp3.mockwebserver.MockWebServer; +import io.fabric8.mockwebserver.MockWebServer; import org.mockito.Mockito; import org.testng.Assert; import org.testng.annotations.AfterClass; diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesServiceConfiguration.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesServiceConfiguration.java index cb1cc17d6c..02cfb14f2a 100644 --- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesServiceConfiguration.java +++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesServiceConfiguration.java @@ -21,7 +21,7 @@ import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.mockwebserver.Context; -import okhttp3.mockwebserver.MockWebServer; +import io.fabric8.mockwebserver.MockWebServer; import org.citrusframework.container.SequenceAfterTest; import org.citrusframework.kubernetes.client.KubernetesClient; import org.citrusframework.kubernetes.client.KubernetesClientBuilder; diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/xml/AbstractXmlActionTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/xml/AbstractXmlActionTest.java index 9a97d65c5c..51184ec473 100644 --- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/xml/AbstractXmlActionTest.java +++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/xml/AbstractXmlActionTest.java @@ -22,7 +22,7 @@ import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.mockwebserver.Context; -import okhttp3.mockwebserver.MockWebServer; +import io.fabric8.mockwebserver.MockWebServer; import org.citrusframework.Citrus; import org.citrusframework.CitrusContext; import org.citrusframework.CitrusInstanceManager; diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/yaml/AbstractYamlActionTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/yaml/AbstractYamlActionTest.java index bb94768a7d..9ec99b436a 100644 --- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/yaml/AbstractYamlActionTest.java +++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/yaml/AbstractYamlActionTest.java @@ -22,7 +22,7 @@ import io.fabric8.kubernetes.client.server.mock.KubernetesCrudDispatcher; import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.mockwebserver.Context; -import okhttp3.mockwebserver.MockWebServer; +import io.fabric8.mockwebserver.MockWebServer; import org.citrusframework.Citrus; import org.citrusframework.CitrusContext; import org.citrusframework.CitrusInstanceManager; diff --git a/connectors/citrus-kubernetes/src/test/resources/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.xml b/connectors/citrus-kubernetes/src/test/resources/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.xml index 6b18f44fd1..86deafc9be 100644 --- a/connectors/citrus-kubernetes/src/test/resources/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.xml +++ b/connectors/citrus-kubernetes/src/test/resources/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.xml @@ -38,7 +38,7 @@ { "result": { - "clientVersion": "6.13.4", + "clientVersion": "7.0.1", "apiVersion": "${apiVersion}", "kind":"Info", "masterUrl": "@matches('http://(kubernetes\\.docker\\.internal|localhost):[0-9]+/')@", diff --git a/connectors/citrus-kubernetes/src/test/resources/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.xml b/connectors/citrus-kubernetes/src/test/resources/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.xml index 627900feb0..9f9bfc0d66 100644 --- a/connectors/citrus-kubernetes/src/test/resources/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.xml +++ b/connectors/citrus-kubernetes/src/test/resources/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.xml @@ -46,7 +46,7 @@ { "command": "info", "result": { - "clientVersion": "6.13.4", + "clientVersion": "7.0.1", "apiVersion": "${apiVersion}", "kind":"Info", "masterUrl": "@matches('http://(kubernetes\\.docker\\.internal|localhost):[0-9]+/')@", diff --git a/pom.xml b/pom.xml index 6e2ca91a97..507e5f4f93 100644 --- a/pom.xml +++ b/pom.xml @@ -195,9 +195,9 @@ 1.8.0 3.26.3 4.2.2 - 2.28.29 + 2.29.36 1.79 - 1.15.10 + 1.15.11 2.13.0 1.9.0 1.17.1 @@ -206,7 +206,7 @@ 1.3.4 3.11.1 7.20.1 - 3.4.0 + 3.4.1 4.2.29 1.2.0 3.0.23 @@ -236,14 +236,14 @@ 1.5.4 2.5.1 r938 - 5.11.3 - 1.11.3 + 5.11.4 + 1.11.4 4.13.2 2.10.1 - 6.13.4 + 7.0.1 6.13.4 3.9.0 - 6.13.4 + 7.0.1 2.23.1 5.14.2 3.2.0 @@ -251,15 +251,15 @@ 4.12.0 4.7.6 42.7.4 - 3.17.0 + 3.17.4 3.0.4 4.27.0 2.0.11 1.1.10.7 2.3 - 6.2.0 + 6.2.1 4.0.11 - 6.4.0 + 6.4.1 3.0.3 2.14.0 1.6.9