From 13abe69182a839bd3e91104987f892b06cfda265 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 26 May 2026 18:56:33 +0000 Subject: [PATCH 1/4] COG-559: Update pom.xml - Java 21, Spring Boot 3.4.5, httpclient5, remove junit-vintage exclusion --- monolith/pom.xml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/monolith/pom.xml b/monolith/pom.xml index ea80738..7b90390 100644 --- a/monolith/pom.xml +++ b/monolith/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.6.RELEASE + 3.4.5 com.javieraviles @@ -16,7 +16,7 @@ Monolith handling orders, customers and products - 11 + 21 @@ -41,19 +41,13 @@ runtime - org.apache.httpcomponents - httpclient + org.apache.httpcomponents.client5 + httpclient5 org.springframework.boot spring-boot-starter-test test - - - org.junit.vintage - junit-vintage-engine - - From 7c66054ddb7012b7f57a0fb3ef287ca902f366b6 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Fri, 29 May 2026 15:21:39 +0000 Subject: [PATCH 2/4] COG-559: Migrate httpclient imports to httpclient5 --- .../splitthemonolith/SplitTheMonolithApplication.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/SplitTheMonolithApplication.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/SplitTheMonolithApplication.java index 2dad801..bb9d047 100644 --- a/monolith/src/main/java/com/javieraviles/splitthemonolith/SplitTheMonolithApplication.java +++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/SplitTheMonolithApplication.java @@ -3,8 +3,8 @@ import java.math.BigDecimal; import java.time.LocalDate; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; From fb6815c55af43e361e6564bc4af61f8cee618f62 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Fri, 29 May 2026 15:21:49 +0000 Subject: [PATCH 3/4] COG-559: Migrate javax.persistence/validation to jakarta namespace --- .../splitthemonolith/dto/RfqDto.java | 4 +-- .../dto/TradeConfirmationDto.java | 2 +- .../splitthemonolith/entity/Bond.java | 12 ++++----- .../splitthemonolith/entity/Counterparty.java | 16 ++++++------ .../splitthemonolith/entity/Rfq.java | 26 +++++++++---------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/RfqDto.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/RfqDto.java index c36ec60..fcee6ea 100644 --- a/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/RfqDto.java +++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/RfqDto.java @@ -3,8 +3,8 @@ import java.math.BigDecimal; import java.time.Instant; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; import com.javieraviles.splitthemonolith.entity.RfqStatus; import com.javieraviles.splitthemonolith.entity.Side; diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/TradeConfirmationDto.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/TradeConfirmationDto.java index 6f4c345..cfe29e9 100644 --- a/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/TradeConfirmationDto.java +++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/dto/TradeConfirmationDto.java @@ -2,7 +2,7 @@ import java.math.BigDecimal; -import javax.validation.constraints.Positive; +import jakarta.validation.constraints.Positive; public class TradeConfirmationDto { diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Bond.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Bond.java index 9504e16..8454ec2 100644 --- a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Bond.java +++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Bond.java @@ -3,12 +3,12 @@ import java.math.BigDecimal; import java.time.LocalDate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.validation.constraints.PositiveOrZero; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.validation.constraints.PositiveOrZero; import com.javieraviles.splitthemonolith.exception.InsufficientNotionalException; diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Counterparty.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Counterparty.java index de7aedc..b247879 100644 --- a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Counterparty.java +++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Counterparty.java @@ -2,14 +2,14 @@ import java.math.BigDecimal; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.PrePersist; -import javax.validation.constraints.PositiveOrZero; -import javax.validation.constraints.Size; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.validation.constraints.PositiveOrZero; +import jakarta.validation.constraints.Size; import com.javieraviles.splitthemonolith.exception.InsufficientCreditException; diff --git a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Rfq.java b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Rfq.java index e90d630..01df1cd 100644 --- a/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Rfq.java +++ b/monolith/src/main/java/com/javieraviles/splitthemonolith/entity/Rfq.java @@ -3,19 +3,19 @@ import java.math.BigDecimal; import java.time.Instant; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.PrePersist; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.PrePersist; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; @Entity(name = "rfqs") public class Rfq { From ac551be25c87f472af0e769ec737d0df61babbb9 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Fri, 29 May 2026 15:27:26 +0000 Subject: [PATCH 4/4] COG-559: Add spring-boot-starter-validation for jakarta.validation support --- monolith/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/monolith/pom.xml b/monolith/pom.xml index 7b90390..7298b9a 100644 --- a/monolith/pom.xml +++ b/monolith/pom.xml @@ -28,6 +28,10 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-validation + org.springframework.boot