From 09325414bdcbc2bcac199cce8185cffa36417505 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Sat, 14 Oct 2023 13:47:36 +0000 Subject: [PATCH 1/2] Bumping versions --- .../config/EnvironmentRepositoryConfiguration.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 62e8eb87..980c63be 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 @@ -237,10 +237,13 @@ public class EnvironmentRepositoryConfiguration { @ConditionalOnClass(SsmClient.class) static class AwsParameterStoreFactoryConfig { - //set the bean name explicitly since we assume the bean name will start with the profile - //name in the case of a composite configuration. The profile name is awsparamstore - //but the method name starts with awsParameterStore and the logic in CompositeUtils.getFactoryName - //will not find a match + // set the bean name explicitly since we assume the bean name will start with the + // profile + // name in the case of a composite configuration. The profile name is + // awsparamstore + // but the method name starts with awsParameterStore and the logic in + // CompositeUtils.getFactoryName + // will not find a match @Bean(name = "awsparamstoreenvironmentrepositoryfactory") public AwsParameterStoreEnvironmentRepositoryFactory awsParameterStoreEnvironmentRepositoryFactory( ConfigServerProperties server) { From b3532537708e17481de910667c4e1d55b73bc588 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 24 Oct 2023 15:20:06 -0400 Subject: [PATCH 2/2] Adding 4.0.x to build config --- .github/workflows/maven.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 748dfdcc..9b781b39 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main, 3.1.x ] + branches: [ main, 4.0.x, 3.1.x ] pull_request: - branches: [ main, 3.1.x ] + branches: [ main, 4.0.x, 3.1.x ] jobs: build: