From 0c0aa00e2d3be6bec6bfab97e6be5c7ee32fcec7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 16 Mar 2021 16:05:38 +0000 Subject: [PATCH] Bumping versions --- docs/src/main/asciidoc/_configprops.adoc | 1 + .../cloud/bootstrap/encrypt/EncryptionIntegrationTests.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index d980b3e2..c0dbefa4 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -6,6 +6,7 @@ |spring.cloud.config.allow-override | `true` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true. |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. +|spring.cloud.decrypt-environment-post-processor.enabled | `true` | Enable the DecryptEnvironmentPostProcessor. |spring.cloud.discovery.client.composite-indicator.enabled | `true` | Enables discovery client composite health indicator. |spring.cloud.discovery.client.health-indicator.enabled | `true` | |spring.cloud.discovery.client.health-indicator.include-description | `false` | diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java index 8b3d2a33..a53170aa 100644 --- a/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java +++ b/spring-cloud-context/src/test/java/org/springframework/cloud/bootstrap/encrypt/EncryptionIntegrationTests.java @@ -101,7 +101,8 @@ public class EncryptionIntegrationTests { @Test public void decryptEnvironmentPostProcessorDisabled() { ConfigurableApplicationContext context = new SpringApplicationBuilder(TestAutoConfiguration.class) - .web(WebApplicationType.NONE).properties("spring.config.use-legacy-processing=false", "encrypt.key:pie", + .web(WebApplicationType.NONE) + .properties("spring.config.use-legacy-processing=false", "encrypt.key:pie", "spring.cloud.decrypt-environment-post-processor.enabled=false", "foo.password:{cipher}bf29452295df354e6153c5b31b03ef23c70e55fba24299aa85c63438f1c43c95") .run();