diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index ab5424bfaf..ed0f327b8c 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -31,6 +31,7 @@
io.rest-assured
rest-assured
+ ${rest-assured.version}
org.springframework.boot
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 6fddb1693f..0e2cac1ff9 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-modules
- 1.0.0-SNAPSHOT
- ..
+ parent-boot-2
+ 0.0.1-SNAPSHOT
+ ../parent-boot-2
@@ -56,17 +56,15 @@
- 1.2.2.RELEASE
- Brixton.SR7
- 1.2.2.RELEASE
- 1.2.2.RELEASE
- 2.0.2.RELEASE
- 1.4.6.RELEASE
- 1.2.3.RELEASE
- 1.3.0.RELEASE
- 1.4.2.RELEASE
- 1.4.2.RELEASE
- 1.2.3.RELEASE
+ Hoxton.SR4
+ 2.2.3.RELEASE
+ 2.2.3.RELEASE
+ 1.4.7.RELEASE
+ 1.4.7.RELEASE
+ 1.4.7.RELEASE
+ 3.0.6.RELEASE
+ 2.3.1.RELEASE
+ 2.3.1.RELEASE
diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java b/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java
index d013969ad3..e01799b8d9 100644
--- a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java
+++ b/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java
@@ -4,12 +4,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import static org.springframework.boot.WebApplicationType.NONE;
+
@SpringBootApplication
@EnableDiscoveryClient
public class DiscoveryClientApplication {
public static void main(String[] args) {
- new SpringApplicationBuilder(DiscoveryClientApplication.class).web(true)
+ new SpringApplicationBuilder(DiscoveryClientApplication.class).web(NONE)
.run(args);
}
diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java b/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java
index 020d7d017c..1ef3e34e08 100644
--- a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java
+++ b/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java
@@ -1,13 +1,16 @@
package com.baeldung.spring.cloud.consul.health;
+import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
+import static org.springframework.boot.WebApplicationType.NONE;
+
@SpringBootApplication
public class ServiceDiscoveryApplication {
public static void main(String[] args) {
- new SpringApplicationBuilder(ServiceDiscoveryApplication.class).web(true)
+ new SpringApplicationBuilder(ServiceDiscoveryApplication.class).web(NONE)
.run(args);
}
diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java b/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java
index c1d2b0acc5..d854b5aaba 100644
--- a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java
+++ b/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java
@@ -4,12 +4,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.web.bind.annotation.RestController;
+import static org.springframework.boot.WebApplicationType.NONE;
+
@SpringBootApplication
@RestController
public class DistributedPropertiesApplication {
public static void main(String[] args) {
- new SpringApplicationBuilder(DistributedPropertiesApplication.class).web(true)
+ new SpringApplicationBuilder(DistributedPropertiesApplication.class).web(NONE)
.run(args);
}
diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml
index 367b7c111e..acb9993881 100644
--- a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml
+++ b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml
@@ -36,18 +36,22 @@
org.springframework.cloud
spring-cloud-starter-hystrix
+ ${spring-cloud-starter-hystrix.version}
org.springframework.cloud
spring-cloud-starter-hystrix-dashboard
+ ${spring-cloud-starter-hystrix.version}
org.springframework.cloud
spring-cloud-starter-feign
+ ${spring-cloud-starter-feign.version}
org.springframework.boot
spring-boot-starter-web
+ ${spring-boot-starter-web.version}
org.springframework.boot
diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java
index 4fcfb0eeda..2a31917352 100644
--- a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java
+++ b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java
@@ -1,7 +1,7 @@
package com.baeldung.spring.cloud.hystrix.rest.consumer;
import com.baeldung.spring.cloud.hystrix.rest.producer.GreetingController;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PathVariable;
diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java
index 2fc54216fe..044b0dbcb8 100644
--- a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java
+++ b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java
@@ -3,8 +3,8 @@ package com.baeldung.spring.cloud.hystrix.rest.consumer;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
+import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableCircuitBreaker
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java
index 898d06897f..c8b8c9f1a9 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java
@@ -28,13 +28,13 @@ public class MultipleOutputsServiceApplicationIntegrationTest {
@Test
public void whenSendMessage_thenResponseIsInAOutput() {
whenSendMessage(1);
- thenPayloadInChannelIs(pipe.anOutput(), 1);
+ thenPayloadInChannelIs(pipe.anOutput(), "1");
}
@Test
public void whenSendMessage_thenResponseIsInAnotherOutput() {
whenSendMessage(11);
- thenPayloadInChannelIs(pipe.anotherOutput(), 11);
+ thenPayloadInChannelIs(pipe.anotherOutput(), "11");
}
private void whenSendMessage(Integer val) {
@@ -43,7 +43,7 @@ public class MultipleOutputsServiceApplicationIntegrationTest {
.build());
}
- private void thenPayloadInChannelIs(MessageChannel channel, Integer expectedValue) {
+ private void thenPayloadInChannelIs(MessageChannel channel, String expectedValue) {
Object payload = messageCollector.forChannel(channel)
.poll()
.getPayload();
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java
index c3bf5a1205..1aa8d38aa1 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java
@@ -28,13 +28,13 @@ public class MultipleOutputsWithConditionsServiceIntegrationTest {
@Test
public void whenSendMessage_thenResponseIsInAOutput() {
whenSendMessage(1);
- thenPayloadInChannelIs(pipe.anOutput(), 1);
+ thenPayloadInChannelIs(pipe.anOutput(), "1");
}
@Test
public void whenSendMessage_thenResponseIsInAnotherOutput() {
whenSendMessage(11);
- thenPayloadInChannelIs(pipe.anotherOutput(), 11);
+ thenPayloadInChannelIs(pipe.anotherOutput(), "11");
}
private void whenSendMessage(Integer val) {
@@ -43,7 +43,7 @@ public class MultipleOutputsWithConditionsServiceIntegrationTest {
.build());
}
- private void thenPayloadInChannelIs(MessageChannel channel, Integer expectedValue) {
+ private void thenPayloadInChannelIs(MessageChannel channel, String expectedValue) {
Object payload = messageCollector.forChannel(channel)
.poll()
.getPayload();
diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java
index 21d84e79e0..7e5f4fbec7 100644
--- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java
+++ b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java
@@ -35,6 +35,6 @@ public class MyLoggerApplicationIntegrationTest {
.poll()
.getPayload();
- assertEquals("[1]: This is my message", payload.toString());
+ assertEquals("{\"message\":\"[1]: This is my message\"}", payload.toString());
}
}
diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
index ac469d8bc4..871218e78c 100644
--- a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
+++ b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml
@@ -30,6 +30,10 @@
spring-boot-starter
${spring-boot.version}
+
+ org.springframework.boot
+ spring-boot-starter-web
+
org.springframework
spring-web
@@ -56,7 +60,10 @@
spring-cloud-starter-feign
${spring-cloud-starter-feign.version}
-
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
org.springframework.boot
spring-boot-starter-test
@@ -71,7 +78,6 @@
- 1.2.5.RELEASE
1.3
diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java b/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java
index c56cb1907a..dc90576e08 100644
--- a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java
+++ b/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java
@@ -2,8 +2,8 @@ package com.baeldung.spring.cloud.greeting;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.netflix.feign.EnableFeignClients;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
diff --git a/spring-cloud/spring-cloud-zookeeper/pom.xml b/spring-cloud/spring-cloud-zookeeper/pom.xml
index 64d30b19a6..244ccbd957 100644
--- a/spring-cloud/spring-cloud-zookeeper/pom.xml
+++ b/spring-cloud/spring-cloud-zookeeper/pom.xml
@@ -18,8 +18,7 @@
- 1.5.2.RELEASE
- 4.3.7.RELEASE
+ 5.2.7.RELEASE
1.0.3.RELEASE