Skip to content

Commit

Permalink
chore(web): clean up spring boot 2.4-related changes (#2006)
Browse files Browse the repository at this point in the history
Now that spinnaker/kork#990 and
spinnaker/kork#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 4428105.
  • Loading branch information
dbyron-sf authored Dec 20, 2022
1 parent 2a9896a commit 9026731
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 0 additions & 2 deletions halyard-web/halyard-web.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
@EnableAutoConfiguration
@EnableConfigServer
public class Main extends SpringBootServletInitializer {
private static final Map<String, Object> DEFAULT_PROPS =
new DefaultPropertiesBuilder().property("spring.config.on-not-found", "ignore").build();
private static final Map<String, Object> DEFAULT_PROPS = new DefaultPropertiesBuilder().build();

public static void main(String... args) {
ConfigServerBootstrap.systemProperties("halyard");
Expand Down

0 comments on commit 9026731

Please # to comment.