diff --git a/.gitignore b/.gitignore
index 5d9c5e8..b7b47ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
target
.idea
*.DS_Store
+.classpath
+.project
+.settings
diff --git a/code/auth-service/pom.xml b/code/auth-service/pom.xml
index 646053c..b357265 100644
--- a/code/auth-service/pom.xml
+++ b/code/auth-service/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.4.RELEASE
+ 1.5.2.RELEASE
@@ -72,7 +72,7 @@
org.springframework.cloud
spring-cloud-dependencies
- Camden.SR5
+ Camden.SR6
pom
import
diff --git a/code/config-service/pom.xml b/code/config-service/pom.xml
index d470514..63c5f6f 100644
--- a/code/config-service/pom.xml
+++ b/code/config-service/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.4.RELEASE
+ 1.5.2.RELEASE
@@ -42,7 +42,7 @@
org.springframework.cloud
spring-cloud-dependencies
- Camden.SR5
+ Camden.SR6
pom
import
diff --git a/code/dataflow-service/pom.xml b/code/dataflow-service/pom.xml
index 892bfd7..bbd9f73 100644
--- a/code/dataflow-service/pom.xml
+++ b/code/dataflow-service/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.4.RELEASE
+ 1.5.2.RELEASE
@@ -50,21 +50,21 @@
org.springframework.cloud
spring-cloud-dataflow-dependencies
- 1.2.0.M1
+ 1.2.0.M3
pom
import
org.springframework.cloud
spring-cloud-task-dependencies
- 1.2.0.BUILD-SNAPSHOT
+ 1.2.0.M2
pom
import
org.springframework.cloud
spring-cloud-dependencies
- Camden.SR5
+ Camden.SR6
pom
import
diff --git a/code/eureka-service/pom.xml b/code/eureka-service/pom.xml
index 2a9283c..30df761 100644
--- a/code/eureka-service/pom.xml
+++ b/code/eureka-service/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.4.RELEASE
+ 1.5.2.RELEASE
@@ -46,7 +46,7 @@
org.springframework.cloud
spring-cloud-dependencies
- Camden.SR5
+ Camden.SR6
pom
import
diff --git a/code/hystrix-dashboard/pom.xml b/code/hystrix-dashboard/pom.xml
index b40721e..6dff772 100644
--- a/code/hystrix-dashboard/pom.xml
+++ b/code/hystrix-dashboard/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.4.RELEASE
+ 1.5.2.RELEASE
@@ -49,7 +49,7 @@
org.springframework.cloud
spring-cloud-dependencies
- Camden.SR5
+ Camden.SR6
pom
import
diff --git a/code/hystrix-dashboard/src/test/java/com/example/HystrixDashboardApplicationTests.java b/code/hystrix-dashboard/src/test/java/com/example/HystrixDashboardApplicationTests.java
index a0e92c8..c23abe0 100644
--- a/code/hystrix-dashboard/src/test/java/com/example/HystrixDashboardApplicationTests.java
+++ b/code/hystrix-dashboard/src/test/java/com/example/HystrixDashboardApplicationTests.java
@@ -2,11 +2,12 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = HystrixDashboardApplication.class)
+@SpringBootTest
public class HystrixDashboardApplicationTests {
@Test
diff --git a/code/reservation-client/pom.xml b/code/reservation-client/pom.xml
index c93e3e9..a4f2949 100644
--- a/code/reservation-client/pom.xml
+++ b/code/reservation-client/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.4.RELEASE
+ 1.5.2.RELEASE
@@ -78,7 +78,7 @@
org.springframework.cloud
spring-cloud-dependencies
- Camden.SR5
+ Camden.SR6
pom
import
diff --git a/code/reservation-service/pom.xml b/code/reservation-service/pom.xml
index 68f90b3..8f70e76 100644
--- a/code/reservation-service/pom.xml
+++ b/code/reservation-service/pom.xml
@@ -14,7 +14,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.4.RELEASE
+ 1.5.2.RELEASE
@@ -79,7 +79,7 @@
org.springframework.cloud
spring-cloud-dependencies
- Camden.SR5
+ Camden.SR6
pom
import
diff --git a/code/zipkin-service/pom.xml b/code/zipkin-service/pom.xml
index 0775173..3cf56ab 100644
--- a/code/zipkin-service/pom.xml
+++ b/code/zipkin-service/pom.xml
@@ -15,7 +15,7 @@
org.springframework.boot
spring-boot-starter-parent
- 1.4.4.RELEASE
+ 1.5.2.RELEASE
@@ -55,7 +55,7 @@
org.springframework.cloud
spring-cloud-dependencies
- Camden.SR5
+ Camden.SR6
pom
import