fix(core): Spring does not override default configuration files. (spi…

…nnaker#795) Signed-off-by: Jammy Louie <jlouie@pivotal.io>
plumpy · May 10, 2019 · 833edc2 · 833edc2
1 parent 70024a3
commit 833edc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gate-web/gate-web.gradle b/gate-web/gate-web.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'spinnaker.application'
 
 ext {
-  springConfigLocation = System.getProperty('spring.config.location', "${System.getProperty('user.home')}/.spinnaker/")
+  springConfigLocation = System.getProperty('spring.config.additional-location', "${System.getProperty('user.home')}/.spinnaker/")
   springProfiles = System.getProperty('spring.profiles.active', "test,local")
 }
 
 run {
-  systemProperty('spring.config.location', project.springConfigLocation)
+  systemProperty('spring.config.additional-location', project.springConfigLocation)
   systemProperty('spring.profiles.active', project.springProfiles)
 }
 mainClassName='com.netflix.spinnaker.gate.Main'

diff --git a/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy b/gate-web/src/main/groovy/com/netflix/spinnaker/gate/Main.groovy
@@ -39,7 +39,7 @@ class Main {
     'netflix.environment': 'test',
     'netflix.account': '${netflix.environment}',
     'netflix.stack': 'test',
-    'spring.config.location': '${user.home}/.spinnaker/',
+    'spring.config.additional-location': '${user.home}/.spinnaker/',
     'spring.application.name': 'gate',
     'spring.config.name': 'spinnaker,${spring.application.name}',
     'spring.profiles.active': '${netflix.environment},local'