From 128ca4392a693d3a95369839b294491ecde079c4 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 19 Mar 2020 10:48:57 -0400 Subject: [PATCH 1/2] Bumps to build 2.3.0.BUILD-SNAPSHOT --- pom.xml | 2 +- spring-cloud-commons-dependencies/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7230f1f9..daf54fc1 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.2.4.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT diff --git a/spring-cloud-commons-dependencies/pom.xml b/spring-cloud-commons-dependencies/pom.xml index 552b4212..50d123db 100644 --- a/spring-cloud-commons-dependencies/pom.xml +++ b/spring-cloud-commons-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.4.BUILD-SNAPSHOT + 2.3.0.BUILD-SNAPSHOT spring-cloud-commons-dependencies From d5dc4465b2291075cddc2fb5f5509a6af5febe4a Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 20 Mar 2020 14:40:24 -0400 Subject: [PATCH 2/2] Ignores flaky test. See gh-1627 --- .../core/HealthCheckServiceInstanceListSupplierTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java index accd279d..2b3a84f7 100644 --- a/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java +++ b/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/HealthCheckServiceInstanceListSupplierTests.java @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.assertj.core.api.Assertions; import org.assertj.core.util.Lists; import org.awaitility.Awaitility; +import org.junit.Ignore; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -466,6 +467,7 @@ class HealthCheckServiceInstanceListSupplierTests { Assertions.assertThat(emitCounter).hasValue(1); } + @Ignore // Fixme: see https://github.com/spring-cloud/spring-cloud-gateway/issues/1627 @Test void shouldCancelSubscription() {