Skip to content

Commit

Permalink
fix(deps): updated dependency versions
Browse files Browse the repository at this point in the history
noteable breaking change included:

* `io.fabric8` from 6.13.4 to 7.0.1
  • Loading branch information
bbortt committed Dec 19, 2024
1 parent 47cf011 commit 69b5d88
Show file tree
Hide file tree
Showing 22 changed files with 65 additions and 39 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]+/')@",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]+/')@",
Expand Down
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -236,30 +236,30 @@
<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>
<netty.version>4.1.105.Final</netty.version>
<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>
Expand Down

0 comments on commit 69b5d88

Please sign in to comment.