From 6dbdb8fa5723ea82eeb0c60738f180c3b0959e3c Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 26 Jul 2021 16:07:38 +0200 Subject: [PATCH 1/2] Bumped Boot to 2.4.10-SNAPSHOT --- bootstrap/pom.xml | 2 +- bus/pom.xml | 2 +- config-client-decrypt/pom.xml | 2 +- config-client/pom.xml | 2 +- config-retry/pom.xml | 2 +- configserver-bootstrap/pom.xml | 2 +- configserver-eureka/pom.xml | 2 +- configserver/pom.xml | 2 +- eureka-client/pom.xml | 2 +- eureka-first/pom.xml | 2 +- eureka-noweb/pom.xml | 2 +- eureka-server/pom.xml | 2 +- feign-eager-instantiation/pom.xml | 2 +- feign-eureka/pom.xml | 2 +- feign/pom.xml | 2 +- netflix-sidecar/pom.xml | 2 +- noweb/pom.xml | 2 +- oauth2-ribbon/pom.xml | 2 +- pom.xml | 2 +- ribbon-default-config/pom.xml | 2 +- ribbon-eureka/pom.xml | 2 +- scripts/runAcceptanceTests.sh | 2 +- sleuth/pom.xml | 2 +- stream-bus/pom.xml | 2 +- vanilla/pom.xml | 2 +- zipkin/pom.xml | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index e6616aa..59c959a 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/bus/pom.xml b/bus/pom.xml index dcbe043..22b58a9 100644 --- a/bus/pom.xml +++ b/bus/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml index 42964a3..2f1442f 100644 --- a/config-client-decrypt/pom.xml +++ b/config-client-decrypt/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/config-client/pom.xml b/config-client/pom.xml index 6ef033f..b92fc73 100644 --- a/config-client/pom.xml +++ b/config-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/config-retry/pom.xml b/config-retry/pom.xml index 699b533..88b0408 100644 --- a/config-retry/pom.xml +++ b/config-retry/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/configserver-bootstrap/pom.xml b/configserver-bootstrap/pom.xml index ec78f4a..ac27cd7 100644 --- a/configserver-bootstrap/pom.xml +++ b/configserver-bootstrap/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/configserver-eureka/pom.xml b/configserver-eureka/pom.xml index 73d4793..5aa0792 100644 --- a/configserver-eureka/pom.xml +++ b/configserver-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/configserver/pom.xml b/configserver/pom.xml index 3e3418c..31229e1 100644 --- a/configserver/pom.xml +++ b/configserver/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/eureka-client/pom.xml b/eureka-client/pom.xml index a90f03a..d8c9275 100644 --- a/eureka-client/pom.xml +++ b/eureka-client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/eureka-first/pom.xml b/eureka-first/pom.xml index e72644d..c2c5940 100644 --- a/eureka-first/pom.xml +++ b/eureka-first/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/eureka-noweb/pom.xml b/eureka-noweb/pom.xml index f530734..63e5df3 100644 --- a/eureka-noweb/pom.xml +++ b/eureka-noweb/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml index ad7fc01..0e0033b 100644 --- a/eureka-server/pom.xml +++ b/eureka-server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/feign-eager-instantiation/pom.xml b/feign-eager-instantiation/pom.xml index cd47cdf..ab01594 100644 --- a/feign-eager-instantiation/pom.xml +++ b/feign-eager-instantiation/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/feign-eureka/pom.xml b/feign-eureka/pom.xml index 759b0d4..271b10a 100644 --- a/feign-eureka/pom.xml +++ b/feign-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/feign/pom.xml b/feign/pom.xml index 157d8a1..e17c0ca 100644 --- a/feign/pom.xml +++ b/feign/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/netflix-sidecar/pom.xml b/netflix-sidecar/pom.xml index a603760..cef5e7e 100644 --- a/netflix-sidecar/pom.xml +++ b/netflix-sidecar/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/noweb/pom.xml b/noweb/pom.xml index e2e9dbb..c367f6f 100644 --- a/noweb/pom.xml +++ b/noweb/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/oauth2-ribbon/pom.xml b/oauth2-ribbon/pom.xml index a9c6d00..d2f93d5 100644 --- a/oauth2-ribbon/pom.xml +++ b/oauth2-ribbon/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/pom.xml b/pom.xml index 38e745c..db4f3ff 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT spring-cloud-tests diff --git a/ribbon-default-config/pom.xml b/ribbon-default-config/pom.xml index aeb2d98..89e600c 100644 --- a/ribbon-default-config/pom.xml +++ b/ribbon-default-config/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/ribbon-eureka/pom.xml b/ribbon-eureka/pom.xml index 8a633a7..8e4ead4 100644 --- a/ribbon-eureka/pom.xml +++ b/ribbon-eureka/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/scripts/runAcceptanceTests.sh b/scripts/runAcceptanceTests.sh index 106fcb4..29da0a1 100755 --- a/scripts/runAcceptanceTests.sh +++ b/scripts/runAcceptanceTests.sh @@ -21,7 +21,7 @@ function cloudVersion() { CURRENT_BOOT_VERSION="${CURRENT_BOOT_VERSION:-}" CURRENT_CLOUD_VERSION="${CURRENT_CLOUD_VERSION:-}" #[[ -z "${CURRENT_BOOT_VERSION}" ]] && CURRENT_BOOT_VERSION="$( bootVersion "2.4" )" -CURRENT_BOOT_VERSION="2.4.7-SNAPSHOT" +CURRENT_BOOT_VERSION="2.4.10-SNAPSHOT" [[ -z "${CURRENT_CLOUD_VERSION}" ]] && CURRENT_CLOUD_VERSION="$( cloudVersion "2020.0.4-SNAPSHOT" )" function build() { diff --git a/sleuth/pom.xml b/sleuth/pom.xml index 86584a9..cb99552 100644 --- a/sleuth/pom.xml +++ b/sleuth/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/stream-bus/pom.xml b/stream-bus/pom.xml index c5fde13..c3ef943 100644 --- a/stream-bus/pom.xml +++ b/stream-bus/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/vanilla/pom.xml b/vanilla/pom.xml index 6f244ac..e2b2790 100644 --- a/vanilla/pom.xml +++ b/vanilla/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT diff --git a/zipkin/pom.xml b/zipkin/pom.xml index 1292d91..6cbb25d 100644 --- a/zipkin/pom.xml +++ b/zipkin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.7-SNAPSHOT + 2.4.10-SNAPSHOT From 48b42d8d57167d4c9229d4cf2631bb1c66afc2a9 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 29 Oct 2021 11:16:09 -0400 Subject: [PATCH 2/2] Moves requestmapping out of interface on to method --- feign/src/main/java/demo/FeignClientApplication.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/feign/src/main/java/demo/FeignClientApplication.java b/feign/src/main/java/demo/FeignClientApplication.java index 2235d11..25615a7 100644 --- a/feign/src/main/java/demo/FeignClientApplication.java +++ b/feign/src/main/java/demo/FeignClientApplication.java @@ -4,8 +4,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.GetMapping; @SpringBootApplication @EnableFeignClients @@ -17,8 +16,7 @@ public class FeignClientApplication { } @FeignClient(name = "example", url = "https://example.com") -@RequestMapping("/") interface RestClient { - @RequestMapping(method = RequestMethod.GET) + @GetMapping("/") String hello(); }