From 9287e66cfce17770f97d2767de16a65c91e0a75c Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Fri, 15 Jan 2016 15:26:51 +0000
Subject: [PATCH] Add ServerProperties in case not a web app (for tests)

---
 .../springframework/cloud/netflix/zuul/ZuulConfiguration.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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
index ba2510fc..d57ec893 100644
--- 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 {