From f1e920b2185dd71eab6b61f734c1197123c55076 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 10:13:27 +0000 Subject: [PATCH 1/4] Update SNAPSHOT to 2.2.6.RELEASE --- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 2 ++ pom.xml | 4 ++-- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ecf1b8c0..2abeec39 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 595be92b..41049713 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -8,6 +8,7 @@ |spring.cloud.config.fail-fast | false | Flag to indicate that failure to connect to the server is fatal (default false). |spring.cloud.config.headers | | Additional headers used to create the client request. |spring.cloud.config.label | | The label name to use to pull remote configuration properties. The default is set on the server (generally "master" for a git based server). +|spring.cloud.config.media-type | | The Accept header media type to send to config server. |spring.cloud.config.name | | Name of application used to fetch remote properties. |spring.cloud.config.override-none | false | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. |spring.cloud.config.override-system-properties | true | Flag to indicate that the external properties should override system properties. Default true. @@ -20,6 +21,7 @@ |spring.cloud.config.retry.max-interval | 2000 | Maximum interval for backoff. |spring.cloud.config.retry.multiplier | 1.1 | Multiplier for next interval. |spring.cloud.config.send-state | true | Flag to indicate whether to send state. Default true. +|spring.cloud.config.tls | | TLS properties. |spring.cloud.config.token | | Security Token passed thru to underlying environment repository. |spring.cloud.config.uri | [http://localhost:8888] | The URI of the remote server (default http://localhost:8888). |spring.cloud.config.username | | The username to use (HTTP Basic) when contacting the remote server. diff --git a/pom.xml b/pom.xml index a0ff739a..bc0f3948 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE pom Spring Cloud Config Spring Cloud Config @@ -27,7 +27,7 @@ config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE 1.11.52 v1-rev20191010-1.30.3 true diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 623da164..8f25ec23 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index a3d3bec0..0a7eba5b 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 5262d38e..c1243950 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-config-dependencies - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index ce01bd9d..e09bc8b1 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index c6f1d5d1..2221914b 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 87c986e3..b3d9765e 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index c3d296c5..de511f30 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE spring-cloud-starter-config - 2.2.6.BUILD-SNAPSHOT + 2.2.6.RELEASE spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 209e8c5bba52e87015d89b707ac45e0683088ff1 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 10:16:15 +0000 Subject: [PATCH 2/4] Going back to snapshots --- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 2 -- pom.xml | 4 ++-- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 10 files changed, 12 insertions(+), 14 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 2abeec39..ecf1b8c0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT .. diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 41049713..595be92b 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -8,7 +8,6 @@ |spring.cloud.config.fail-fast | false | Flag to indicate that failure to connect to the server is fatal (default false). |spring.cloud.config.headers | | Additional headers used to create the client request. |spring.cloud.config.label | | The label name to use to pull remote configuration properties. The default is set on the server (generally "master" for a git based server). -|spring.cloud.config.media-type | | The Accept header media type to send to config server. |spring.cloud.config.name | | Name of application used to fetch remote properties. |spring.cloud.config.override-none | false | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. |spring.cloud.config.override-system-properties | true | Flag to indicate that the external properties should override system properties. Default true. @@ -21,7 +20,6 @@ |spring.cloud.config.retry.max-interval | 2000 | Maximum interval for backoff. |spring.cloud.config.retry.multiplier | 1.1 | Multiplier for next interval. |spring.cloud.config.send-state | true | Flag to indicate whether to send state. Default true. -|spring.cloud.config.tls | | TLS properties. |spring.cloud.config.token | | Security Token passed thru to underlying environment repository. |spring.cloud.config.uri | [http://localhost:8888] | The URI of the remote server (default http://localhost:8888). |spring.cloud.config.username | | The username to use (HTTP Basic) when contacting the remote server. diff --git a/pom.xml b/pom.xml index bc0f3948..a0ff739a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -27,7 +27,7 @@ config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT 1.11.52 v1-rev20191010-1.30.3 true diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 8f25ec23..623da164 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 0a7eba5b..a3d3bec0 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index c1243950..5262d38e 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-config-dependencies - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index e09bc8b1..ce01bd9d 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 2221914b..c6f1d5d1 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index b3d9765e..87c986e3 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index de511f30..c3d296c5 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT spring-cloud-starter-config - 2.2.6.RELEASE + 2.2.6.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 0e0f519570c80154aa7ec8865cdca36d81a3dd2c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 9 Nov 2020 10:16:15 +0000 Subject: [PATCH 3/4] Bumping versions to 2.2.7.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 4 ++-- spring-cloud-config-client-tls-tests/pom.xml | 2 +- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 2 +- spring-cloud-config-monitor/pom.xml | 2 +- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index ecf1b8c0..2d73da69 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index a0ff739a..635c2d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -27,7 +27,7 @@ config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT 1.11.52 v1-rev20191010-1.30.3 true diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 623da164..e3f65420 100644 --- a/spring-cloud-config-client-tls-tests/pom.xml +++ b/spring-cloud-config-client-tls-tests/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index a3d3bec0..6814034f 100644 --- a/spring-cloud-config-client/pom.xml +++ b/spring-cloud-config-client/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 5262d38e..370adf47 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-config-dependencies - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT pom spring-cloud-config-dependencies Spring Cloud Config Dependencies diff --git a/spring-cloud-config-monitor/pom.xml b/spring-cloud-config-monitor/pom.xml index ce01bd9d..9690933c 100644 --- a/spring-cloud-config-monitor/pom.xml +++ b/spring-cloud-config-monitor/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index c6f1d5d1..1e802f4a 100644 --- a/spring-cloud-config-sample/pom.xml +++ b/spring-cloud-config-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 87c986e3..c174798a 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index c3d296c5..6f6d4626 100644 --- a/spring-cloud-starter-config/pom.xml +++ b/spring-cloud-starter-config/pom.xml @@ -6,10 +6,10 @@ org.springframework.cloud spring-cloud-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT spring-cloud-starter-config - 2.2.6.BUILD-SNAPSHOT + 2.2.7.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From bf2c61f72220b7c5df0df658da7bd353af8eb915 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Tue, 10 Nov 2020 09:34:11 -0800 Subject: [PATCH 4/4] Do not discard the root exception when things go wrong The root exception can detail an important root cause. For example with native-images it can indicate a flag you need to set for the native-image to compile correctly: Caused by: java.net.MalformedURLException: Accessing an URL protocol that was not enabled. The URL protocol http is supported but not enabled by default. It must be enabled by adding the -H:EnableURLProtocols=http option to the native-image command. --- .../cloud/config/client/ConfigClientProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java index fbc10ac6..147a8af8 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java @@ -336,7 +336,7 @@ public class ConfigClientProperties { return result; } catch (MalformedURLException e) { - throw new IllegalStateException("Invalid URL: " + uri); + throw new IllegalStateException("Invalid URL: " + uri, e); } }