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

9287e66c · Dave Syer · 98e1ac73 · 9287e66c
Commit 9287e66c authored Jan 15, 2016 by Dave Syer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ZuulConfiguration.java ...springframework/cloud/netflix/zuul/ZuulConfiguration.java +1 -1

No files found.
--- 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 {