From 28f1848b8548f1aa16d67d84ade3a52532916baa Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 20 Apr 2022 13:05:58 +0200 Subject: [PATCH 01/16] Update runAcceptanceTests.sh --- scripts/runAcceptanceTests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index cbaea6bce..60186d417 100755 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -4,7 +4,7 @@ set -o errexit mkdir -p target -SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/main/runAcceptanceTests.sh" +SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/3.1.x/runAcceptanceTests.sh" AT_WHAT_TO_TEST="EUREKA" cd target From 96b10d40c30bedf671e802fab019082a8f9161bc Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 15:57:09 +0000 Subject: [PATCH 02/16] Update SNAPSHOT to 3.1.2 --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 172ee236c..e77b88d24 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index bbd709794..43d29426f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -21,8 +21,8 @@ netflix - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.2 + 3.1.2 jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 8d9fb5962..73a64d6cc 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-netflix-dependencies - 3.1.2-SNAPSHOT + 3.1.2 pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 5231756bb..a7763854d 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index ed99003da..b51bc4640 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index be319e1c2..0d24d63b3 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 7a0851448..df0a92488 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 098669baa..b5d4d5950 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 872d64494bd941924e1df231fbd83ace65a865ae Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 15:58:48 +0000 Subject: [PATCH 03/16] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e77b88d24..172ee236c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index 43d29426f..bbd709794 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.2 - 3.1.2 + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 73a64d6cc..8d9fb5962 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.2 + 3.1.2-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index a7763854d..5231756bb 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index b51bc4640..ed99003da 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 0d24d63b3..be319e1c2 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index df0a92488..7a0851448 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index b5d4d5950..098669baa 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 162b1c8a9be31a6113a41cd6b9a8d125e274cdf5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 26 Apr 2022 15:58:48 +0000 Subject: [PATCH 04/16] Bumping versions to 3.1.3-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 172ee236c..525e731a8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index bbd709794..b2d4848ea 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.3-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 8d9fb5962..aecfbc860 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 5231756bb..4e0d7b438 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index ed99003da..09533319f 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index be319e1c2..2b8c059b8 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 7a0851448..44b8280db 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 098669baa..0fd6af82e 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 719688f4c8c3c5a31fcfd04a3cddfb9fee4fe1b2 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 11:08:12 +0200 Subject: [PATCH 05/16] Revert "Bumping versions to 3.1.3-SNAPSHOT after release" This reverts commit 162b1c8a9be31a6113a41cd6b9a8d125e274cdf5. --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 525e731a8..172ee236c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index b2d4848ea..bbd709794 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.3-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index aecfbc860..8d9fb5962 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 4e0d7b438..5231756bb 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index 09533319f..ed99003da 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 2b8c059b8..be319e1c2 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 44b8280db..7a0851448 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 0fd6af82e..098669baa 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 4fda5b40b8cfb1981a760a1647733da59ad93b4e Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 11:08:15 +0200 Subject: [PATCH 06/16] Revert "Going back to snapshots" This reverts commit 872d64494bd941924e1df231fbd83ace65a865ae. --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 172ee236c..e77b88d24 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index bbd709794..43d29426f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -21,8 +21,8 @@ netflix - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.2 + 3.1.2 jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 8d9fb5962..73a64d6cc 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-netflix-dependencies - 3.1.2-SNAPSHOT + 3.1.2 pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 5231756bb..a7763854d 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index ed99003da..b51bc4640 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index be319e1c2..0d24d63b3 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 7a0851448..df0a92488 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 098669baa..b5d4d5950 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 4b5d0a0b8667cae42d82f8f07d190273a859e25a Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 27 Apr 2022 11:08:20 +0200 Subject: [PATCH 07/16] Revert "Update SNAPSHOT to 3.1.2" This reverts commit 96b10d40c30bedf671e802fab019082a8f9161bc. --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e77b88d24..172ee236c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index 43d29426f..bbd709794 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.2 - 3.1.2 + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 73a64d6cc..8d9fb5962 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.2 + 3.1.2-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index a7763854d..5231756bb 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index b51bc4640..ed99003da 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 0d24d63b3..be319e1c2 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index df0a92488..7a0851448 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index b5d4d5950..098669baa 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From b11c4c9b202021744020d1fc9454f6fdabd43c79 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:47:33 +0000 Subject: [PATCH 08/16] Update SNAPSHOT to 3.1.2 --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 172ee236c..e77b88d24 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index bbd709794..43d29426f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -21,8 +21,8 @@ netflix - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.2 + 3.1.2 jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 8d9fb5962..73a64d6cc 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-netflix-dependencies - 3.1.2-SNAPSHOT + 3.1.2 pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 5231756bb..a7763854d 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index ed99003da..b51bc4640 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index be319e1c2..0d24d63b3 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 7a0851448..df0a92488 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 098669baa..b5d4d5950 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.2 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From cb3cc3234fbba9820bc2d9832b99197614db92ab Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:49:15 +0000 Subject: [PATCH 09/16] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e77b88d24..172ee236c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index 43d29426f..bbd709794 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.2 - 3.1.2 + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 73a64d6cc..8d9fb5962 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.2 + 3.1.2-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index a7763854d..5231756bb 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index b51bc4640..ed99003da 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 0d24d63b3..be319e1c2 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index df0a92488..7a0851448 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index b5d4d5950..098669baa 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2 + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 2b51d15d87354a172ea70351d32ff2a5fdd34fe5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 10:49:16 +0000 Subject: [PATCH 10/16] Bumping versions to 3.1.3-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 172ee236c..525e731a8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index bbd709794..de04910ee 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.2 @@ -21,8 +21,8 @@ netflix - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.3-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 8d9fb5962..aecfbc860 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 5231756bb..4e0d7b438 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index ed99003da..09533319f 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index be319e1c2..2b8c059b8 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 7a0851448..44b8280db 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 098669baa..0fd6af82e 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From a06f6e98bd9efc3bf50b7d5b07478afb1750f42d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 27 Apr 2022 14:26:45 +0000 Subject: [PATCH 11/16] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 525e731a8..172ee236c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index de04910ee..bbd709794 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2 + 3.1.2-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.3-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT + 3.1.2-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index aecfbc860..8d9fb5962 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 4e0d7b438..5231756bb 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index 09533319f..ed99003da 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 2b8c059b8..be319e1c2 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 44b8280db..7a0851448 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 0fd6af82e..098669baa 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 2899b42107162d66480e52d7cda377b4065b4973 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 28 Apr 2022 14:26:35 +0000 Subject: [PATCH 12/16] Bumping versions --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 172ee236c..525e731a8 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index bbd709794..b2d4848ea 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.2-SNAPSHOT - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT + 3.1.3-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 8d9fb5962..aecfbc860 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 5231756bb..4e0d7b438 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index ed99003da..09533319f 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index be319e1c2..2b8c059b8 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 7a0851448..44b8280db 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 098669baa..0fd6af82e 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.2-SNAPSHOT + 3.1.3-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 6548e0dab66085ba2f9f62cc007d9f982f526e03 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Thu, 26 May 2022 12:06:17 -0400 Subject: [PATCH 13/16] don't upload docs to maven central --- docs/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pom.xml b/docs/pom.xml index 525e731a8..2bdbaed67 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -18,6 +18,8 @@ .*.eureka.* deploy + + none From e5a52ee5ac3aef00c86aa41f1d841b755a5c8877 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 26 May 2022 20:20:57 +0000 Subject: [PATCH 14/16] Update SNAPSHOT to 3.1.3 --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2bdbaed67..682300ed3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index b2d4848ea..56552b2f8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.3 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.3-SNAPSHOT + 3.1.3 @@ -21,8 +21,8 @@ netflix - 3.1.3-SNAPSHOT - 3.1.3-SNAPSHOT + 3.1.3 + 3.1.3 jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index aecfbc860..0c02d5afd 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-netflix-dependencies - 3.1.3-SNAPSHOT + 3.1.3 pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index 4e0d7b438..d1b404c0f 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index 09533319f..efcbaa74e 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 2b8c059b8..fa604eecc 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.3 .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index 44b8280db..cd9f9af23 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 0fd6af82e..9fc8781a3 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3-SNAPSHOT + 3.1.3 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 9b6b0aba4e4932c553a4d1e10ff5d7dd7febdcee Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 27 May 2022 13:32:52 -0400 Subject: [PATCH 15/16] Bumps to next snapshot version --- docs/pom.xml | 2 +- pom.xml | 8 ++++---- spring-cloud-netflix-dependencies/pom.xml | 4 ++-- spring-cloud-netflix-eureka-client-tls-tests/pom.xml | 2 +- spring-cloud-netflix-eureka-client/pom.xml | 2 +- spring-cloud-netflix-eureka-server/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-client/pom.xml | 2 +- spring-cloud-starter-netflix-eureka-server/pom.xml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 682300ed3..711257444 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index 56552b2f8..48a2c43c4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-netflix - 3.1.3 + 3.1.4-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.3 + 3.1.4-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.3 - 3.1.3 + 3.1.4-SNAPSHOT + 3.1.4-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 0c02d5afd..08303e5de 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.3 + 3.1.4-SNAPSHOT pom spring-cloud-netflix-dependencies Spring Cloud Netflix Dependencies diff --git a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml index d1b404c0f..28bc4a579 100644 --- a/spring-cloud-netflix-eureka-client-tls-tests/pom.xml +++ b/spring-cloud-netflix-eureka-client-tls-tests/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3 + 3.1.4-SNAPSHOT .. spring-cloud-netflix-eureka-client-tls-tests diff --git a/spring-cloud-netflix-eureka-client/pom.xml b/spring-cloud-netflix-eureka-client/pom.xml index efcbaa74e..4cc0d3545 100644 --- a/spring-cloud-netflix-eureka-client/pom.xml +++ b/spring-cloud-netflix-eureka-client/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3 + 3.1.4-SNAPSHOT .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index fa604eecc..18ffeddcb 100644 --- a/spring-cloud-netflix-eureka-server/pom.xml +++ b/spring-cloud-netflix-eureka-server/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3 + 3.1.4-SNAPSHOT .. spring-cloud-netflix-eureka-server diff --git a/spring-cloud-starter-netflix-eureka-client/pom.xml b/spring-cloud-starter-netflix-eureka-client/pom.xml index cd9f9af23..b60244eb1 100644 --- a/spring-cloud-starter-netflix-eureka-client/pom.xml +++ b/spring-cloud-starter-netflix-eureka-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-starter-netflix-eureka-client Spring Cloud Starter Netflix Eureka Client diff --git a/spring-cloud-starter-netflix-eureka-server/pom.xml b/spring-cloud-starter-netflix-eureka-server/pom.xml index 9fc8781a3..d51a1ef8f 100644 --- a/spring-cloud-starter-netflix-eureka-server/pom.xml +++ b/spring-cloud-starter-netflix-eureka-server/pom.xml @@ -3,7 +3,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.3 + 3.1.4-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From ec903900c94e7e8aa29eb58dad1e632cd021b9b4 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Fri, 3 Jun 2022 16:03:21 -0400 Subject: [PATCH 16/16] Return empty list in bootstraper when discovery client disabled. (#4099) --- .../EurekaConfigServerBootstrapper.java | 8 +++-- .../EurekaConfigServerBootstrapperTests.java | 36 ++++++++++++++++--- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java index cee3b550d..9f94cf20e 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapper.java @@ -16,6 +16,8 @@ package org.springframework.cloud.netflix.eureka.config; +import java.util.Collections; + import com.netflix.discovery.shared.transport.EurekaHttpClient; import org.springframework.boot.BootstrapRegistry; @@ -50,7 +52,7 @@ public class EurekaConfigServerBootstrapper implements BootstrapRegistryInitiali registry.registerIfAbsent(ConfigServerInstanceProvider.Function.class, context -> { Binder binder = context.get(Binder.class); if (!getDiscoveryEnabled(binder)) { - return null; + return (id) -> Collections.emptyList(); } EurekaClientConfigBean config = context.get(EurekaClientConfigBean.class); EurekaHttpClient httpClient = new RestTemplateTransportClientFactory( @@ -63,7 +65,9 @@ public class EurekaConfigServerBootstrapper implements BootstrapRegistryInitiali } private Boolean getDiscoveryEnabled(Binder binder) { - return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false); + return binder.bind(ConfigClientProperties.CONFIG_DISCOVERY_ENABLED, Boolean.class).orElse(false) + && binder.bind("eureka.client.enabled", Boolean.class).orElse(true) + && binder.bind("spring.cloud.discovery.enabled", Boolean.class).orElse(true); } } diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperTests.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperTests.java index bd8cebb5a..3d3cac079 100644 --- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperTests.java +++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaConfigServerBootstrapperTests.java @@ -22,20 +22,45 @@ import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.config.client.ConfigServerInstanceProvider; +import org.springframework.web.client.ResourceAccessException; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; class EurekaConfigServerBootstrapperTests { @Test - void notEnabledDoesNotAddInstanceProviderFn() { + void notEnabledReturnsEmptyList() { new SpringApplicationBuilder(TestConfig.class) .properties("spring.cloud.service-registry.auto-registration.enabled=false") .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); - assertThat(providerFn).as("ConfigServerInstanceProvider.Function was created when it shouldn't") - .isNull(); + assertThat(providerFn.apply("id")).as("Should return empty list").isEmpty(); + })).run().close(); + } + + @Test + public void discoveryClientNotEnabledProvidesEmptyList() { + new SpringApplicationBuilder(TestConfig.class) + .properties("spring.cloud.config.discovery.enabled=true", "spring.cloud.discovery.enabled=false", + "spring.cloud.service-registry.auto-registration.enabled=false") + .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { + ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() + .get(ConfigServerInstanceProvider.Function.class); + assertThat(providerFn.apply("id")).as("Should return empty list").isEmpty(); + })).run().close(); + } + + @Test + public void eurekaClientNotEnabledProvidesEmptyList() { + new SpringApplicationBuilder(TestConfig.class) + .properties("spring.cloud.config.discovery.enabled=true", "eureka.client.enabled=false", + "spring.cloud.service-registry.auto-registration.enabled=false") + .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { + ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() + .get(ConfigServerInstanceProvider.Function.class); + assertThat(providerFn.apply("id")).as("Should return empty list").isEmpty(); })).run().close(); } @@ -47,8 +72,9 @@ class EurekaConfigServerBootstrapperTests { .addBootstrapRegistryInitializer(registry -> registry.addCloseListener(event -> { ConfigServerInstanceProvider.Function providerFn = event.getBootstrapContext() .get(ConfigServerInstanceProvider.Function.class); - assertThat(providerFn).as("ConfigServerInstanceProvider.Function was not created when it should.") - .isNotNull(); + assertThatThrownBy(() -> providerFn.apply("id")).isInstanceOf(ResourceAccessException.class) + .hasMessageContaining("I/O error on GET request for \"http://localhost:8761/eureka/apps/\"") + .as("Should have tried to connect to Eureka to fetch instances."); })).run().close(); }