Skip to content

Commit faf2cc7

Browse files
author
mikr
committed
JAVA-38 Move all Spring Cloud Modules to Boot 2
1 parent 3829886 commit faf2cc7

File tree

14 files changed

+47
-32
lines changed

14 files changed

+47
-32
lines changed

‎parent-boot-2/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<dependency>
3232
<groupId>io.rest-assured</groupId>
3333
<artifactId>rest-assured</artifactId>
34+
<version>${rest-assured.version}</version>
3435
</dependency>
3536
<dependency>
3637
<groupId>org.springframework.boot</groupId>

‎spring-cloud/pom.xml

+12-14
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
<parent>
1212
<groupId>com.baeldung</groupId>
13-
<artifactId>parent-modules</artifactId>
14-
<version>1.0.0-SNAPSHOT</version>
15-
<relativePath>..</relativePath>
13+
<artifactId>parent-boot-2</artifactId>
14+
<version>0.0.1-SNAPSHOT</version>
15+
<relativePath>../parent-boot-2</relativePath>
1616
</parent>
1717

1818
<modules>
@@ -56,17 +56,15 @@
5656
</build>
5757

5858
<properties>
59-
<spring-session.version>1.2.2.RELEASE</spring-session.version>
60-
<spring-cloud-dependencies.version>Brixton.SR7</spring-cloud-dependencies.version>
61-
<spring-cloud-starter-config.version>1.2.2.RELEASE</spring-cloud-starter-config.version>
62-
<spring-cloud-config-server.version>1.2.2.RELEASE</spring-cloud-config-server.version>
63-
<spring-cloud-starter-eureka.version>2.0.2.RELEASE</spring-cloud-starter-eureka.version>
64-
<spring-cloud-starter-feign.version>1.4.6.RELEASE</spring-cloud-starter-feign.version>
65-
<spring-cloud-starter-hystrix.version>1.2.3.RELEASE</spring-cloud-starter-hystrix.version>
66-
<spring-cloud-stream.version>1.3.0.RELEASE</spring-cloud-stream.version>
67-
<spring-boot-starter-web.version>1.4.2.RELEASE</spring-boot-starter-web.version>
68-
<spring-boot-maven-plugin.version>1.4.2.RELEASE</spring-boot-maven-plugin.version>
69-
<spring-cloud-starter-zuul.version>1.2.3.RELEASE</spring-cloud-starter-zuul.version>
59+
<spring-cloud-dependencies.version>Hoxton.SR4</spring-cloud-dependencies.version>
60+
<spring-cloud-starter-config.version>2.2.3.RELEASE</spring-cloud-starter-config.version>
61+
<spring-cloud-config-server.version>2.2.3.RELEASE</spring-cloud-config-server.version>
62+
<spring-cloud-starter-eureka.version>1.4.7.RELEASE</spring-cloud-starter-eureka.version>
63+
<spring-cloud-starter-feign.version>1.4.7.RELEASE</spring-cloud-starter-feign.version>
64+
<spring-cloud-starter-hystrix.version>1.4.7.RELEASE</spring-cloud-starter-hystrix.version>
65+
<spring-cloud-stream.version>3.0.6.RELEASE</spring-cloud-stream.version>
66+
<spring-boot-starter-web.version>2.3.1.RELEASE</spring-boot-starter-web.version>
67+
<spring-boot-maven-plugin.version>2.3.1.RELEASE</spring-boot-maven-plugin.version>
7068
</properties>
7169

7270
</project>

‎spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
import org.springframework.boot.builder.SpringApplicationBuilder;
55
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
66

