Upgrade Spring Boot to 3.5.13 and Spring Cloud to 2025.0.1

- Bump Spring Boot from 3.2.4 to 3.5.13
- Bump Spring Cloud from 2023.0.5 to 2025.0.1 (compatible with Boot 3.5.x)
- Remove commons-io dependency from FeignErrorDecoder, use
  InputStream.readAllBytes() instead (commons-io is no longer a
  transitive dependency of Spring Cloud 2025.0.x)
- Fix duplicate WireMock stub mapping IDs that caused
  InvalidInputException with newer WireMock versions

Author: linusnorton

build.gradle

@@ -4,7 +4,7 @@ import java.io.File
 plugins {
     id 'checkstyle'
     id 'io.spring.dependency-management' version '1.1.7'
-    id 'org.springframework.boot' version '3.2.4'
+    id 'org.springframework.boot' version '3.5.13'
     id 'com.github.ben-manes.versions' version '0.53.0'
     id 'java-library'
     id 'maven-publish'

src/main/java/uk/gov/hmcts/reform/payments/client/config/FeignErrorDecoder.java

@@ -3,11 +3,9 @@
 import feign.Response;
 import feign.codec.ErrorDecoder;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
 import uk.gov.hmcts.reform.payments.client.InvalidPaymentRequestException;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
 @Slf4j
@@ -36,8 +34,7 @@ public Exception decode(String methodKey, Response response) {
 
     private byte[] getBytes(Response response) {
         try {
-            InputStream inputStream = response.body().asInputStream();
-            return IOUtils.toByteArray(inputStream);
+            return response.body().asInputStream().readAllBytes();
         } catch (IOException e) {
             log.error("Failed to read the response body with error: ", e);
         }

src/test/resources/mappings/gov-pay-card-payment-status-successful.json

@@ -1,5 +1,5 @@
 {
-  "id" : "f4db6fd2-dea4-4a3a-80df-643b2cf1344d",
+  "id" : "f4db6fd2-dea4-4a3a-80df-643b2cf1344e",
   "name" : "card-payments_rc-1701-0909-0602-0418",
   "request" : {
     "url" : "/card-payments/RC-1701-0909-0602-0418/statuses",
@@ -19,6 +19,6 @@
       "Date" : "Mon, 19 Aug 2019 10:09:15 GMT"
     }
   },
-  "uuid" : "f4db6fd2-dea4-4a3a-80df-643b2cf1344d",
+  "uuid" : "f4db6fd2-dea4-4a3a-80df-643b2cf1344e",
   "persistent" : true
 }

src/test/resources/mappings/gov-pay-create-card-payment-successful.json

@@ -1,5 +1,5 @@
 {
-  "id": "603a01d7-0c0b-494d-ba4c-0d7165238522",
+  "id": "703a01d7-0c0b-494d-ba4c-0d7165238522",
   "name": "gov-pay-card-payments",
   "request": {
     "url": "/service-request/2023-1701090705688/card-payments",
@@ -26,6 +26,6 @@
       "Date": "Mon, 19 Aug 2019 09:46:54 GMT"
     }
   },
-  "uuid": "603a01d7-0c0b-494d-ba4c-0d7165238522",
+  "uuid": "703a01d7-0c0b-494d-ba4c-0d7165238522",
   "persistent": true
 }