From e3058691b281c51ffd2df5668731714930d71cc5 Mon Sep 17 00:00:00 2001 From: Gaetano Piazzolla Date: Tue, 27 Jun 2023 12:51:25 +0200 Subject: [PATCH] JAVA-22499 | Upgraded spring-boot and removed hybernate-validator to use 3.0.0.Final version of the spring-boot 3 (#14315) --- javaxval-2/pom.xml | 26 +------------------ .../hibernate/validator/ap/Message.java | 8 +++--- .../javaxval/messageinterpolator/Person.java | 6 ++--- .../ConsistentDateParameterValidator.java | 8 +++--- .../constraints/ConsistentDateParameters.java | 4 +-- .../constraints/ValidReservation.java | 4 +-- .../ValidReservationValidator.java | 4 +-- .../methodvalidation/model/Customer.java | 4 +-- .../methodvalidation/model/Reservation.java | 4 +-- .../model/ReservationManagement.java | 10 +++---- .../notnull/NotNullMethodParameter.java | 8 +++--- .../javaxval/notnull/ValidatingComponent.java | 2 +- ...terMessageInterpolaterIntegrationTest.java | 8 +++--- .../ContainerValidationIntegrationTest.java | 2 +- .../ValidationIntegrationTest.java | 8 +++--- .../ValidatingComponentIntegrationTest.java | 6 ++--- 16 files changed, 45 insertions(+), 67 deletions(-) diff --git a/javaxval-2/pom.xml b/javaxval-2/pom.xml index 5c311e10f8..7d84b4ce9b 100644 --- a/javaxval-2/pom.xml +++ b/javaxval-2/pom.xml @@ -14,26 +14,6 @@ - - org.hibernate.validator - hibernate-validator - ${hibernate-validator.version} - - - org.glassfish - javax.el - ${javax.el.version} - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-test - ${org.springframework.version} - org.springframework.boot spring-boot-starter-validation @@ -58,11 +38,7 @@ - 6.2.3.Final - 6.2.0.Final - 3.0.0 - 5.3.21 - 2.7.1 + 3.0.4 \ No newline at end of file diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/hibernate/validator/ap/Message.java b/javaxval-2/src/main/java/com/baeldung/javaxval/hibernate/validator/ap/Message.java index 2d9b1141ec..c6cd443cf2 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/hibernate/validator/ap/Message.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/hibernate/validator/ap/Message.java @@ -1,11 +1,13 @@ package com.baeldung.javaxval.hibernate.validator.ap; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Past; + import java.util.List; import java.util.Optional; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; + public class Message { diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/messageinterpolator/Person.java b/javaxval-2/src/main/java/com/baeldung/javaxval/messageinterpolator/Person.java index 387af48c20..df5b959bfe 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/messageinterpolator/Person.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/messageinterpolator/Person.java @@ -1,8 +1,8 @@ package com.baeldung.javaxval.messageinterpolator; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Size; public class Person { diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java index 6b48046b5c..38da3b46f6 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameterValidator.java @@ -2,10 +2,10 @@ package com.baeldung.javaxval.methodvalidation.constraints; import java.time.LocalDate; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.constraintvalidation.SupportedValidationTarget; -import javax.validation.constraintvalidation.ValidationTarget; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.constraintvalidation.SupportedValidationTarget; +import jakarta.validation.constraintvalidation.ValidationTarget; @SupportedValidationTarget(ValidationTarget.PARAMETERS) public class ConsistentDateParameterValidator implements ConstraintValidator { diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java index 83f551d45f..23c9cc67e6 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ConsistentDateParameters.java @@ -8,8 +8,8 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Constraint(validatedBy = ConsistentDateParameterValidator.class) @Target({ METHOD, CONSTRUCTOR }) diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java index c28cc79004..0a4000e32f 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservation.java @@ -8,8 +8,8 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Constraint(validatedBy = ValidReservationValidator.class) @Target({ METHOD, CONSTRUCTOR }) diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java index 541fc15e9c..699c8309cc 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/constraints/ValidReservationValidator.java @@ -2,8 +2,8 @@ package com.baeldung.javaxval.methodvalidation.constraints; import java.time.LocalDate; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import com.baeldung.javaxval.methodvalidation.model.Reservation; diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/Customer.java b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/Customer.java index e0b7fcf917..ba1c1cd341 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/Customer.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/Customer.java @@ -1,7 +1,7 @@ package com.baeldung.javaxval.methodvalidation.model; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.springframework.validation.annotation.Validated; diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/Reservation.java b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/Reservation.java index a6d5ab42b1..7b41cfba33 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/Reservation.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/Reservation.java @@ -2,8 +2,8 @@ package com.baeldung.javaxval.methodvalidation.model; import java.time.LocalDate; -import javax.validation.Valid; -import javax.validation.constraints.Positive; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Positive; import org.springframework.validation.annotation.Validated; diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/ReservationManagement.java b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/ReservationManagement.java index ec71502119..2170c633cf 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/ReservationManagement.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/methodvalidation/model/ReservationManagement.java @@ -3,11 +3,11 @@ package com.baeldung.javaxval.methodvalidation.model; import java.time.LocalDate; import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.Future; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Future; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/notnull/NotNullMethodParameter.java b/javaxval-2/src/main/java/com/baeldung/javaxval/notnull/NotNullMethodParameter.java index 47f0ee69fe..8b950b81ab 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/notnull/NotNullMethodParameter.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/notnull/NotNullMethodParameter.java @@ -1,9 +1,9 @@ package com.baeldung.javaxval.notnull; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.NotNull; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotNull; public class NotNullMethodParameter { diff --git a/javaxval-2/src/main/java/com/baeldung/javaxval/notnull/ValidatingComponent.java b/javaxval-2/src/main/java/com/baeldung/javaxval/notnull/ValidatingComponent.java index dc6db0b7b7..eedfeda962 100644 --- a/javaxval-2/src/main/java/com/baeldung/javaxval/notnull/ValidatingComponent.java +++ b/javaxval-2/src/main/java/com/baeldung/javaxval/notnull/ValidatingComponent.java @@ -1,6 +1,6 @@ package com.baeldung.javaxval.notnull; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.springframework.stereotype.Component; import org.springframework.validation.annotation.Validated; diff --git a/javaxval-2/src/test/java/com/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java b/javaxval-2/src/test/java/com/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java index a60550aca5..99c1a15a04 100644 --- a/javaxval-2/src/test/java/com/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java +++ b/javaxval-2/src/test/java/com/baeldung/javaxval/messageinterpolator/ParameterMessageInterpolaterIntegrationTest.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator; import org.junit.BeforeClass; diff --git a/javaxval-2/src/test/java/com/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java b/javaxval-2/src/test/java/com/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java index 1a66bf3c59..0159d984fb 100644 --- a/javaxval-2/src/test/java/com/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java +++ b/javaxval-2/src/test/java/com/baeldung/javaxval/methodvalidation/ContainerValidationIntegrationTest.java @@ -3,7 +3,7 @@ package com.baeldung.javaxval.methodvalidation; import java.time.LocalDate; import java.util.List; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.Rule; import org.junit.Test; diff --git a/javaxval-2/src/test/java/com/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java b/javaxval-2/src/test/java/com/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java index 5713e0b10b..fcf04ef086 100644 --- a/javaxval-2/src/test/java/com/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java +++ b/javaxval-2/src/test/java/com/baeldung/javaxval/methodvalidation/ValidationIntegrationTest.java @@ -8,10 +8,10 @@ import java.time.LocalDate; import java.util.Collections; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; -import javax.validation.executable.ExecutableValidator; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.executable.ExecutableValidator; import org.junit.Before; import org.junit.Test; diff --git a/javaxval-2/src/test/java/com/baeldung/javaxval/notnull/ValidatingComponentIntegrationTest.java b/javaxval-2/src/test/java/com/baeldung/javaxval/notnull/ValidatingComponentIntegrationTest.java index e18ab38a61..92f86005bd 100644 --- a/javaxval-2/src/test/java/com/baeldung/javaxval/notnull/ValidatingComponentIntegrationTest.java +++ b/javaxval-2/src/test/java/com/baeldung/javaxval/notnull/ValidatingComponentIntegrationTest.java @@ -6,9 +6,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Set; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.NotNull; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.NotNull; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired;