From 841038f684becd961fc5d625f45ccf08caa4ed5d Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sat, 16 May 2020 00:36:24 +0200 Subject: [PATCH 1/7] Adds property to disable JdbcEnvironmentRepository - Add "enabled" property to JdbcEnvironmentProperties - Make JdbcEnvironmentRepository configuration depending on new property - Add integration test to verify the new property Fixes gh-1605 Fixes gh-1623 --- .../main/asciidoc/spring-cloud-config.adoc | 2 + .../EnvironmentRepositoryConfiguration.java | 4 + .../JdbcEnvironmentProperties.java | 14 +++ ...vironmentRepositoryConfigurationTests.java | 85 +++++++++++++++++++ 4 files changed, 105 insertions(+) create mode 100644 spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryConfigurationTests.java diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index 11cdba68..c5408264 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -804,6 +804,8 @@ You can enable this feature by adding `spring-jdbc` to the classpath and using t If you include the right dependencies on the classpath (see the user guide for more details on that), Spring Boot configures a data source. // TODO Which user guide? When we know that, we should add a link to it. +You can disable autoconfiguration for `JdbcEnvironmentRepository` by setting the `spring.cloud.config.server.jdbc.enabled` property to `false`. + The database needs to have a table called `PROPERTIES` with columns called `APPLICATION`, `PROFILE`, and `LABEL` (with the usual `Environment` meaning), plus `KEY` and `VALUE` for the key and value pairs in `Properties` style. All fields are of type String in Java, so you can make them `VARCHAR` of whatever length you need. Property values behave in the same way as they would if they came from Spring Boot properties files named `{application}-{profile}.properties`, including all the encryption and decryption, which will be applied as post-processing steps (that is, not in the repository implementation directly). diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java index 63bd7782..b70209bf 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java @@ -253,6 +253,8 @@ public class EnvironmentRepositoryConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass(JdbcTemplate.class) + @ConditionalOnProperty(value = "spring.cloud.config.server.jdbc.enabled", + matchIfMissing = true) static class JdbcFactoryConfig { @Bean @@ -408,6 +410,8 @@ class CredhubRepositoryConfiguration { @Configuration(proxyBeanMethods = false) @Profile("jdbc") @ConditionalOnClass(JdbcTemplate.class) +@ConditionalOnProperty(value = "spring.cloud.config.server.jdbc.enabled", + matchIfMissing = true) class JdbcRepositoryConfiguration { @Bean diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java index f078f8b6..61e34459 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentProperties.java @@ -22,6 +22,7 @@ import org.springframework.core.Ordered; /** * @author Dylan Roberts + * @author Thomas Vitale */ @ConfigurationProperties("spring.cloud.config.server.jdbc") public class JdbcEnvironmentProperties implements EnvironmentRepositoryProperties { @@ -29,11 +30,24 @@ public class JdbcEnvironmentProperties implements EnvironmentRepositoryPropertie private static final String DEFAULT_SQL = "SELECT KEY, VALUE from PROPERTIES" + " where APPLICATION=? and PROFILE=? and LABEL=?"; + /** + * Flag to indicate that JDBC environment repository configuration is enabled. + */ + private boolean enabled = true; + private int order = Ordered.LOWEST_PRECEDENCE - 10; /** SQL used to query database for keys and values. */ private String sql = DEFAULT_SQL; + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public int getOrder() { return this.order; } diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryConfigurationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryConfigurationTests.java new file mode 100644 index 00000000..6e1eeb45 --- /dev/null +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/JdbcEnvironmentRepositoryConfigurationTests.java @@ -0,0 +1,85 @@ +/* + * Copyright 2016-2020 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.config.server.environment; + +import java.io.IOException; + +import org.junit.Test; + +import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext; +import org.springframework.boot.test.context.runner.ContextConsumer; +import org.springframework.boot.test.context.runner.WebApplicationContextRunner; +import org.springframework.cloud.config.server.ConfigServerApplication; +import org.springframework.cloud.config.server.test.ConfigServerTestUtils; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests to verify JdbcEnvironmentRepository configuration. + * + * @author Thomas Vitale + */ +public class JdbcEnvironmentRepositoryConfigurationTests { + + @Test + public void jdbcEnvironmentRepositoryBeansConfiguredWhenDefault() throws IOException { + new WebApplicationContextRunner() + .withUserConfiguration(ConfigServerApplication.class) + .withPropertyValues("spring.profiles.active=test,jdbc", + "spring.main.web-application-type=none") + .run(context -> { + assertThat(context) + .hasSingleBean(JdbcEnvironmentRepositoryFactory.class); + assertThat(context).hasSingleBean(JdbcEnvironmentRepository.class); + }); + } + + @Test + public void jdbcEnvironmentRepositoryBeansConfiguredWhenEnabled() throws IOException { + getApplicationContextWithJdbcEnabled(true, context -> { + assertThat(context).hasSingleBean(JdbcEnvironmentRepositoryFactory.class); + assertThat(context).hasSingleBean(JdbcEnvironmentRepository.class); + }); + } + + @Test + public void jdbcEnvironmentRepositoryFactoryNotConfiguredWhenDisabled() + throws IOException { + getApplicationContextWithJdbcEnabled(false, context -> assertThat(context) + .doesNotHaveBean(JdbcEnvironmentRepositoryFactory.class)); + } + + @Test + public void jdbcEnvironmentRepositoryNotConfiguredWhenDisabled() throws IOException { + getApplicationContextWithJdbcEnabled(false, context -> assertThat(context) + .doesNotHaveBean(JdbcEnvironmentRepository.class)); + } + + private void getApplicationContextWithJdbcEnabled(boolean jdbcEnabled, + ContextConsumer consumer) + throws IOException { + String uri = ConfigServerTestUtils.prepareLocalRepo(); + new WebApplicationContextRunner() + .withUserConfiguration(ConfigServerApplication.class) + .withPropertyValues("spring.profiles.active=test,jdbc", + "spring.main.web-application-type=none", + "spring.cloud.config.server.git.uri:" + uri, + "spring.cloud.config.server.jdbc.enabled:" + jdbcEnabled) + .run(consumer); + } + +} From 7917c38c1558d993c33e0e3dae7d1c25e2f2072c Mon Sep 17 00:00:00 2001 From: Daniel Mikusa Date: Tue, 2 Jun 2020 15:24:05 -0400 Subject: [PATCH 2/7] Update spring-cloud-config.adoc Add some detail around using `--data-urlencode` correctly & using the `-s` option to silence curl stats. fixes gh-1636 --- docs/src/main/asciidoc/spring-cloud-config.adoc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-config.adoc b/docs/src/main/asciidoc/spring-cloud-config.adoc index c5408264..3ae77fa4 100644 --- a/docs/src/main/asciidoc/spring-cloud-config.adoc +++ b/docs/src/main/asciidoc/spring-cloud-config.adoc @@ -1165,25 +1165,22 @@ The server also exposes `/encrypt` and `/decrypt` endpoints (on the assumption t If you edit a remote config file, you can use the Config Server to encrypt values by POSTing to the `/encrypt` endpoint, as shown in the following example: ---- -$ curl localhost:8888/encrypt -d mysecret +$ curl localhost:8888/encrypt -s -d mysecret 682bc583f4641835fa2db009355293665d2647dade3375c0ee201de2a49f7bda ---- -NOTE: If the value you encrypt has characters in it that need to be URL encoded, you should use the `--data-urlencode` option to `curl` to make sure they are encoded properly. +TIP: If you are testing with curl, then use `--data-urlencode` (instead of `-d`) and prefix the value to encrypt with `=` (curl requires this) or set an explicit `Content-Type: text/plain` to make sure curl encodes the data correctly when there are special characters ('+' is particularly tricky). -TIP: Be sure not to include any of the curl command statistics in the encrypted value. -Outputting the value to a file can help avoid this problem. +TIP: Be sure not to include any of the curl command statistics in the encrypted value, this is why the examples use the `-s` option to silence them. Outputting the value to a file can help avoid this problem. The inverse operation is also available through `/decrypt` (provided the server is configured with a symmetric key or a full key pair), as shown in the following example: ---- -$ curl localhost:8888/decrypt -d 682bc583f4641835fa2db009355293665d2647dade3375c0ee201de2a49f7bda +$ curl localhost:8888/decrypt -s -d 682bc583f4641835fa2db009355293665d2647dade3375c0ee201de2a49f7bda mysecret ---- -TIP: If you testing with curl, then use `--data-urlencode` (instead of `-d`) or set an explicit `Content-Type: text/plain` to make sure curl encodes the data correctly when there are special characters ('+' is particularly tricky). - Take the encrypted value and add the `{cipher}` prefix before you put it in the YAML or properties file and before you commit and push it to a remote (potentially insecure) store. The `/encrypt` and `/decrypt` endpoints also both accept paths in the form of `/*/{application}/{profiles}`, which can be used to control cryptography on a per-application (name) and per-profile basis when clients call into the main environment resource. From fc58acc331d18a0892558c376eeadab591fc4716 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 20:22:15 +0000 Subject: [PATCH 3/7] Update SNAPSHOT to 2.2.4.RELEASE --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4da29dd3..0c9911aa 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. diff --git a/pom.xml b/pom.xml index 9b570380..4d049448 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE @@ -27,7 +27,7 @@ config - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE 1.11.52 v1-rev20191010-1.30.3 true diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index a3d7d09d..f83d8e68 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.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index fdbc39f1..3d5b7998 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.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-config-dependencies - 2.2.4.BUILD-SNAPSHOT + 2.2.4.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 0884d6c9..de53feeb 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.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT + 2.2.3.RELEASE diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index caf749d5..c66ad245 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.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 3acd15cc..f3e5ba40 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.4.BUILD-SNAPSHOT + 2.2.4.RELEASE .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index c2bc7791..17305706 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.4.BUILD-SNAPSHOT + 2.2.4.RELEASE spring-cloud-starter-config - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From ece5ff35dea29b15852d202e21dfae5cb7626090 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 20:24:36 +0000 Subject: [PATCH 4/7] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 0c9911aa..4da29dd3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 4d049448..9b570380 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.1.BUILD-SNAPSHOT @@ -27,7 +27,7 @@ config - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT 1.11.52 v1-rev20191010-1.30.3 true diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index f83d8e68..a3d7d09d 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 3d5b7998..fdbc39f1 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.1.BUILD-SNAPSHOT spring-cloud-config-dependencies - 2.2.4.RELEASE + 2.2.4.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 de53feeb..0884d6c9 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 2.2.3.RELEASE + 2.2.3.BUILD-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index c66ad245..caf749d5 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index f3e5ba40..3acd15cc 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 17305706..c2bc7791 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.4.RELEASE + 2.2.4.BUILD-SNAPSHOT spring-cloud-starter-config - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From c323d7e20686650f42552a55c902bf691df87eb8 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 31 Jul 2020 20:24:37 +0000 Subject: [PATCH 5/7] Bumping versions to 2.2.5.BUILD-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-config-client/pom.xml | 2 +- spring-cloud-config-dependencies/pom.xml | 4 ++-- spring-cloud-config-monitor/pom.xml | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4da29dd3..7c7b1f14 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 9b570380..0e5246f4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.BUILD-SNAPSHOT + 2.3.1.RELEASE @@ -27,7 +27,7 @@ config - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT 1.11.52 v1-rev20191010-1.30.3 true diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index a3d7d09d..6d87819f 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.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index fdbc39f1..d7544f3a 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.BUILD-SNAPSHOT + 2.3.2.BUILD-SNAPSHOT spring-cloud-config-dependencies - 2.2.4.BUILD-SNAPSHOT + 2.2.5.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 0884d6c9..136f2614 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.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 2.2.3.BUILD-SNAPSHOT + 2.2.4.BUILD-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index caf749d5..7105ded3 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.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 3acd15cc..4a0dc8ac 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.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index c2bc7791..3cf7c51d 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.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT spring-cloud-starter-config - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From a07903837c9dc74e93d4c45e744745dc9b1729fe Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 3 Aug 2020 12:59:05 -0400 Subject: [PATCH 6/7] Bumps s-c-build to use snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e5246f4..ba4aaa95 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT From 9bbd634ff1df69d135ed67fd1a3eb061909e8537 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 11 Aug 2020 19:01:02 +0200 Subject: [PATCH 7/7] Fix README --- README.adoc | 2 +- docs/src/main/asciidoc/README.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 8e329aed..e6dc23b7 100644 --- a/README.adoc +++ b/README.adoc @@ -213,7 +213,7 @@ $ curl localhost:8080/env/sample mytest $ vi target/config/mytest.properties .. change value of "sample", optionally commit -$ curl localhost:8080/refresh +$ curl -X POST localhost:8080/refresh ["sample"] $ curl localhost:8080/env/sample sampleValue diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index e38de84f..0ee4204e 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -50,7 +50,7 @@ $ curl localhost:8080/env/sample mytest $ vi target/config/mytest.properties .. change value of "sample", optionally commit -$ curl localhost:8080/refresh +$ curl -X POST localhost:8080/refresh ["sample"] $ curl localhost:8080/env/sample sampleValue