From e32db575b8d530df67599e5792b20610300a5ae5 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:40:48 +0000 Subject: [PATCH 1/8] Update SNAPSHOT to 3.1.4 --- 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 711257444..794bfce75 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.4-SNAPSHOT + 3.1.4 spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index a87e7d1dc..76e054ea2 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.4-SNAPSHOT + 3.1.4 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.4 @@ -21,8 +21,8 @@ netflix - 3.1.4-SNAPSHOT - 3.1.4-SNAPSHOT + 3.1.4 + 3.1.4 jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 08303e5de..d429c8d2f 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.4-SNAPSHOT + 3.1.4 spring-cloud-netflix-dependencies - 3.1.4-SNAPSHOT + 3.1.4 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 28bc4a579..0f43a0f0b 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.4-SNAPSHOT + 3.1.4 .. 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 74aec5f0d..621dbcb3d 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.4-SNAPSHOT + 3.1.4 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 18ffeddcb..0b7e99ac9 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.4-SNAPSHOT + 3.1.4 .. 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 b60244eb1..357f2f284 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.4-SNAPSHOT + 3.1.4 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 d51a1ef8f..2bb4712c0 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.4-SNAPSHOT + 3.1.4 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 695787a326fcc5a4a9792c167e3e33715a4bdcb2 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:42:41 +0000 Subject: [PATCH 2/8] 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 794bfce75..711257444 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.4 + 3.1.4-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index 76e054ea2..a87e7d1dc 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.4 + 3.1.4-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.4-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.4 - 3.1.4 + 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 d429c8d2f..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.4 + 3.1.4-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.4 + 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 0f43a0f0b..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.4 + 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 621dbcb3d..74aec5f0d 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.4 + 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 0b7e99ac9..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.4 + 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 357f2f284..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.4 + 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 2bb4712c0..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.4 + 3.1.4-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 4ba8c4ae53cc033579464a54c03f577cc0e91207 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 2 Sep 2022 23:42:42 +0000 Subject: [PATCH 3/8] Bumping versions to 3.1.5-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 711257444..b010b1181 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index a87e7d1dc..5a7f328ae 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.4-SNAPSHOT + 3.1.5-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.4-SNAPSHOT - 3.1.4-SNAPSHOT + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index 08303e5de..cb87c3465 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.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.4-SNAPSHOT + 3.1.5-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 28bc4a579..743ee7f4e 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.4-SNAPSHOT + 3.1.5-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 74aec5f0d..1123a47cb 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.4-SNAPSHOT + 3.1.5-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 18ffeddcb..5f9015b67 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.4-SNAPSHOT + 3.1.5-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 b60244eb1..c0137e75a 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.4-SNAPSHOT + 3.1.5-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 d51a1ef8f..cd352ce65 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.4-SNAPSHOT + 3.1.5-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From 97ee8144bece8f06e69759816e696eb68493c4c6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 20:16:46 +0000 Subject: [PATCH 4/8] Update SNAPSHOT to 3.1.4 --- 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 b010b1181..794bfce75 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.5-SNAPSHOT + 3.1.4 spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index 5a7f328ae..76e054ea2 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.5-SNAPSHOT + 3.1.4 pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.4 @@ -21,8 +21,8 @@ netflix - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT + 3.1.4 + 3.1.4 jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index cb87c3465..d429c8d2f 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.5-SNAPSHOT + 3.1.4 spring-cloud-netflix-dependencies - 3.1.5-SNAPSHOT + 3.1.4 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 743ee7f4e..0f43a0f0b 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.5-SNAPSHOT + 3.1.4 .. 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 1123a47cb..621dbcb3d 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.5-SNAPSHOT + 3.1.4 .. spring-cloud-netflix-eureka-client diff --git a/spring-cloud-netflix-eureka-server/pom.xml b/spring-cloud-netflix-eureka-server/pom.xml index 5f9015b67..0b7e99ac9 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.5-SNAPSHOT + 3.1.4 .. 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 c0137e75a..357f2f284 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.5-SNAPSHOT + 3.1.4 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 cd352ce65..2bb4712c0 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.5-SNAPSHOT + 3.1.4 spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From b467a2f462a11a4363ceb22b6aee708c8a072e31 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 6 Sep 2022 20:18:20 +0000 Subject: [PATCH 5/8] 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 794bfce75..b010b1181 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-netflix - 3.1.4 + 3.1.5-SNAPSHOT spring-cloud-netflix-docs jar diff --git a/pom.xml b/pom.xml index 76e054ea2..5a7f328ae 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.4 + 3.1.5-SNAPSHOT pom Spring Cloud Netflix Spring Cloud Netflix org.springframework.cloud spring-cloud-build - 3.1.4 + 3.1.5-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.4 - 3.1.4 + 3.1.5-SNAPSHOT + 3.1.5-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index d429c8d2f..cb87c3465 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.4 + 3.1.5-SNAPSHOT spring-cloud-netflix-dependencies - 3.1.4 + 3.1.5-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 0f43a0f0b..743ee7f4e 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.4 + 3.1.5-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 621dbcb3d..1123a47cb 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.4 + 3.1.5-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 0b7e99ac9..5f9015b67 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.4 + 3.1.5-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 357f2f284..c0137e75a 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.4 + 3.1.5-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 2bb4712c0..cd352ce65 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.4 + 3.1.5-SNAPSHOT spring-cloud-starter-netflix-eureka-server Spring Cloud Starter Netflix Eureka Server From c44426f5791acb32a6e0011cf97dc77e1a9a1318 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 29 Nov 2022 14:26:47 +0000 Subject: [PATCH 6/8] Bumping versions --- pom.xml | 6 +++--- spring-cloud-netflix-dependencies/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5a7f328ae..24272d991 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT @@ -21,8 +21,8 @@ netflix - 3.1.5-SNAPSHOT - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT + 3.1.6-SNAPSHOT jacoco diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml index cb87c3465..69c691562 100644 --- a/spring-cloud-netflix-dependencies/pom.xml +++ b/spring-cloud-netflix-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.5-SNAPSHOT + 3.1.6-SNAPSHOT spring-cloud-netflix-dependencies From 5844550f9a7cbf4945dc7b0faba06ae8507b311a Mon Sep 17 00:00:00 2001 From: G1 Date: Tue, 13 Dec 2022 20:21:57 +0900 Subject: [PATCH 7/8] feat: Adds RestTemplate default ConnectTimeout / ConnectRequestTimeout (#4148) --- .../main/asciidoc/spring-cloud-netflix.adoc | 13 +++ .../eureka/RestTemplateTimeoutProperties.java | 96 +++++++++++++++++++ ...coveryClientOptionalArgsConfiguration.java | 8 +- ...urekaClientHttpRequestFactorySupplier.java | 22 +++++ 4 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 08037e1c9..1f2e60d27 100755 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -112,6 +112,19 @@ NOTE: Because of a limitation in Eureka, it is not possible to support per-serve If you want to customize the RestTemplate used by the Eureka HTTP Client you may want to create a bean of `EurekaClientHttpRequestFactorySupplier` and provide your own logic for generating a `ClientHttpRequestFactory` instance. +All default timeout-related properties for RestTemplate used by the Eureka HTTP Client are set to infinite. Therefore, to specify the timeout values, you must specify the value directly with the properties in `eureka.client.rest-template-timeout`. (All timeout properties are in milliseconds.) + +.application.yml +[source,yaml] +---- +eureka: + client: + rest-template-timeout: + connect-timeout: 5000 + connect-request-timeout: 8000 + socket-timeout: 10000 +---- + === Status Page and Health Indicator The status page and health indicators for a Eureka instance default to `/info` and `/health` respectively, which are the default locations of useful endpoints in a Spring Boot Actuator application. diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java new file mode 100644 index 000000000..df04c295a --- /dev/null +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java @@ -0,0 +1,96 @@ +/* + * Copyright 2013-2022 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 + * + * https://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.springframework.cloud.netflix.eureka; + +import java.util.Objects; + +import org.apache.http.client.config.RequestConfig; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient; +import org.springframework.web.client.RestTemplate; + +/** + * Properties for configuring timeouts used in {@link RestTemplate} required by + * {@link RestTemplateEurekaHttpClient}. + * + * @author Jiwon Jeon + * @since 4.0.0 + */ +@ConfigurationProperties("eureka.client.rest-template-timeout") +public class RestTemplateTimeoutProperties { + + /** + * Default values are set to -1 according to {@link RequestConfig .DEFAULT}. + */ + private int connectTimeout = -1; + + private int connectRequestTimeout = -1; + + private int socketTimeout = -1; + + public int getConnectTimeout() { + return connectTimeout; + } + + public int getConnectRequestTimeout() { + return connectRequestTimeout; + } + + public int getSocketTimeout() { + return socketTimeout; + } + + public void setConnectTimeout(int connectTimeout) { + this.connectTimeout = connectTimeout; + } + + public void setConnectRequestTimeout(int connectRequestTimeout) { + this.connectRequestTimeout = connectRequestTimeout; + } + + public void setSocketTimeout(int socketTimeout) { + this.socketTimeout = socketTimeout; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + RestTemplateTimeoutProperties that = (RestTemplateTimeoutProperties) o; + + return connectTimeout == that.connectTimeout && connectRequestTimeout == that.connectRequestTimeout + && socketTimeout == that.socketTimeout; + } + + @Override + public int hashCode() { + return Objects.hash(connectTimeout, connectRequestTimeout, socketTimeout); + } + + @Override + public String toString() { + return "RestTemplateTimeoutProperties{" + ", connectTimeout=" + connectTimeout + ", connectRequestTimeout=" + + connectRequestTimeout + ", socketTimeout=" + socketTimeout + '}'; + } + +} diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java index 29c8cf5e2..42d689858 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java @@ -31,9 +31,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClas import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.SearchStrategy; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.configuration.SSLContextFactory; import org.springframework.cloud.configuration.TlsProperties; import org.springframework.cloud.netflix.eureka.MutableDiscoveryClientOptionalArgs; +import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties; import org.springframework.cloud.netflix.eureka.http.DefaultEurekaClientHttpRequestFactorySupplier; import org.springframework.cloud.netflix.eureka.http.EurekaClientHttpRequestFactorySupplier; import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs; @@ -46,6 +48,7 @@ import org.springframework.web.reactive.function.client.WebClient; * @author Daniel Lavoie */ @Configuration(proxyBeanMethods = false) +@EnableConfigurationProperties(RestTemplateTimeoutProperties.class) public class DiscoveryClientOptionalArgsConfiguration { protected static final Log logger = LogFactory.getLog(DiscoveryClientOptionalArgsConfiguration.class); @@ -75,8 +78,9 @@ public class DiscoveryClientOptionalArgsConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnClass(name = "org.springframework.web.client.RestTemplate") - EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier() { - return new DefaultEurekaClientHttpRequestFactorySupplier(); + EurekaClientHttpRequestFactorySupplier defaultEurekaClientHttpRequestFactorySupplier( + RestTemplateTimeoutProperties restTemplateTimeoutProperties) { + return new DefaultEurekaClientHttpRequestFactorySupplier(restTemplateTimeoutProperties); } @Bean diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java index 7762f14cc..ad3e40e9e 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java @@ -19,10 +19,12 @@ package org.springframework.cloud.netflix.eureka.http; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; +import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; +import org.springframework.cloud.netflix.eureka.RestTemplateTimeoutProperties; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; import org.springframework.lang.Nullable; @@ -36,6 +38,16 @@ import org.springframework.lang.Nullable; */ public class DefaultEurekaClientHttpRequestFactorySupplier implements EurekaClientHttpRequestFactorySupplier { + private final RestTemplateTimeoutProperties restTemplateTimeoutProperties; + + public DefaultEurekaClientHttpRequestFactorySupplier() { + this.restTemplateTimeoutProperties = new RestTemplateTimeoutProperties(); + } + + public DefaultEurekaClientHttpRequestFactorySupplier(RestTemplateTimeoutProperties restTemplateTimeoutProperties) { + this.restTemplateTimeoutProperties = restTemplateTimeoutProperties; + } + @Override public ClientHttpRequestFactory get(SSLContext sslContext, @Nullable HostnameVerifier hostnameVerifier) { HttpClientBuilder httpClientBuilder = HttpClients.custom(); @@ -45,10 +57,20 @@ public class DefaultEurekaClientHttpRequestFactorySupplier implements EurekaClie if (hostnameVerifier != null) { httpClientBuilder = httpClientBuilder.setSSLHostnameVerifier(hostnameVerifier); } + if (restTemplateTimeoutProperties != null) { + httpClientBuilder.setDefaultRequestConfig(buildRequestConfig()); + } + CloseableHttpClient httpClient = httpClientBuilder.build(); HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory(); requestFactory.setHttpClient(httpClient); return requestFactory; } + private RequestConfig buildRequestConfig() { + return RequestConfig.custom().setConnectTimeout(restTemplateTimeoutProperties.getConnectTimeout()) + .setConnectionRequestTimeout(restTemplateTimeoutProperties.getConnectRequestTimeout()) + .setSocketTimeout(restTemplateTimeoutProperties.getSocketTimeout()).build(); + } + } From 6fef357742f1dc9aaa7b0559e28edbeb0646a94b Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 13 Dec 2022 12:31:22 +0100 Subject: [PATCH 8/8] Fix javadocs. Add deprecation. --- .../cloud/netflix/eureka/RestTemplateTimeoutProperties.java | 2 +- .../http/DefaultEurekaClientHttpRequestFactorySupplier.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java index df04c295a..7bdf70d92 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/RestTemplateTimeoutProperties.java @@ -29,7 +29,7 @@ import org.springframework.web.client.RestTemplate; * {@link RestTemplateEurekaHttpClient}. * * @author Jiwon Jeon - * @since 4.0.0 + * @since 3.1.6 */ @ConfigurationProperties("eureka.client.rest-template-timeout") public class RestTemplateTimeoutProperties { diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java index ad3e40e9e..d65a64208 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/DefaultEurekaClientHttpRequestFactorySupplier.java @@ -34,12 +34,18 @@ import org.springframework.lang.Nullable; * {@link HttpClients}. * * @author Marcin Grzejszczak + * @author Jiwon Jeon * @since 3.0.0 */ public class DefaultEurekaClientHttpRequestFactorySupplier implements EurekaClientHttpRequestFactorySupplier { private final RestTemplateTimeoutProperties restTemplateTimeoutProperties; + /** + * @deprecated in favour of + * {@link DefaultEurekaClientHttpRequestFactorySupplier#DefaultEurekaClientHttpRequestFactorySupplier(RestTemplateTimeoutProperties)} + */ + @Deprecated public DefaultEurekaClientHttpRequestFactorySupplier() { this.restTemplateTimeoutProperties = new RestTemplateTimeoutProperties(); }