From 9af50f5ff492250159136101e38c2a794f3c55f7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 15 Nov 2021 12:51:04 -0500 Subject: [PATCH 1/2] removes -local repositories --- pom.xml | 6 +++--- spring-cloud-config-dependencies/pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 63aff70a..e7b79341 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false @@ -143,7 +143,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false @@ -151,7 +151,7 @@ spring-releases Spring Releases - https://repo.spring.io/libs-release-local + https://repo.spring.io/release false diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index cb10eb7a..732358f2 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -96,7 +96,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false @@ -125,7 +125,7 @@ spring-milestones Spring Milestones - https://repo.spring.io/libs-milestone-local + https://repo.spring.io/milestone false From 1f2a6eca1704fdaa93e8f9e2058fe9e6e26610a7 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 15 Nov 2021 12:51:20 -0500 Subject: [PATCH 2/2] formatting --- .../config/server/environment/CredhubEnvironmentRepository.java | 1 + .../config/server/environment/NativeEnvironmentRepository.java | 2 +- .../config/server/environment/RedisEnvironmentRepository.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CredhubEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CredhubEnvironmentRepository.java index 24a6ee5c..16b64b54 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CredhubEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/CredhubEnvironmentRepository.java @@ -109,4 +109,5 @@ public class CredhubEnvironmentRepository implements EnvironmentRepository, Orde public void setOrder(int order) { this.order = order; } + } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java index 061e7979..3159754c 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/NativeEnvironmentRepository.java @@ -330,7 +330,7 @@ public class NativeEnvironmentRepository implements EnvironmentRepository, Searc } if (locations != null) { matches = Arrays.stream(locations).map(this::cleanFileLocation) - .anyMatch(location -> location.startsWith(finalPattern)); + .anyMatch(location -> location.startsWith(finalPattern)); if (matches) { break; } diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepository.java index 0e67c954..66b7aa69 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/RedisEnvironmentRepository.java @@ -72,4 +72,5 @@ public class RedisEnvironmentRepository implements EnvironmentRepository, Ordere public int getOrder() { return order; } + }