7+
import static org.springframework.boot.WebApplicationType.NONE;
8+
79
@SpringBootApplication
810
@EnableDiscoveryClient
911
public class DiscoveryClientApplication {
1012

1113
public static void main(String[] args) {
12-
new SpringApplicationBuilder(DiscoveryClientApplication.class).web(true)
14+
new SpringApplicationBuilder(DiscoveryClientApplication.class).web(NONE)
1315
.run(args);
1416
}
1517

‎spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package com.baeldung.spring.cloud.consul.health;
22

3+
import org.springframework.boot.WebApplicationType;
34
import org.springframework.boot.autoconfigure.SpringBootApplication;
45
import org.springframework.boot.builder.SpringApplicationBuilder;
56

7+
import static org.springframework.boot.WebApplicationType.NONE;
8+
69
@SpringBootApplication
710
public class ServiceDiscoveryApplication {
811

912
public static void main(String[] args) {
10-
new SpringApplicationBuilder(ServiceDiscoveryApplication.class).web(true)
13+
new SpringApplicationBuilder(ServiceDiscoveryApplication.class).web(NONE)
1114
.run(args);
1215
}
1316

‎spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
import org.springframework.boot.builder.SpringApplicationBuilder;
55
import org.springframework.web.bind.annotation.RestController;
66

7+
import static org.springframework.boot.WebApplicationType.NONE;
8+
79
@SpringBootApplication
810
@RestController
911
public class DistributedPropertiesApplication {
1012

1113
public static void main(String[] args) {
12-
new SpringApplicationBuilder(DistributedPropertiesApplication.class).web(true)
14+
new SpringApplicationBuilder(DistributedPropertiesApplication.class).web(NONE)
1315
.run(args);
1416
}
1517

‎spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,22 @@
3636
<dependency>
3737
<groupId>org.springframework.cloud</groupId>
3838
<artifactId>spring-cloud-starter-hystrix</artifactId>
39+
<version>${spring-cloud-starter-hystrix.version}</version>
3940
</dependency>
4041
<dependency>
4142
<groupId>org.springframework.cloud</groupId>
4243
<artifactId>spring-cloud-starter-hystrix-dashboard</artifactId>
44+
<version>${spring-cloud-starter-hystrix.version}</version>
4345
</dependency>
4446
<dependency>
4547
<groupId>org.springframework.cloud</groupId>
4648
<artifactId>spring-cloud-starter-feign</artifactId>
49+
<version>${spring-cloud-starter-feign.version}</version>
4750
</dependency>
4851
<dependency>
4952
<groupId>org.springframework.boot</groupId>
5053
<artifactId>spring-boot-starter-web</artifactId>
54+
<version>${spring-boot-starter-web.version}</version>
5155
</dependency>
5256
<dependency>
5357
<groupId>org.springframework.boot</groupId>

‎spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.spring.cloud.hystrix.rest.consumer;
22

33
import com.baeldung.spring.cloud.hystrix.rest.producer.GreetingController;
4-
import org.springframework.cloud.netflix.feign.FeignClient;
4+
import org.springframework.cloud.openfeign.FeignClient;
55
import org.springframework.stereotype.Component;
66
import org.springframework.web.bind.annotation.PathVariable;
77

‎spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
6-
import org.springframework.cloud.netflix.feign.EnableFeignClients;
76
import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
7+
import org.springframework.cloud.openfeign.EnableFeignClients;
88

99
@SpringBootApplication
1010
@EnableCircuitBreaker

‎spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public class MultipleOutputsServiceApplicationIntegrationTest {
2828
@Test
2929
public void whenSendMessage_thenResponseIsInAOutput() {
3030
whenSendMessage(1);
31-
thenPayloadInChannelIs(pipe.anOutput(), 1);
31+
thenPayloadInChannelIs(pipe.anOutput(), "1");
3232
}
3333

3434
@Test
3535
public void whenSendMessage_thenResponseIsInAnotherOutput() {
3636
whenSendMessage(11);
37-
thenPayloadInChannelIs(pipe.anotherOutput(), 11);
37+
thenPayloadInChannelIs(pipe.anotherOutput(), "11");
3838
}
3939

4040
private void whenSendMessage(Integer val) {
@@ -43,7 +43,7 @@ private void whenSendMessage(Integer val) {
4343
.build());
4444
}
4545

46-
private void thenPayloadInChannelIs(MessageChannel channel, Integer expectedValue) {
46+
private void thenPayloadInChannelIs(MessageChannel channel, String expectedValue) {
4747
Object payload = messageCollector.forChannel(channel)
4848
.poll()
4949
.getPayload();

‎spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ public class MultipleOutputsWithConditionsServiceIntegrationTest {
2828
@Test
2929
public void whenSendMessage_thenResponseIsInAOutput() {
3030
whenSendMessage(1);
31-
thenPayloadInChannelIs(pipe.anOutput(), 1);
31+
thenPayloadInChannelIs(pipe.anOutput(), "1");
3232
}
3333

3434
@Test
3535
public void whenSendMessage_thenResponseIsInAnotherOutput() {
3636
whenSendMessage(11);
37-
thenPayloadInChannelIs(pipe.anotherOutput(), 11);
37+
thenPayloadInChannelIs(pipe.anotherOutput(), "11");
3838
}
3939

4040
private void whenSendMessage(Integer val) {
@@ -43,7 +43,7 @@ private void whenSendMessage(Integer val) {
4343
.build());
4444
}
4545

46-
private void thenPayloadInChannelIs(MessageChannel channel, Integer expectedValue) {
46+
private void thenPayloadInChannelIs(MessageChannel channel, String expectedValue) {
4747
Object payload = messageCollector.forChannel(channel)
4848
.poll()
4949
.getPayload();

‎spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ public void whenSendMessage_thenResponseShouldUpdateText() {
3535
.poll()
3636
.getPayload();
3737

38-
assertEquals("[1]: This is my message", payload.toString());
38+
assertEquals("{\"message\":\"[1]: This is my message\"}", payload.toString());
3939
}
4040
}

‎spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
<artifactId>spring-boot-starter</artifactId>
3131
<version>${spring-boot.version}</version>
3232
</dependency>
33+
<dependency>
34+
<groupId>org.springframework.boot</groupId>
35+
<artifactId>spring-boot-starter-web</artifactId>
36+
</dependency>
3337
<dependency>
3438
<groupId>org.springframework</groupId>
3539
<artifactId>spring-web</artifactId>
@@ -56,7 +60,10 @@
5660
<artifactId>spring-cloud-starter-feign</artifactId>
5761
<version>${spring-cloud-starter-feign.version}</version>
5862
</dependency>
59-
63+
<dependency>
64+
<groupId>org.springframework.cloud</groupId>
65+
<artifactId>spring-cloud-starter-openfeign</artifactId>
66+
</dependency>
6067
<dependency>
6168
<groupId>org.springframework.boot</groupId>
6269
<artifactId>spring-boot-starter-test</artifactId>
@@ -71,7 +78,6 @@
7178
</dependencies>
7279

7380
<properties>
74-
<spring-cloud-starter-feign.version>1.2.5.RELEASE</spring-cloud-starter-feign.version>
7581
<hamcrest-core.version>1.3</hamcrest-core.version>
7682
</properties>
7783

‎spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
5-
import org.springframework.cloud.netflix.feign.EnableFeignClients;
6-
import org.springframework.cloud.netflix.feign.FeignClient;
5+
import org.springframework.cloud.openfeign.EnableFeignClients;
6+
import org.springframework.cloud.openfeign.FeignClient;
77
import org.springframework.context.annotation.Configuration;
88
import org.springframework.web.bind.annotation.RequestMapping;
99
import org.springframework.web.bind.annotation.RequestMethod;

‎spring-cloud/spring-cloud-zookeeper/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
</modules>
1919

2020
<properties>
21-
<spring-boot.version>1.5.2.RELEASE</spring-boot.version>
22-
<springframework.version>4.3.7.RELEASE</springframework.version>
21+
<springframework.version>5.2.7.RELEASE</springframework.version>
2322
<spring-cloud-starter-zookeeper-discovery.version>1.0.3.RELEASE</spring-cloud-starter-zookeeper-discovery.version>
2423
</properties>
2524

0 commit comments

Comments
 (0)