Add ServerProperties in case not a web app (for tests)

2016-01-15 15:26:51 +00:00
parent 98e1ac7375
commit 9287e66cfc
1 changed files with 1 additions and 1 deletions
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/ZuulConfiguration.java
@@ -52,7 +52,7 @@ import com.netflix.zuul.http.ZuulServlet;
 * @author Dave Syer
 */
@Configuration
-@EnableConfigurationProperties(ZuulProperties.class)
+@EnableConfigurationProperties({ ZuulProperties.class, ServerProperties.class })
@ConditionalOnClass(ZuulServlet.class)
 public class ZuulConfiguration {