From 69b5d884851fecb7a1d372f5ad6dcd82cce07d75 Mon Sep 17 00:00:00 2001 From: Timon Borter <timon.borter@gmx.ch> 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 --- .../messaging/CreateSubscriptionAction.java | 2 +- .../integration/DeleteKnativeResourceIT.java | 4 +-- .../KnativeServiceConfiguration.java | 2 +- .../integration/VerifyKnativeBrokerIT.java | 2 +- .../knative/xml/AbstractXmlActionTest.java | 2 +- .../knative/xml/DeleteResourceTest.java | 4 +-- .../knative/xml/DeleteSubscriptionTest.java | 4 +-- .../knative/xml/VerifyBrokerTest.java | 2 +- .../knative/yaml/AbstractYamlActionTest.java | 2 +- .../knative/yaml/DeleteResourceTest.java | 4 +-- .../knative/yaml/DeleteSubscriptionTest.java | 4 +-- .../knative/yaml/VerifyBrokerTest.java | 2 +- .../kubernetes/client/KubernetesClient.java | 6 ++-- .../config/xml/K8sClientConfig.java | 29 +++++++++++++++++++ .../config/xml/KubernetesClientParser.java | 3 +- .../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 ++++++------- 22 files changed, 65 insertions(+), 39 deletions(-) create mode 100644 connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/K8sClientConfig.java diff --git a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateSubscriptionAction.java b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateSubscriptionAction.java index 48c9017526..48f40febb6 100644 --- a/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateSubscriptionAction.java +++ b/connectors/citrus-knative/src/main/java/org/citrusframework/knative/actions/messaging/CreateSubscriptionAction.java @@ -16,7 +16,7 @@ package org.citrusframework.knative.actions.messaging; -import io.fabric8.knative.internal.pkg.apis.duck.v1.KReferenceBuilder; +import io.fabric8.knative.duck.v1.KReferenceBuilder; import io.fabric8.knative.messaging.v1.Subscription; import io.fabric8.knative.messaging.v1.SubscriptionBuilder; import io.fabric8.kubernetes.client.dsl.Updatable; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/DeleteKnativeResourceIT.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/DeleteKnativeResourceIT.java index fe27562a16..6182c10381 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/DeleteKnativeResourceIT.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/DeleteKnativeResourceIT.java @@ -17,8 +17,8 @@ package org.citrusframework.knative.integration; import io.fabric8.knative.client.KnativeClient; -import io.fabric8.knative.internal.pkg.apis.duck.v1.DestinationBuilder; -import io.fabric8.knative.internal.pkg.apis.duck.v1.KReferenceBuilder; +import io.fabric8.knative.duck.v1.DestinationBuilder; +import io.fabric8.knative.duck.v1.KReferenceBuilder; import io.fabric8.knative.messaging.v1.Subscription; import io.fabric8.knative.messaging.v1.SubscriptionBuilder; import io.fabric8.kubernetes.client.KubernetesClient; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/KnativeServiceConfiguration.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/KnativeServiceConfiguration.java index 927e3f76cc..0aae689a49 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/KnativeServiceConfiguration.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/KnativeServiceConfiguration.java @@ -23,7 +23,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.endpoint.EndpointAdapter; import org.citrusframework.endpoint.adapter.StaticEndpointAdapter; import org.citrusframework.http.message.HttpMessage; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/VerifyKnativeBrokerIT.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/VerifyKnativeBrokerIT.java index 660fbe98ba..ef26522b95 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/VerifyKnativeBrokerIT.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/integration/VerifyKnativeBrokerIT.java @@ -19,7 +19,7 @@ import io.fabric8.knative.client.KnativeClient; import io.fabric8.knative.eventing.v1.Broker; import io.fabric8.knative.eventing.v1.BrokerBuilder; -import io.fabric8.knative.internal.pkg.apis.ConditionBuilder; +import io.fabric8.knative.pkg.apis.ConditionBuilder; import org.citrusframework.annotations.CitrusTest; import org.citrusframework.exceptions.ValidationException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/AbstractXmlActionTest.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/AbstractXmlActionTest.java index 5ed4dd191a..49b1bb2cde 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/AbstractXmlActionTest.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/AbstractXmlActionTest.java @@ -23,7 +23,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-knative/src/test/java/org/citrusframework/knative/xml/DeleteResourceTest.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/DeleteResourceTest.java index 94a24b7c64..c10fa43e5b 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/DeleteResourceTest.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/DeleteResourceTest.java @@ -16,8 +16,8 @@ package org.citrusframework.knative.xml; -import io.fabric8.knative.internal.pkg.apis.duck.v1.DestinationBuilder; -import io.fabric8.knative.internal.pkg.apis.duck.v1.KReferenceBuilder; +import io.fabric8.knative.duck.v1.DestinationBuilder; +import io.fabric8.knative.duck.v1.KReferenceBuilder; import io.fabric8.knative.messaging.v1.Subscription; import io.fabric8.knative.messaging.v1.SubscriptionBuilder; import org.citrusframework.TestCase; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/DeleteSubscriptionTest.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/DeleteSubscriptionTest.java index 99d860d12f..392cb5e74d 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/DeleteSubscriptionTest.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/DeleteSubscriptionTest.java @@ -16,8 +16,8 @@ package org.citrusframework.knative.xml; -import io.fabric8.knative.internal.pkg.apis.duck.v1.DestinationBuilder; -import io.fabric8.knative.internal.pkg.apis.duck.v1.KReferenceBuilder; +import io.fabric8.knative.duck.v1.DestinationBuilder; +import io.fabric8.knative.duck.v1.KReferenceBuilder; import io.fabric8.knative.messaging.v1.Subscription; import io.fabric8.knative.messaging.v1.SubscriptionBuilder; import org.citrusframework.TestCase; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/VerifyBrokerTest.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/VerifyBrokerTest.java index c4a9bba024..6658e8ed3b 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/VerifyBrokerTest.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/xml/VerifyBrokerTest.java @@ -18,7 +18,7 @@ import io.fabric8.knative.eventing.v1.Broker; import io.fabric8.knative.eventing.v1.BrokerBuilder; -import io.fabric8.knative.internal.pkg.apis.ConditionBuilder; +import io.fabric8.knative.pkg.apis.ConditionBuilder; import org.citrusframework.TestCase; import org.citrusframework.TestCaseMetaInfo; import org.citrusframework.knative.actions.eventing.VerifyBrokerAction; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/AbstractYamlActionTest.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/AbstractYamlActionTest.java index ab36315b5b..560cf08cd9 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/AbstractYamlActionTest.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/AbstractYamlActionTest.java @@ -23,7 +23,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-knative/src/test/java/org/citrusframework/knative/yaml/DeleteResourceTest.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/DeleteResourceTest.java index eecb2f67fb..f4cd4e14cd 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/DeleteResourceTest.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/DeleteResourceTest.java @@ -16,8 +16,8 @@ package org.citrusframework.knative.yaml; -import io.fabric8.knative.internal.pkg.apis.duck.v1.DestinationBuilder; -import io.fabric8.knative.internal.pkg.apis.duck.v1.KReferenceBuilder; +import io.fabric8.knative.duck.v1.DestinationBuilder; +import io.fabric8.knative.duck.v1.KReferenceBuilder; import io.fabric8.knative.messaging.v1.Subscription; import io.fabric8.knative.messaging.v1.SubscriptionBuilder; import org.citrusframework.TestCase; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/DeleteSubscriptionTest.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/DeleteSubscriptionTest.java index d3377b1089..67b03215fb 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/DeleteSubscriptionTest.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/DeleteSubscriptionTest.java @@ -16,8 +16,8 @@ package org.citrusframework.knative.yaml; -import io.fabric8.knative.internal.pkg.apis.duck.v1.DestinationBuilder; -import io.fabric8.knative.internal.pkg.apis.duck.v1.KReferenceBuilder; +import io.fabric8.knative.duck.v1.DestinationBuilder; +import io.fabric8.knative.duck.v1.KReferenceBuilder; import io.fabric8.knative.messaging.v1.Subscription; import io.fabric8.knative.messaging.v1.SubscriptionBuilder; import org.citrusframework.TestCase; diff --git a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/VerifyBrokerTest.java b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/VerifyBrokerTest.java index 36b8b36f5f..c654982c22 100644 --- a/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/VerifyBrokerTest.java +++ b/connectors/citrus-knative/src/test/java/org/citrusframework/knative/yaml/VerifyBrokerTest.java @@ -18,7 +18,7 @@ import io.fabric8.knative.eventing.v1.Broker; import io.fabric8.knative.eventing.v1.BrokerBuilder; -import io.fabric8.knative.internal.pkg.apis.ConditionBuilder; +import io.fabric8.knative.pkg.apis.ConditionBuilder; import org.citrusframework.TestCase; import org.citrusframework.TestCaseMetaInfo; import org.citrusframework.knative.actions.eventing.VerifyBrokerAction; diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClient.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClient.java index 45f60be9e3..e3c3210dbe 100644 --- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClient.java +++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClient.java @@ -71,14 +71,12 @@ public void send(Message message, TestContext context) { String correlationKey = getEndpointConfiguration().getCorrelator().getCorrelationKey(message); correlationManager.saveCorrelationKey(correlationKeyName, correlationKey, context); - if (logger.isDebugEnabled()) { - logger.debug("Sending Kubernetes request to: '" + getEndpointConfiguration().getKubernetesClientConfig().getMasterUrl() + "'"); - } + logger.debug("Sending Kubernetes request to: '{}'", getEndpointConfiguration().getKubernetesClientConfig().getMasterUrl()); KubernetesCommand<?, ?> command = getEndpointConfiguration().getMessageConverter().convertOutbound(message, getEndpointConfiguration(), context); command.execute(this, context); - logger.info("Kubernetes request was sent to endpoint: '" + getEndpointConfiguration().getKubernetesClientConfig().getMasterUrl() + "'"); + logger.info("Kubernetes request was sent to endpoint: '{}'", getEndpointConfiguration().getKubernetesClientConfig().getMasterUrl()); correlationManager.store(correlationKey, command); } diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/K8sClientConfig.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/K8sClientConfig.java new file mode 100644 index 0000000000..8450bf3dba --- /dev/null +++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/K8sClientConfig.java @@ -0,0 +1,29 @@ +/* + * Copyright the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.citrusframework.kubernetes.config.xml; + +import io.fabric8.kubernetes.client.Config; + +/** + * An extension of {@link Config}, but with a default constructor for initialization in Spring. + */ +public class K8sClientConfig extends Config { + + public K8sClientConfig() { + super(false); + } +} diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParser.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParser.java index a51d55a163..421a552caa 100644 --- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParser.java +++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParser.java @@ -16,7 +16,6 @@ package org.citrusframework.kubernetes.config.xml; -import io.fabric8.kubernetes.client.Config; import org.citrusframework.config.xml.AbstractEndpointParser; import org.citrusframework.endpoint.Endpoint; import org.citrusframework.endpoint.EndpointConfiguration; @@ -50,7 +49,7 @@ protected void parseEndpointConfiguration(BeanDefinitionBuilder endpointConfigur throw new IllegalArgumentException("Parameters not set correctly - check if either an oauthToke or password and username is set"); } - BeanDefinitionBuilder configBuilder = BeanDefinitionBuilder.genericBeanDefinition(Config.class); + BeanDefinitionBuilder configBuilder = BeanDefinitionBuilder.genericBeanDefinition(K8sClientConfig.class); setPropertyValue(configBuilder, element.getAttribute("url"), "masterUrl"); setPropertyValue(configBuilder, element.getAttribute("version"), "apiVersion"); setPropertyValue(configBuilder, username, "username"); 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 @@ <k8s:result> { "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 @@ <data>{ "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 @@ <ascii-table-version>1.8.0</ascii-table-version> <assertj.version>3.26.3</assertj.version> <awaitility.version>4.2.2</awaitility.version> - <aws-java-sdk2.version>2.28.29</aws-java-sdk2.version> + <aws-java-sdk2.version>2.29.36</aws-java-sdk2.version> <bouncycastle.version>1.79</bouncycastle.version> - <byte.buddy.version>1.15.10</byte.buddy.version> + <byte.buddy.version>1.15.11</byte.buddy.version> <commons.dbcp2.version>2.13.0</commons.dbcp2.version> <commons.cli.version>1.9.0</commons.cli.version> <commons.codec.version>1.17.1</commons.codec.version> @@ -206,7 +206,7 @@ <commons.logging.version>1.3.4</commons.logging.version> <commons.net.version>3.11.1</commons.net.version> <cucumber.version>7.20.1</cucumber.version> - <docker-java.version>3.4.0</docker-java.version> + <docker-java.version>3.4.1</docker-java.version> <dropwizard.metrics.version>4.2.29</dropwizard.metrics.version> <ftpserver.version>1.2.0</ftpserver.version> <groovy.version>3.0.23</groovy.version> @@ -236,14 +236,14 @@ <json-schema-validator.version>1.5.4</json-schema-validator.version> <json-smart.version>2.5.1</json-smart.version> <jtidy.version>r938</jtidy.version> - <junit.jupiter.version>5.11.3</junit.jupiter.version> - <junit.platform.version>1.11.3</junit.platform.version> + <junit.jupiter.version>5.11.4</junit.jupiter.version> + <junit.platform.version>1.11.4</junit.platform.version> <junit.version>4.13.2</junit.version> <junixsocket.version>2.10.1</junixsocket.version> - <k8s.client.version>6.13.4</k8s.client.version> + <k8s.client.version>7.0.1</k8s.client.version> <k8s.model.version>6.13.4</k8s.model.version> <kafka.version>3.9.0</kafka.version> - <knative-client.version>6.13.4</knative-client.version> + <knative-client.version>7.0.1</knative-client.version> <log4j2.version>2.23.1</log4j2.version> <mockito.version>5.14.2</mockito.version> <mockftpserver.version>3.2.0</mockftpserver.version> @@ -251,15 +251,15 @@ <okhttp.version>4.12.0</okhttp.version> <picoli-version>4.7.6</picoli-version> <postgresql.version>42.7.4</postgresql.version> - <quarkus.platform.version>3.17.0</quarkus.platform.version> + <quarkus.platform.version>3.17.4</quarkus.platform.version> <saaj.version>3.0.4</saaj.version> <selenium.version>4.27.0</selenium.version> <slf4j.version>2.0.11</slf4j.version> <snappy.version>1.1.10.7</snappy.version> <snakeyaml.version>2.3</snakeyaml.version> - <spring.version>6.2.0</spring.version> + <spring.version>6.2.1</spring.version> <spring.ws.version>4.0.11</spring.ws.version> - <spring.integration.version>6.4.0</spring.integration.version> + <spring.integration.version>6.4.1</spring.integration.version> <spring.restdocs.version>3.0.3</spring.restdocs.version> <sshd.version>2.14.0</sshd.version> <swagger.version>1.6.9</swagger.version>