Skip to content

Commit 7d5d9b3

Browse files
lor6lor6
committed
update eureka code to boot 2
1 parent eaa890a commit 7d5d9b3

14 files changed

Lines changed: 30 additions & 49 deletions

File tree

‎spring-cloud/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
<spring-cloud-dependencies.version>Brixton.SR7</spring-cloud-dependencies.version>
5858
<spring-cloud-starter-config.version>1.2.2.RELEASE</spring-cloud-starter-config.version>
5959
<spring-cloud-config-server.version>1.2.2.RELEASE</spring-cloud-config-server.version>
60-
<spring-cloud-starter-eureka.version>1.2.3.RELEASE</spring-cloud-starter-eureka.version>
61-
<spring-cloud-starter-feign.version>1.2.3.RELEASE</spring-cloud-starter-feign.version>
60+
<spring-cloud-starter-eureka.version>2.0.2.RELEASE</spring-cloud-starter-eureka.version>
61+
<spring-cloud-starter-feign.version>1.4.6.RELEASE</spring-cloud-starter-feign.version>
6262
<spring-cloud-starter-hystrix.version>1.2.3.RELEASE</spring-cloud-starter-hystrix.version>
6363
<spring-cloud-stream.version>1.3.0.RELEASE</spring-cloud-stream.version>
6464
<spring-boot-starter-web.version>1.4.2.RELEASE</spring-boot-starter-web.version>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
</parent>
2424

2525
<properties>
26-
<spring-boot-maven-plugin.version>1.4.2.RELEASE</spring-boot-maven-plugin.version>
26+
<spring-boot.version>2.0.1.RELEASE</spring-boot.version>
27+
<spring-cloud-dependencies.version>Finchley.SR2</spring-cloud-dependencies.version>
2728
</properties>
2829

2930
</project>

‎spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,20 @@
2020
<dependencies>
2121
<dependency>
2222
<groupId>org.springframework.cloud</groupId>
23-
<artifactId>spring-cloud-starter-eureka</artifactId>
23+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
2424
<version>${spring-cloud-starter-eureka.version}</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.springframework.boot</groupId>
2828
<artifactId>spring-boot-starter-web</artifactId>
29-
<version>${spring-boot-starter-web.version}</version>
29+
<version>${spring-boot.version}</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>org.springframework.boot</groupId>
3333
<artifactId>spring-boot-starter-test</artifactId>
34-
<version>1.5.10.RELEASE</version>
34+
<version>${spring-boot.version}</version>
3535
<scope>test</scope>
3636
</dependency>
37-
<dependency>
38-
<groupId>org.springframework.boot</groupId>
39-
<artifactId>spring-boot-test</artifactId>
40-
<version>1.5.10.RELEASE</version>
41-
<scope>test</scope>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.springframework</groupId>
45-
<artifactId>spring-test</artifactId>
46-
<version>4.0.5.RELEASE</version>
47-
<scope>test</scope>
48-
</dependency>
4937
</dependencies>
5038

5139
<dependencyManagement>

‎spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@
55
import org.springframework.beans.factory.annotation.Value;
66
import org.springframework.boot.SpringApplication;
77
import org.springframework.boot.autoconfigure.SpringBootApplication;
8-
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
98
import org.springframework.context.annotation.Lazy;
10-
import org.springframework.web.bind.annotation.RequestMapping;
119
import org.springframework.web.bind.annotation.RestController;
1210

1311
@SpringBootApplication
14-
@EnableEurekaClient
1512
@RestController
1613
public class EurekaClientApplication implements GreetingController {
1714
@Autowired

‎spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,25 @@
1616
</parent>
1717

1818
<dependencies>
19-
<dependency>
20-
<groupId>com.baeldung.spring.cloud</groupId>
21-
<artifactId>spring-cloud-eureka-client</artifactId>
22-
<version>${spring-cloud-eureka-client.version}</version>
23-
</dependency>
2419
<dependency>
2520
<groupId>org.springframework.cloud</groupId>
2621
<artifactId>spring-cloud-starter-feign</artifactId>
2722
<version>${spring-cloud-starter-feign.version}</version>
2823
</dependency>
24+
<dependency>
25+
<groupId>org.springframework.cloud</groupId>
26+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
27+
<version>${spring-cloud-starter-eureka.version}</version>
28+
</dependency>
2929
<dependency>
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-web</artifactId>
32-
<version>${spring-boot-starter-web.version}</version>
32+
<version>${spring-boot.version}</version>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.springframework.boot</groupId>
3636
<artifactId>spring-boot-starter-thymeleaf</artifactId>
37-
<version>${spring-boot-starter-web.version}</version>
37+
<version>${spring-boot.version}</version>
3838
</dependency>
3939
</dependencies>
4040

‎spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.boot.SpringApplication;
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
6-
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
7-
import org.springframework.cloud.netflix.feign.EnableFeignClients;
6+
import org.springframework.cloud.openfeign.EnableFeignClients;
87
import org.springframework.stereotype.Controller;
98
import org.springframework.ui.Model;
109
import org.springframework.web.bind.annotation.RequestMapping;
1110

1211
@SpringBootApplication
13-
@EnableEurekaClient
1412
@EnableFeignClients
1513
@Controller
1614
public class FeignClientApplication {

‎spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.baeldung.spring.cloud.feign.client;
22

3-
import com.baeldung.spring.cloud.eureka.client.GreetingController;
4-
import org.springframework.cloud.netflix.feign.FeignClient;
3+
import org.springframework.cloud.openfeign.FeignClient;
4+
import org.springframework.web.bind.annotation.RequestMapping;
55

66
@FeignClient("spring-cloud-eureka-client")
7-
public interface GreetingClient extends GreetingController {
7+
public interface GreetingClient {
8+
@RequestMapping("/greeting")
9+
String greeting();
810
}

‎spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<dependencies>
1919
<dependency>
2020
<groupId>org.springframework.cloud</groupId>
21-
<artifactId>spring-cloud-starter-eureka-server</artifactId>
21+
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
2222
<version>${spring-cloud-starter-eureka.version}</version>
2323
</dependency>
2424
</dependencies>

‎spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependencies>
1818
<dependency>
1919
<groupId>org.springframework.cloud</groupId>
20-
<artifactId>spring-cloud-starter-eureka</artifactId>
20+
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
2121
<version>${spring-cloud-starter-eureka.version}</version>
2222
</dependency>
2323
<dependency>

‎spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ spring:
33
name: spring-cloud-eureka-client
44

55
server:
6-
port: 8081
6+
port: 8082
77

88
eureka:
99
client:

0 commit comments

Comments
 (0)