Update to Spring Cloud Camden.RELEASE

Update to the recent spring cloud release. Unfortunately the ZuulProperties now depends on Hystrix classes so we need to add hystrix-core to the server dependencies. closes #281

Update to Spring Cloud Camden.RELEASE
e7514bf9 · Johannes Edmeier · cdbefc66 · e7514bf9 · e7514bf9
Commit e7514bf9 authored Sep 27, 2016 by Johannes Edmeier
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

pom.xml pom.xml +1 -1

pom.xml spring-boot-admin-server/pom.xml +5 -1

No files found.
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
        <java.version>1.7</java.version>
        <main.basedir>${basedir}</main.basedir>
        <spring-boot.version>1.4.1.RELEASE</spring-boot.version>
-        <spring-cloud.version>Brixton.SR5</spring-cloud.version>
+        <spring-cloud.version>Camden.RELEASE</spring-cloud.version>
        <hystrix-dashboard.version>1.5.5</hystrix-dashboard.version>
        <build-plugin.jacoco.version>0.7.7.201606060606</build-plugin.jacoco.version>
        <build-plugin.coveralls.version>4.2.0</build-plugin.coveralls.version>

--- a/spring-boot-admin-server/pom.xml
+++ b/spring-boot-admin-server/pom.xml
@@ -21,12 +21,16 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-		<!-- Use Zuul WITHOUT Hystrix/Ribbon/Config Client -->
+		<!-- Use Zuul WITHOUT archaius/Ribbon/Config Client -->
 		<dependency>
 			<groupId>com.netflix.zuul</groupId>
 			<artifactId>zuul-core</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-core</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-netflix-core</artifactId>
 		</dependency>