From b9a24f458c6e9c5331b2362f58eb36e5c244de5e Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Thu, 26 Mar 2020 13:17:57 +0000 Subject: [PATCH 1/2] HHH-13950 Update to Bean Validation 3 preview: Hibernate Validator 7.0.0.Alpha1 We apply the update int two steps: - some hand-rolled changes, such as switching the dependency to the new Hibernate Validator preview build - running a replace-all scripts This individual commit represents the first set of changes. When porting this change to a different branch, this one should be cherry picked while the second change is better ported by running the same script once again. --- gradle/libraries.gradle | 10 +++++----- .../hibernate/cfg/beanvalidation/ValidationMode.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle index aac04d3f91e5..a15375fa36e8 100644 --- a/gradle/libraries.gradle +++ b/gradle/libraries.gradle @@ -15,9 +15,9 @@ ext { jnpVersion = '5.0.6.CR1' hibernateCommonsVersion = '5.1.0.Final' - hibernateValidatorVersion = '6.0.13.Final' - validationApiVersion = '2.0.1.Final' - elVersion = '3.0.1-b09' + hibernateValidatorVersion = '7.0.0.Alpha1' // Preview of Jakarta EE 9 (Validation 3.0) + validationApiVersion = '3.0.0-M1' // Preview of Jakarta EE 9 (Validation 3.0) + elVersion = '4.0.0-RC1' // Preview of Jakarta EE 9 : dependency of Validation 3.0 cdiVersion = '2.0' weldVersion = '3.0.0.Final' @@ -70,7 +70,7 @@ ext { // javax jpa: "javax.persistence:javax.persistence-api:${project.jpaVersion}", jta: 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final', - validation: "javax.validation:validation-api:${validationApiVersion}", + validation: "jakarta.validation:jakarta.validation-api:${validationApiVersion}", jacc: 'org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:1.0.2.Final', interceptor: 'javax.interceptor:javax.interceptor-api:1.2', // required by JAXB from JDK 9 as it is not available anymore in JDK 9 @@ -132,7 +132,7 @@ ext { validator: "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}", // EL required by Hibernate Validator at test runtime - expression_language: "org.glassfish:javax.el:${elVersion}", + expression_language: "org.glassfish:jakarta.el:${elVersion}", c3p0: "com.mchange:c3p0:0.9.5.3", ehcache: "net.sf.ehcache:ehcache:2.10.6", diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java index 8f7628c73fd9..1aa1568ec0f2 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java @@ -13,7 +13,7 @@ import org.hibernate.HibernateException; /** - * Duplicates the javax.validation enum (because javax validation might not be on the runtime classpath) + * Duplicates the jakarta.validation enum (because jakarta validation might not be on the runtime classpath) * * @author Steve Ebersole */ From 60abc8aa764929920478888d1d6b08b95df3846a Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Mon, 20 Apr 2020 12:09:42 +0100 Subject: [PATCH 2/2] HHH-13950 Apply the mass replace script to switch to Jakarta Validation API For reference, this is the script being applied: find . -type f -name '*\..java' -o -name '*.\.adoc' -o -name '*.\.gradle' | xargs sed -i 's/javax\.validation/jakarta\.validation/g' --- .../userguide/appendices/Configurations.adoc | 4 ++-- hibernate-core/hibernate-core.gradle | 10 +++++----- .../BeanValidationEventListener.java | 12 +++++------ .../BeanValidationIntegrator.java | 2 +- .../beanvalidation/GroupsPerOperation.java | 2 +- .../HibernateTraversableResolver.java | 4 ++-- .../cfg/beanvalidation/TypeSafeActivator.java | 20 +++++++++---------- .../beanvalidation/BeanValidationTest.java | 2 +- .../jpa/test/beanvalidation/CupHolder.java | 4 ++-- .../jpa/test/beanvalidation/ValidTitle.java | 6 +++--- .../ValidatorFactory2PhaseInjectionTest.java | 4 ++-- .../NativeQueryOrdinalParametersTest.java | 4 ++-- .../annotations/beanvalidation/Address.java | 12 +++++------ .../BeanValidationAutoTest.java | 2 +- .../BeanValidationDisabledTest.java | 2 +- .../BeanValidationGroupsTest.java | 6 +++--- .../BeanValidationProvidedFactoryTest.java | 10 +++++----- .../annotations/beanvalidation/Button.java | 4 ++-- .../annotations/beanvalidation/Color.java | 2 +- .../annotations/beanvalidation/CupHolder.java | 4 ++-- .../DDLWithoutCallbackTest.java | 2 +- .../annotations/beanvalidation/Display.java | 2 +- .../beanvalidation/DisplayConnector.java | 4 ++-- .../HibernateTraversableResolverTest.java | 4 ++-- .../MergeNotNullCollectionTest.java | 4 ++-- ...rgeNotNullCollectionUsingIdentityTest.java | 4 ++-- .../annotations/beanvalidation/MinMax.java | 4 ++-- .../beanvalidation/PowerSupply.java | 4 ++-- .../test/annotations/beanvalidation/Rock.java | 2 +- .../annotations/beanvalidation/Screen.java | 4 ++-- .../test/annotations/beanvalidation/Tv.java | 10 +++++----- .../annotations/beanvalidation/TvOwner.java | 2 +- ...EmbeddableWithOneToMany_HHH_8564_Test.java | 6 +++--- .../test/annotations/onetomany/A.java | 2 +- .../test/annotations/onetomany/B.java | 2 +- .../test/annotations/onetomany/C.java | 2 +- .../onetoone/hhh9798/Shipment.java | 2 +- .../annotations/uniqueconstraint/House.java | 2 +- .../UninitializedAssociationsInCacheTest.java | 2 +- .../mapsid/MapsIdOneToOneSelectTest.java | 2 +- .../test/formulajoin/AnnotatedMaster.java | 2 +- 41 files changed, 92 insertions(+), 92 deletions(-) diff --git a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc index 9e5c0b66cfb2..a34564ed6fe4 100644 --- a/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc +++ b/documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc @@ -385,8 +385,8 @@ Unless specified, the JDBC Driver uses the default JVM time zone. If a different This setting applies to Oracle Dialect only, and it specifies whether `byte[]` or `Byte[]` arrays should be mapped to the deprecated `LONG RAW` (when this configuration property value is `true`) or to a `BLOB` column type (when this configuration property value is `false`). ==== Bean Validation options -`*javax.persistence.validation.factory*` (e.g. `javax.validation.ValidationFactory` implementation):: -Specify the `javax.validation.ValidationFactory` implementation to use for Bean Validation. +`*javax.persistence.validation.factory*` (e.g. `jakarta.validation.ValidationFactory` implementation):: +Specify the `jakarta.validation.ValidationFactory` implementation to use for Bean Validation. `*hibernate.check_nullability*` (e.g. `true` or `false`):: Enable nullability checking. Raises an exception if a property marked as not-null is null. diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index 9ebf39b72fd8..b889ea93fb21 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -138,11 +138,11 @@ jar { 'javax.security.auth;resolution:=optional', // Make javax.security.jacc optional and do not reference a version range (because that's what we used to do) 'javax.security.jacc;resolution:=optional;version=!', - // Make javax.validation optional and do not reference a version range (because that's what we used to do) - 'javax.validation;resolution:=optional;version=!', - 'javax.validation.constraints;resolution:=optional;version=!', - 'javax.validation.groups;resolution:=optional;version=!', - 'javax.validation.metadata;resolution:=optional;version=!', + // Make jakarta.validation optional and do not reference a version range (because that's what we used to do) + 'jakarta.validation;resolution:=optional;version=!', + 'jakarta.validation.constraints;resolution:=optional;version=!', + 'jakarta.validation.groups;resolution:=optional;version=!', + 'jakarta.validation.metadata;resolution:=optional;version=!', // Make javax.enterprise optional and do not reference a version range (because that's what we used to do) '!javax.enterprise*', 'javax.enterprise.context.spi;resolution:=optional;version=!', diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java index c147e7486ea1..316362054874 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java @@ -10,12 +10,12 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.TraversableResolver; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.TraversableResolver; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.hibernate.EntityMode; import org.hibernate.boot.internal.ClassLoaderAccessImpl; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java index 94dcbe2e2e52..8d47b39355e8 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java @@ -32,7 +32,7 @@ public class BeanValidationIntegrator implements Integrator { public static final String APPLY_CONSTRAINTS = "hibernate.validator.apply_to_ddl"; - public static final String BV_CHECK_CLASS = "javax.validation.Validation"; + public static final String BV_CHECK_CLASS = "jakarta.validation.Validation"; public static final String MODE_PROPERTY = "javax.persistence.validation.mode"; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java index eb359d57d6a5..9faa9fe74c9b 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.validation.groups.Default; +import jakarta.validation.groups.Default; import org.hibernate.HibernateException; import org.hibernate.boot.registry.classloading.spi.ClassLoadingException; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java index 673e3fbdebae..ff0e343e8948 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java @@ -9,8 +9,8 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import javax.validation.Path; -import javax.validation.TraversableResolver; +import jakarta.validation.Path; +import jakarta.validation.TraversableResolver; import org.hibernate.Hibernate; import org.hibernate.annotations.common.AssertionFailure; diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java index 50e3ee850fb1..75b0f8e50034 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java @@ -15,16 +15,16 @@ import java.util.Map; import java.util.Set; import java.util.StringTokenizer; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.Digits; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.validation.metadata.BeanDescriptor; -import javax.validation.metadata.ConstraintDescriptor; -import javax.validation.metadata.PropertyDescriptor; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.Digits; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.validation.metadata.BeanDescriptor; +import jakarta.validation.metadata.ConstraintDescriptor; +import jakarta.validation.metadata.PropertyDescriptor; import org.hibernate.AssertionFailure; import org.hibernate.MappingException; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/BeanValidationTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/BeanValidationTest.java index 7e811e2787d9..0684e9519359 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/BeanValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/BeanValidationTest.java @@ -10,7 +10,7 @@ import java.util.Map; import javax.persistence.EntityManager; import javax.persistence.RollbackException; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.beanvalidation.ValidationMode; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/CupHolder.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/CupHolder.java index 1a5c3f064cc0..cd2ab6ca8e9a 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/CupHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/CupHolder.java @@ -10,8 +10,8 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidTitle.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidTitle.java index 64289598922f..637835230906 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidTitle.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidTitle.java @@ -9,9 +9,9 @@ import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; -import javax.validation.constraints.Size; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import jakarta.validation.constraints.Size; import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.FIELD; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidatorFactory2PhaseInjectionTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidatorFactory2PhaseInjectionTest.java index d567c9c22f72..9a2cc326a9e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidatorFactory2PhaseInjectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidatorFactory2PhaseInjectionTest.java @@ -10,8 +10,8 @@ import java.util.Collections; import javax.persistence.EntityManagerFactory; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import org.hibernate.jpa.AvailableSettings; import org.hibernate.jpa.HibernatePersistenceProvider; diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java index 39824843d1a6..ad5478d73e8f 100644 --- a/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java +++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java @@ -14,8 +14,8 @@ import javax.persistence.ManyToOne; import javax.persistence.Query; import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import org.hibernate.Session; import org.hibernate.dialect.PostgreSQL82Dialect; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java index 14c8f228e244..4c55e815caec 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java @@ -9,12 +9,12 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Transient; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; @Entity public class Address { diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java index 89226d1d0fe3..aa92c809e98c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java @@ -7,7 +7,7 @@ package org.hibernate.test.annotations.beanvalidation; import java.math.BigDecimal; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java index 7c0db05eba9b..d1d387f70c74 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; import java.util.Map; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java index 9147e365c71c..076f4887fb43 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java @@ -8,9 +8,9 @@ import java.lang.annotation.Annotation; import java.math.BigDecimal; -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.NotNull; -import javax.validation.groups.Default; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.groups.Default; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java index 76b4cd707adb..5333ba5765c1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java @@ -8,10 +8,10 @@ import java.math.BigDecimal; import java.util.Locale; -import javax.validation.ConstraintViolationException; -import javax.validation.MessageInterpolator; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.MessageInterpolator; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import org.junit.Test; @@ -66,7 +66,7 @@ public String interpolate(String s, Context context, Locale locale) { return interpolate( s, context ); } }; - final javax.validation.Configuration configuration = Validation.byDefaultProvider().configure(); + final jakarta.validation.Configuration configuration = Validation.byDefaultProvider().configure(); configuration.messageInterpolator( messageInterpolator ); ValidatorFactory vf = configuration.buildValidatorFactory(); cfg.getProperties().put( "javax.persistence.validation.factory", vf ); diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java index 02a1e112278d..d7efde76f3a1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java @@ -8,8 +8,8 @@ package org.hibernate.test.annotations.beanvalidation; import javax.persistence.Column; import javax.persistence.Embeddable; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java index 9e6853f378c8..c85d0e3c43ec 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java @@ -9,7 +9,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java index 223a83cb734b..9a0127053ef8 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java @@ -10,8 +10,8 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java index ea50a0ba5c0e..a58507b340cb 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java @@ -12,7 +12,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.PersistenceException; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java index 0aa68382097e..f60a8564cbc9 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java @@ -9,7 +9,7 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java index f170ea6f2fb3..f0ef5cadb96c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java @@ -9,8 +9,8 @@ import javax.persistence.CascadeType; import javax.persistence.Embeddable; import javax.persistence.ManyToOne; -import javax.validation.Valid; -import javax.validation.constraints.Min; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; /** diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java index ac542c9c29d6..a062151143f3 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java @@ -7,8 +7,8 @@ package org.hibernate.test.annotations.beanvalidation; import java.math.BigDecimal; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java index 87b68ea375e6..98205bd80e03 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java @@ -14,8 +14,8 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.NotNull; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.NotNull; import org.hibernate.Session; import org.hibernate.Transaction; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java index 15e9f60b00bd..b8409e2aa6da 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java @@ -16,8 +16,8 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.validation.ConstraintViolationException; -import javax.validation.constraints.NotNull; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.NotNull; import org.junit.Test; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java index 6ec1d092c8ec..02560cf90bb1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java @@ -10,8 +10,8 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Column; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; /** * @author Hardy Ferentschik diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java index ffa10b6ea8bd..00193885d9ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java @@ -11,8 +11,8 @@ import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java index 6006b3466d03..52acdbc48c82 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java @@ -7,7 +7,7 @@ package org.hibernate.test.annotations.beanvalidation; import javax.persistence.Entity; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java index 75a175ce2855..a10bbc46569c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java @@ -15,8 +15,8 @@ import javax.persistence.Id; import javax.persistence.ManyToMany; import javax.persistence.ManyToOne; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java index 48f3333cfdf4..417058611a9f 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java @@ -13,11 +13,11 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Column; -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.hibernate.validator.constraints.Length; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java index 5352b2461ead..387ea8d2a8d4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java @@ -10,7 +10,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author Emmanuel Bernard diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java index f69c38aaf7a1..11597c579915 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java @@ -17,9 +17,9 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Version; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import org.hibernate.AnnotationException; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java index b65c0d53667c..5bbeaa00733b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java @@ -14,7 +14,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.OrderBy; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.Cascade; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java index 6d2fa0f4788f..ebff4036431c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java @@ -16,7 +16,7 @@ import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.OrderBy; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.Cascade; diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java index fa54e2d80c62..acc6ec444ac1 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java @@ -10,7 +10,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author Peter Kotula diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh9798/Shipment.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh9798/Shipment.java index d0a99a062dd1..32f8fa52de6a 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh9798/Shipment.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh9798/Shipment.java @@ -14,7 +14,7 @@ import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.OneToOne; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Date; @Entity diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java index 651d4533b115..e7f48d0a9270 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java @@ -11,7 +11,7 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; /** * @author Manuel Bernhardt diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java index 7878831fd822..d6ddc6e6de22 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java @@ -11,7 +11,7 @@ import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; -import javax.validation.constraints.AssertTrue; +import jakarta.validation.constraints.AssertTrue; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicLong; diff --git a/hibernate-core/src/test/java/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java b/hibernate-core/src/test/java/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java index 3f833006a57d..030cdf050334 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java @@ -16,7 +16,7 @@ import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase; diff --git a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedMaster.java b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedMaster.java index 0c0696ee9691..dd985d5873a4 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedMaster.java +++ b/hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedMaster.java @@ -11,7 +11,7 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode;