Skip to content

Upgrade Spring Boot to 3.5.13 and Spring Cloud to 2025.0.1 #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
linusnorton merged 2 commits into from
Mar 31, 2026
Merged

Upgrade Spring Boot to 3.5.13 and Spring Cloud to 2025.0.1 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b362d93
Update dependency org.springframework.cloud:spring-cloud-dependencies…
renovate[bot] Mar 31, 2026
c8f1e31
Upgrade Spring Boot to 3.5.13 and Spring Cloud to 2025.0.1
linusnorton Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -94,7 +94,7 @@ test {

ext {
lombokVersion = '1.18.44'
springCloudVersion = '2023.0.5'
springCloudVersion = '2025.0.1'
feignVersion = '13.11'
}

Expand Down
5 changes: 1 addition & 4 deletions src/main/java/uk/gov/hmcts/reform/payments/client/config/FeignErrorDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/resources/mappings/gov-pay-card-payment-status-successful.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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
}
4 changes: 2 additions & 2 deletions src/test/resources/mappings/gov-pay-create-card-payment-successful.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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
}