JAVA-38 Move all Spring Cloud Modules to Boot 2
This commit is contained in:
@@ -30,6 +30,10 @@
|
||||
<artifactId>spring-boot-starter</artifactId>
|
||||
<version>${spring-boot.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-web</artifactId>
|
||||
@@ -56,7 +60,10 @@
|
||||
<artifactId>spring-cloud-starter-feign</artifactId>
|
||||
<version>${spring-cloud-starter-feign.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
@@ -71,7 +78,6 @@
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
<spring-cloud-starter-feign.version>1.2.5.RELEASE</spring-cloud-starter-feign.version>
|
||||
<hamcrest-core.version>1.3</hamcrest-core.version>
|
||||
</properties>
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -18,8 +18,7 @@
|
||||
</modules>
|
||||
|
||||
<properties>
|
||||
<spring-boot.version>1.5.2.RELEASE</spring-boot.version>
|
||||
<springframework.version>4.3.7.RELEASE</springframework.version>
|
||||
<springframework.version>5.2.7.RELEASE</springframework.version>
|
||||
<spring-cloud-starter-zookeeper-discovery.version>1.0.3.RELEASE</spring-cloud-starter-zookeeper-discovery.version>
|
||||
</properties>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user