From df94995acc18054b53816d058cc162174c707841 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Thu, 3 Apr 2025 17:53:38 +0000 Subject: [PATCH 1/5] Bumping versions --- .../KubernetesClientServiceInstanceMapperTests.java | 4 ++-- .../KubernetesClientServicesListSupplierTests.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java index b92f9a36..7cb664f8 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java @@ -117,8 +117,8 @@ class KubernetesClientServiceInstanceMapperTests { V1Service service = createService("database", "default", annotations, labels, servicePorts); KubernetesServiceInstance serviceInstance = mapper.map(service); Assertions.assertThat(serviceInstance).isNull(); - Assertions.assertThat(output.getOut()).contains( - "service : database does not have any ServicePort(s), will not consider it for load balancing"); + Assertions.assertThat(output.getOut()) + .contains("service : database does not have any ServicePort(s), will not consider it for load balancing"); } @Test diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java index d8158463..473a4f76 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java @@ -271,10 +271,10 @@ class KubernetesClientServicesListSupplierTests { services.add(serviceATestNamespace); StepVerifier.create(instances).expectNext(services).verifyComplete(); - Assertions.assertThat( - output.getOut()).contains("Error retrieving service with name service-a in namespace : no-service"); - Assertions.assertThat( - output.getOut()).contains("discovering services in selective namespaces : [default, no-service, test]"); + Assertions.assertThat(output.getOut()) + .contains("Error retrieving service with name service-a in namespace : no-service"); + Assertions.assertThat(output.getOut()) + .contains("discovering services in selective namespaces : [default, no-service, test]"); } } From a09d7671823f6ce86eed64881a2a170d4e0ebc73 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 4 Apr 2025 13:35:16 +0000 Subject: [PATCH 2/5] Bumping versions --- .../KubernetesClientServiceInstanceMapperTests.java | 4 ++-- .../KubernetesClientServicesListSupplierTests.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java index b92f9a36..7cb664f8 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServiceInstanceMapperTests.java @@ -117,8 +117,8 @@ class KubernetesClientServiceInstanceMapperTests { V1Service service = createService("database", "default", annotations, labels, servicePorts); KubernetesServiceInstance serviceInstance = mapper.map(service); Assertions.assertThat(serviceInstance).isNull(); - Assertions.assertThat(output.getOut()).contains( - "service : database does not have any ServicePort(s), will not consider it for load balancing"); + Assertions.assertThat(output.getOut()) + .contains("service : database does not have any ServicePort(s), will not consider it for load balancing"); } @Test diff --git a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java index d8158463..473a4f76 100644 --- a/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java +++ b/spring-cloud-kubernetes-client-loadbalancer/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/KubernetesClientServicesListSupplierTests.java @@ -271,10 +271,10 @@ class KubernetesClientServicesListSupplierTests { services.add(serviceATestNamespace); StepVerifier.create(instances).expectNext(services).verifyComplete(); - Assertions.assertThat( - output.getOut()).contains("Error retrieving service with name service-a in namespace : no-service"); - Assertions.assertThat( - output.getOut()).contains("discovering services in selective namespaces : [default, no-service, test]"); + Assertions.assertThat(output.getOut()) + .contains("Error retrieving service with name service-a in namespace : no-service"); + Assertions.assertThat(output.getOut()) + .contains("discovering services in selective namespaces : [default, no-service, test]"); } } From 003078c51ccbec69eda92674bc354fa5c2298661 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Sat, 5 Apr 2025 13:35:07 +0000 Subject: [PATCH 3/5] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c0f65af..aadd8fd0 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 4.8.1 4.2.2-SNAPSHOT - 4.2.2-SNAPSHOT + 4.2.3-SNAPSHOT 4.2.2-SNAPSHOT 4.2.2-SNAPSHOT From 9da15127b28712542efaeac5d15ebcbe9c73229f Mon Sep 17 00:00:00 2001 From: spring-builds Date: Sat, 5 Apr 2025 17:58:03 +0000 Subject: [PATCH 4/5] Bumping versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9a9c852..473fed23 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ failsafe-reports 4.1.6-SNAPSHOT - 4.1.6-SNAPSHOT + 4.1.7-SNAPSHOT 4.1.4-SNAPSHOT 4.1.6-SNAPSHOT From 74db41ce6968c518534d8cc4ee618d109b890293 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 11 Apr 2025 18:51:36 -0400 Subject: [PATCH 5/5] User Assert4J --- .../integration/tests/commons/native_client/Util.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index dccf593c..9a26d3e0 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -58,8 +58,9 @@ import org.testcontainers.k3s.K3sContainer; import org.springframework.cloud.kubernetes.integration.tests.commons.Images; import org.springframework.cloud.kubernetes.integration.tests.commons.Phase; +import static org.assertj.core.api.Fail.fail; import static org.awaitility.Awaitility.await; -import static org.junit.jupiter.api.Assertions.fail; + import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.loadImage; import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pomVersion; import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pullImage;