From ebea641e0b14a95e750a6d797a82503540dec190 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Wed, 11 Jun 2025 14:52:08 +0200 Subject: [PATCH 1/2] Upgrade to Spring Boot 4.0.0 and Spring Cloud 5.0.0. Fixes #1412 --- pom.xml | 2 +- spring-cloud-aws-dependencies/pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 80a5b3f7b..6ca65eee2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-build - 4.3.0 + 5.0.0-SNAPSHOT diff --git a/spring-cloud-aws-dependencies/pom.xml b/spring-cloud-aws-dependencies/pom.xml index 3f37598a4..587f82e3a 100644 --- a/spring-cloud-aws-dependencies/pom.xml +++ b/spring-cloud-aws-dependencies/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.3.0 + 5.0.0-SNAPSHOT @@ -28,10 +28,10 @@ 2.0.5 3.3.5 1.6 - 4.3.0 + 5.0.0-SNAPSHOT 2.1.3 2.0.3 - 1.4.0 + 2.0.0-SNAPSHOT 2.3.0 From c8222432b5ef1fe16dd407d9f3da1471211b5109 Mon Sep 17 00:00:00 2001 From: Maciej Walkowiak Date: Wed, 11 Jun 2025 15:05:40 +0200 Subject: [PATCH 2/2] Fix test --- .../SnsControllerMappingReflectiveProcessorTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/endpoint/SnsControllerMappingReflectiveProcessorTest.java b/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/endpoint/SnsControllerMappingReflectiveProcessorTest.java index b27ca31b2..b0b9c3451 100644 --- a/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/endpoint/SnsControllerMappingReflectiveProcessorTest.java +++ b/spring-cloud-aws-sns/src/test/java/io/awspring/cloud/sns/endpoint/SnsControllerMappingReflectiveProcessorTest.java @@ -48,7 +48,7 @@ void registerReflectiveHintsForMethodHandleSubscribe() throws NoSuchMethodExcept .isEqualTo(TypeReference.of(ComplexNotificationTestController.class)), typeHint -> { assertThat(typeHint.getType()).isEqualTo(TypeReference.of(NotificationStatus.class)); assertThat(typeHint.getMemberCategories()).containsExactlyInAnyOrder( - MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS); + MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.ACCESS_DECLARED_FIELDS); }); } @@ -63,7 +63,7 @@ void registerReflectiveHintsForMethodHandleNotificationMessage() throws NoSuchMe }, typeHint -> { assertThat(typeHint.getType()).isEqualTo(TypeReference.of(Person.class)); assertThat(typeHint.getMemberCategories()).containsExactlyInAnyOrder( - MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS); + MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.ACCESS_DECLARED_FIELDS); assertThat(typeHint.methods()).satisfiesExactlyInAnyOrder( hint -> assertThat(hint.getName()).isEqualTo("getFirstName"), hint -> assertThat(hint.getName()).isEqualTo("setFirstName"), @@ -81,7 +81,7 @@ void registerReflectiveHintsForMethodHandleUnsubscribe() throws NoSuchMethodExce .isEqualTo(TypeReference.of(ComplexNotificationTestController.class)), typeHint -> { assertThat(typeHint.getType()).isEqualTo(TypeReference.of(NotificationStatus.class)); assertThat(typeHint.getMemberCategories()).containsExactlyInAnyOrder( - MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.DECLARED_FIELDS); + MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.ACCESS_DECLARED_FIELDS); }); }