From b40c219c57df1b724918f36bc4ec621466757334 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 16:43:03 +0000 Subject: [PATCH 1/6] Update SNAPSHOT to 3.1.1 --- README.adoc | 2 +- docs/pom.xml | 2 +- pom.xml | 6 +++--- 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 | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index 83062c93..2991a3d1 100644 --- a/README.adoc +++ b/README.adoc @@ -264,7 +264,7 @@ The refresh endpoint reports that the "sample" property changed. == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index 4e1cbfb3..e2fb6abc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.1-SNAPSHOT + 3.1.1 .. diff --git a/pom.xml b/pom.xml index b52c6fb4..eb7fae95 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.1-SNAPSHOT + 3.1.1 pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 @@ -27,7 +27,7 @@ config - 3.1.1-SNAPSHOT + 3.1.1 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 24ff20aa..a9198090 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 - 3.1.1-SNAPSHOT + 3.1.1 .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index f75575e2..88c3c9dc 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 - 3.1.1-SNAPSHOT + 3.1.1 .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 67ce88e8..ef29f089 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 - 3.1.0 + 3.1.1 spring-cloud-config-dependencies - 3.1.1-SNAPSHOT + 3.1.1 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 7101eb16..f4f87056 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 - 3.1.1-SNAPSHOT + 3.1.1 .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.1-SNAPSHOT + 3.1.0 diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 6f1b2591..3010936f 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 - 3.1.1-SNAPSHOT + 3.1.1 .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 30a2be2b..10f02ee8 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 - 3.1.1-SNAPSHOT + 3.1.1 .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index bfb0e262..518af191 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 - 3.1.1-SNAPSHOT + 3.1.1 spring-cloud-starter-config - 3.1.1-SNAPSHOT + 3.1.1 spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 3ecceb1276ccc7e7d31a610855d13a09f66eb28e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 16:46:14 +0000 Subject: [PATCH 2/6] Going back to snapshots --- README.adoc | 2 +- docs/pom.xml | 2 +- pom.xml | 6 +++--- 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 | 4 ++-- spring-cloud-config-sample/pom.xml | 2 +- spring-cloud-config-server/pom.xml | 2 +- spring-cloud-starter-config/pom.xml | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.adoc b/README.adoc index 2991a3d1..83062c93 100644 --- a/README.adoc +++ b/README.adoc @@ -264,7 +264,7 @@ The refresh endpoint reports that the "sample" property changed. == Building -:jdkversion: 17 +:jdkversion: 1.8 === Basic Compile and Test diff --git a/docs/pom.xml b/docs/pom.xml index e2fb6abc..4e1cbfb3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.1 + 3.1.1-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index eb7fae95..b52c6fb4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.1 + 3.1.1-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.1-SNAPSHOT @@ -27,7 +27,7 @@ config - 3.1.1 + 3.1.1-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index a9198090..24ff20aa 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 - 3.1.1 + 3.1.1-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index 88c3c9dc..f75575e2 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 - 3.1.1 + 3.1.1-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index ef29f089..67ce88e8 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 - 3.1.1 + 3.1.0 spring-cloud-config-dependencies - 3.1.1 + 3.1.1-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 f4f87056..7101eb16 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 - 3.1.1 + 3.1.1-SNAPSHOT .. spring-cloud-config-monitor @@ -14,7 +14,7 @@ Spring Cloud Config Monitor ${basedir}/../.. - 3.1.0 + 3.1.1-SNAPSHOT diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 3010936f..6f1b2591 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 - 3.1.1 + 3.1.1-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 10f02ee8..30a2be2b 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 - 3.1.1 + 3.1.1-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index 518af191..bfb0e262 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 - 3.1.1 + 3.1.1-SNAPSHOT spring-cloud-starter-config - 3.1.1 + 3.1.1-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From 5e60c254d26b08f3acefe8e19561cc061f545efd Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 17 Feb 2022 16:46:14 +0000 Subject: [PATCH 3/6] Bumping versions to 3.1.2-SNAPSHOT after release --- docs/pom.xml | 2 +- pom.xml | 6 +++--- 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 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 4e1cbfb3..704dba11 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -8,7 +8,7 @@ org.springframework.cloud spring-cloud-config - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index b52c6fb4..ac0e9332 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-config - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT pom Spring Cloud Config Spring Cloud Config @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1-SNAPSHOT + 3.1.1 @@ -27,7 +27,7 @@ config - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT 1.11.911 v1-rev20201112-1.30.10 1.16.2 diff --git a/spring-cloud-config-client-tls-tests/pom.xml b/spring-cloud-config-client-tls-tests/pom.xml index 24ff20aa..8a2bb080 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 - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-config-client/pom.xml b/spring-cloud-config-client/pom.xml index f75575e2..8d1b5caf 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 - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index 67ce88e8..6b8ece73 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 - 3.1.0 + 3.1.2-SNAPSHOT spring-cloud-config-dependencies - 3.1.1-SNAPSHOT + 3.1.2-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 7101eb16..e2d16989 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 - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. spring-cloud-config-monitor diff --git a/spring-cloud-config-sample/pom.xml b/spring-cloud-config-sample/pom.xml index 6f1b2591..b1efc9f8 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 - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 30a2be2b..f1f6d345 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 - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT .. diff --git a/spring-cloud-starter-config/pom.xml b/spring-cloud-starter-config/pom.xml index bfb0e262..a46cf7dd 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 - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-starter-config - 3.1.1-SNAPSHOT + 3.1.2-SNAPSHOT spring-cloud-starter-config Spring Cloud Starter https://projects.spring.io/spring-cloud From d0b9f0a6c8848ab026f815602d85740c1479ccfa Mon Sep 17 00:00:00 2001 From: Sergii Chekotylo Date: Tue, 22 Feb 2022 11:04:32 -0500 Subject: [PATCH 4/6] Unable to provide different values of spring.config.import.configserver since 2020.0.4 #2011 (#2037) --- ...onfigServerConfigDataLocationResolver.java | 4 ++- ...ServerConfigDataLocationResolverTests.java | 27 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java index bcd8b0c7..523ffba8 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java @@ -23,6 +23,7 @@ import java.util.Properties; import org.apache.commons.logging.Log; +import org.springframework.beans.BeanUtils; import org.springframework.boot.BootstrapRegistry.InstanceSupplier; import org.springframework.boot.ConfigurableBootstrapContext; import org.springframework.boot.context.config.ConfigDataLocation; @@ -69,7 +70,8 @@ public class ConfigServerConfigDataLocationResolver ConfigClientProperties configClientProperties; if (context.getBootstrapContext().isRegistered(ConfigClientProperties.class)) { - configClientProperties = context.getBootstrapContext().get(ConfigClientProperties.class); + configClientProperties = new ConfigClientProperties(); + BeanUtils.copyProperties(context.getBootstrapContext().get(ConfigClientProperties.class), configClientProperties); } else { configClientProperties = binder diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java index 708a3ec0..faf74039 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java @@ -180,6 +180,27 @@ public class ConfigServerConfigDataLocationResolverTests { assertThat(resource.getProperties().getUri()).isEqualTo(new String[] { "http://locationuri" }); } + @Test + void multipleImportEntriesDoesNotShareSameURIs() { + ConfigurableBootstrapContext bootstrapContext = mock(ConfigurableBootstrapContext.class); + when(bootstrapContext.isRegistered(eq(ConfigClientProperties.class))).thenReturn(true); + ConfigClientProperties configClientProperties = new ConfigClientProperties(); + configClientProperties.setUri(new String[] { "http://myuri" }); + when(bootstrapContext.get(eq(ConfigClientProperties.class))).thenReturn(configClientProperties); + when(context.getBootstrapContext()).thenReturn(bootstrapContext); + List resources1 = this.resolver.resolveProfileSpecific(context, + ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class)); + List resources2 = this.resolver.resolveProfileSpecific(context, + ConfigDataLocation.of("configserver:http://urlNo2"), mock(Profiles.class)); + assertThat(resources1).hasSize(1); + assertThat(resources2).hasSize(1); + verify(bootstrapContext, times(2)).get(eq(ConfigClientProperties.class)); + ConfigServerConfigDataResource resource1 = resources1.get(0); + assertThat(resource1.getProperties().getUri()).isEqualTo(new String[] { "http://urlNo1" }); + ConfigServerConfigDataResource resource2 = resources2.get(0); + assertThat(resource2.getProperties().getUri()).isEqualTo(new String[] { "http://urlNo2" }); + } + private ConfigServerConfigDataResource testUri(String propertyUri, String locationUri) { this.environment.setProperty(ConfigClientProperties.PREFIX + ".uri", propertyUri); when(context.getBootstrapContext()).thenReturn(mock(ConfigurableBootstrapContext.class)); @@ -187,8 +208,7 @@ public class ConfigServerConfigDataLocationResolverTests { List resources = this.resolver.resolveProfileSpecific(context, ConfigDataLocation.of("configserver:" + locationUri), profiles); assertThat(resources).hasSize(1); - ConfigServerConfigDataResource resource = resources.get(0); - return resource; + return resources.get(0); } private ConfigServerConfigDataResource testResolveProvileSpecific() { @@ -205,8 +225,7 @@ public class ConfigServerConfigDataLocationResolverTests { List resources = this.resolver.resolveProfileSpecific(context, ConfigDataLocation.of("configserver:"), profiles); assertThat(resources).hasSize(1); - ConfigServerConfigDataResource resource = resources.get(0); - return resource; + return resources.get(0); } } From 9e7fd9117a1b8709cbf0b6c69e8749cf3faa3c8c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 24 Feb 2022 00:30:01 +0000 Subject: [PATCH 5/6] Bumping versions --- README.adoc | 2 +- pom.xml | 2 +- .../config/client/ConfigServerConfigDataLocationResolver.java | 3 ++- .../client/ConfigServerConfigDataLocationResolverTests.java | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.adoc b/README.adoc index 83062c93..2991a3d1 100644 --- a/README.adoc +++ b/README.adoc @@ -264,7 +264,7 @@ The refresh endpoint reports that the "sample" property changed. == Building -:jdkversion: 1.8 +:jdkversion: 17 === Basic Compile and Test diff --git a/pom.xml b/pom.xml index ac0e9332..12441257 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 3.1.1 + 3.1.2-SNAPSHOT diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java index 523ffba8..434b514f 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolver.java @@ -71,7 +71,8 @@ public class ConfigServerConfigDataLocationResolver ConfigClientProperties configClientProperties; if (context.getBootstrapContext().isRegistered(ConfigClientProperties.class)) { configClientProperties = new ConfigClientProperties(); - BeanUtils.copyProperties(context.getBootstrapContext().get(ConfigClientProperties.class), configClientProperties); + BeanUtils.copyProperties(context.getBootstrapContext().get(ConfigClientProperties.class), + configClientProperties); } else { configClientProperties = binder diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java index faf74039..12d569ea 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServerConfigDataLocationResolverTests.java @@ -189,9 +189,9 @@ public class ConfigServerConfigDataLocationResolverTests { when(bootstrapContext.get(eq(ConfigClientProperties.class))).thenReturn(configClientProperties); when(context.getBootstrapContext()).thenReturn(bootstrapContext); List resources1 = this.resolver.resolveProfileSpecific(context, - ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class)); + ConfigDataLocation.of("configserver:http://urlNo1"), mock(Profiles.class)); List resources2 = this.resolver.resolveProfileSpecific(context, - ConfigDataLocation.of("configserver:http://urlNo2"), mock(Profiles.class)); + ConfigDataLocation.of("configserver:http://urlNo2"), mock(Profiles.class)); assertThat(resources1).hasSize(1); assertThat(resources2).hasSize(1); verify(bootstrapContext, times(2)).get(eq(ConfigClientProperties.class)); From be7a22ce60ae6711e4f08decaa546e1f8d704c08 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 7 Feb 2022 16:02:59 -0500 Subject: [PATCH 6/6] Updates jdbc repo to be compatible with latest h2 --- .../config/server/environment/JdbcEnvironmentProperties.java | 2 +- spring-cloud-config-server/src/test/resources/data-jdbc.sql | 4 ++-- spring-cloud-config-server/src/test/resources/schema-jdbc.sql | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 b5782f1f..0fa596ee 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 @@ -27,7 +27,7 @@ import org.springframework.core.Ordered; @ConfigurationProperties("spring.cloud.config.server.jdbc") public class JdbcEnvironmentProperties implements EnvironmentRepositoryProperties { - private static final String DEFAULT_SQL = "SELECT KEY, VALUE from PROPERTIES" + private static final String DEFAULT_SQL = "SELECT \"KEY\", \"VALUE\" from PROPERTIES" + " where APPLICATION=? and PROFILE=? and LABEL=?"; /** diff --git a/spring-cloud-config-server/src/test/resources/data-jdbc.sql b/spring-cloud-config-server/src/test/resources/data-jdbc.sql index 7c800d14..12fbce0c 100644 --- a/spring-cloud-config-server/src/test/resources/data-jdbc.sql +++ b/spring-cloud-config-server/src/test/resources/data-jdbc.sql @@ -1,2 +1,2 @@ -INSERT into PROPERTIES(APPLICATION, PROFILE, LABEL, KEY, VALUE) values ('application', 'default', 'master', 'a.b', 'y'); -INSERT into PROPERTIES(APPLICATION, PROFILE, LABEL, KEY, VALUE) values ('foo', 'bar', 'master', 'a.b.c', 'x'); +INSERT into PROPERTIES(APPLICATION, PROFILE, LABEL, "KEY", "VALUE") values ('application', 'default', 'master', 'a.b', 'y'); +INSERT into PROPERTIES(APPLICATION, PROFILE, LABEL, "KEY", "VALUE") values ('foo', 'bar', 'master', 'a.b.c', 'x'); diff --git a/spring-cloud-config-server/src/test/resources/schema-jdbc.sql b/spring-cloud-config-server/src/test/resources/schema-jdbc.sql index a596350f..93b4c5aa 100644 --- a/spring-cloud-config-server/src/test/resources/schema-jdbc.sql +++ b/spring-cloud-config-server/src/test/resources/schema-jdbc.sql @@ -1,6 +1,6 @@ CREATE TABLE PROPERTIES ( - KEY VARCHAR(2048), - VALUE VARCHAR(4096), + "KEY" VARCHAR(2048), + "VALUE" VARCHAR(4096), APPLICATION VARCHAR(128), PROFILE VARCHAR(128), LABEL VARCHAR(128)