From 9026731faa30f66bd358619e7171941f5a0fb3ba Mon Sep 17 00:00:00 2001 From: David Byron <82477955+dbyron-sf@users.noreply.github.com> Date: Tue, 20 Dec 2022 05:56:28 -0800 Subject: [PATCH] chore(web): clean up spring boot 2.4-related changes (#2006) Now that https://github.com/spinnaker/kork/pull/990 and https://github.com/spinnaker/kork/pull/1002 are in (and halyard consumes them), we don't need these changes here anymore. Revert "fix(web): adjust configuration so that the halyard daemon starts with spring boot 2.4 (#1987)" This reverts commit 442810565b8dd1f6529b6df6c8eace29117ea64c. --- halyard-web/halyard-web.gradle | 2 -- .../src/main/java/com/netflix/spinnaker/halyard/Main.java | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/halyard-web/halyard-web.gradle b/halyard-web/halyard-web.gradle index 3be8b3ea30..3fe301fccf 100644 --- a/halyard-web/halyard-web.gradle +++ b/halyard-web/halyard-web.gradle @@ -39,8 +39,6 @@ dependencies { implementation project(':halyard-core') implementation project(':halyard-deploy') implementation project(':halyard-proto') - - runtimeOnly 'org.springframework.cloud:spring-cloud-starter-bootstrap' } def cliScript = project.tasks.create('createCliStartScripts', CreateStartScripts) { diff --git a/halyard-web/src/main/java/com/netflix/spinnaker/halyard/Main.java b/halyard-web/src/main/java/com/netflix/spinnaker/halyard/Main.java index c4dcae7ebf..32e028e85d 100644 --- a/halyard-web/src/main/java/com/netflix/spinnaker/halyard/Main.java +++ b/halyard-web/src/main/java/com/netflix/spinnaker/halyard/Main.java @@ -31,8 +31,7 @@ @EnableAutoConfiguration @EnableConfigServer public class Main extends SpringBootServletInitializer { - private static final Map DEFAULT_PROPS = - new DefaultPropertiesBuilder().property("spring.config.on-not-found", "ignore").build(); + private static final Map DEFAULT_PROPS = new DefaultPropertiesBuilder().build(); public static void main(String... args) { ConfigServerBootstrap.systemProperties("halyard");