diff --git a/databases/db2/resources/hibernate.properties b/databases/db2/resources/hibernate.properties index 969f1e7f27..e1e7161f96 100644 --- a/databases/db2/resources/hibernate.properties +++ b/databases/db2/resources/hibernate.properties @@ -21,6 +21,6 @@ hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory -javax.persistence.validation.mode=NONE +jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true \ No newline at end of file diff --git a/databases/hana/resources/hibernate.properties b/databases/hana/resources/hibernate.properties index f53e3204b5..cfaf8c610e 100644 --- a/databases/hana/resources/hibernate.properties +++ b/databases/hana/resources/hibernate.properties @@ -21,6 +21,6 @@ hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory -javax.persistence.validation.mode=NONE +jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true \ No newline at end of file diff --git a/databases/mariadb/resources/hibernate.properties b/databases/mariadb/resources/hibernate.properties index 4ddad94110..7573683dce 100644 --- a/databases/mariadb/resources/hibernate.properties +++ b/databases/mariadb/resources/hibernate.properties @@ -21,6 +21,6 @@ hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory -javax.persistence.validation.mode=NONE +jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true \ No newline at end of file diff --git a/databases/mssqlserver/resources/hibernate.properties b/databases/mssqlserver/resources/hibernate.properties index 32e5d342a7..72d754a5be 100644 --- a/databases/mssqlserver/resources/hibernate.properties +++ b/databases/mssqlserver/resources/hibernate.properties @@ -21,6 +21,6 @@ hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory -javax.persistence.validation.mode=NONE +jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true \ No newline at end of file diff --git a/databases/mysql/resources/hibernate.properties b/databases/mysql/resources/hibernate.properties index 2083e7f07a..f2b28ddefe 100644 --- a/databases/mysql/resources/hibernate.properties +++ b/databases/mysql/resources/hibernate.properties @@ -21,6 +21,6 @@ hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory -javax.persistence.validation.mode=NONE +jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true \ No newline at end of file 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 4869be463c..360456b886 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 @@ -90,9 +90,9 @@ public class BeanValidationIntegrator implements Integrator { ServiceRegistryImplementor serviceRegistry = sessionFactory.getServiceRegistry(); final ConfigurationService cfgService = serviceRegistry.getService( ConfigurationService.class ); // IMPL NOTE : see the comments on ActivationContext.getValidationModes() as to why this is multi-valued... - Object modeSetting = cfgService.getSettings().get( MODE_PROPERTY ); + Object modeSetting = cfgService.getSettings().get( JAKARTA_MODE_PROPERTY ); if ( modeSetting == null ) { - modeSetting = cfgService.getSettings().get( JAKARTA_MODE_PROPERTY ); + modeSetting = cfgService.getSettings().get( MODE_PROPERTY ); } final Set modes = ValidationMode.getModes( modeSetting ); if ( modes.size() > 1 ) { @@ -159,11 +159,11 @@ public class BeanValidationIntegrator implements Integrator { private boolean isBeanValidationApiAvailable(ClassLoaderService classLoaderService) { try { - classLoaderService.classForName( BV_CHECK_CLASS ); + classLoaderService.classForName( JAKARTA_BV_CHECK_CLASS ); } catch (Exception e) { try { - classLoaderService.classForName( JAKARTA_BV_CHECK_CLASS ); + classLoaderService.classForName( BV_CHECK_CLASS ); } catch (Exception e2) { return false; 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 ebc42b6b26..4d0099e484 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 @@ -56,9 +56,9 @@ public class GroupsPerOperation { } public static Class[] buildGroupsForOperation(Operation operation, Map settings, ClassLoaderAccess classLoaderAccess) { - Object property = settings.get( operation.getGroupPropertyName() ); + Object property = settings.get( operation.getJakartaGroupPropertyName() ); if ( property == null ) { - property = settings.get( operation.getJakartaGroupPropertyName() ); + property = settings.get( operation.getGroupPropertyName() ); } if ( property == null ) { @@ -92,7 +92,7 @@ public class GroupsPerOperation { } //null is bad and excluded by instanceof => exception is raised - throw new HibernateException( JPA_GROUP_PREFIX + operation.getGroupPropertyName() + " is of unknown type: String or Class[] only"); + throw new HibernateException( JAKARTA_JPA_GROUP_PREFIX + operation.getGroupPropertyName() + " is of unknown type: String or Class[] only"); } public Class[] get(Operation operation) { 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 cd097940a7..c6eb913b4a 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 @@ -54,7 +54,7 @@ public enum ValidationMode { return valueOf( modeProperty.trim().toUpperCase(Locale.ROOT) ); } catch ( IllegalArgumentException e ) { - throw new HibernateException( "Unknown validation mode in " + BeanValidationIntegrator.MODE_PROPERTY + ": " + modeProperty ); + throw new HibernateException( "Unknown validation mode in " + BeanValidationIntegrator.JAKARTA_MODE_PROPERTY + ": " + modeProperty ); } } } diff --git a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java index b02afd4769..216c37032e 100644 --- a/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java +++ b/hibernate-core/src/main/java/org/hibernate/internal/CoreMessageLogger.java @@ -1544,7 +1544,7 @@ public interface CoreMessageLogger extends BasicLogger { void explicitSkipLockedLockCombo(); @LogMessage(level = INFO) - @Message(value = "'javax.persistence.validation.mode' named multiple values : %s", id = 448) + @Message(value = "'jakarta.persistence.validation.mode' named multiple values : %s", id = 448) void multipleValidationModes(String modes); @LogMessage(level = WARN) diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java index 9da53327b3..a26f8a37e9 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationAutoTest.java @@ -45,7 +45,7 @@ public class BeanValidationAutoTest extends BaseCoreFunctionalTestCase { @Override protected void configure(Configuration cfg) { super.configure( cfg ); - cfg.setProperty( "javax.persistence.validation.mode", "AUTO" ); + cfg.setProperty( "jakarta.persistence.validation.mode", "AUTO" ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java index 91a2fbe8f9..3d524554a2 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationDisabledTest.java @@ -51,7 +51,7 @@ public class BeanValidationDisabledTest extends BaseNonConfigCoreFunctionalTestC @Override protected void addSettings(Map settings) { - settings.put( "javax.persistence.validation.mode", "none" ); + settings.put( "jakarta.persistence.validation.mode", "none" ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java index a338ae016f..7a1d50389d 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationGroupsTest.java @@ -84,7 +84,7 @@ public class BeanValidationGroupsTest extends BaseCoreFunctionalTestCase { Default.class.getName() + ", " + Strict.class.getName() ); cfg.setProperty( "hibernate.validator.apply_to_ddl", "false" ); - cfg.setProperty( "javax.persistence.validation.mode", "auto" ); + cfg.setProperty( "jakarta.persistence.validation.mode", "auto" ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java index 6c4672ef12..60230d3c02 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java @@ -70,6 +70,6 @@ public class BeanValidationProvidedFactoryTest extends BaseCoreFunctionalTestCas configuration.messageInterpolator( messageInterpolator ); ValidatorFactory vf = configuration.buildValidatorFactory(); cfg.getProperties().put( "jakarta.persistence.validation.factory", vf ); - cfg.setProperty( "javax.persistence.validation.mode", "AUTO" ); + cfg.setProperty( "jakarta.persistence.validation.mode", "AUTO" ); } } diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java index 937d4971b3..1880f87be4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLTest.java @@ -84,7 +84,7 @@ public class DDLTest extends BaseNonConfigCoreFunctionalTestCase { @Override protected void addSettings(Map settings) { - settings.put( "javax.persistence.validation.mode", "ddl" ); + settings.put( "jakarta.persistence.validation.mode", "ddl" ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java index 6f096d3044..b9ba1a4aec 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/DDLWithoutCallbackTest.java @@ -34,7 +34,7 @@ public class DDLWithoutCallbackTest extends BaseNonConfigCoreFunctionalTestCase @Override protected void addSettings(Map settings) { - settings.put( "javax.persistence.validation.mode", "ddl" ); + settings.put( "jakarta.persistence.validation.mode", "ddl" ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java index d1f4301191..0493460fee 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/HibernateTraversableResolverTest.java @@ -193,7 +193,7 @@ public class HibernateTraversableResolverTest extends BaseCoreFunctionalTestCase @Override protected void configure(Configuration cfg) { super.configure( cfg ); - cfg.setProperty( "javax.persistence.validation.mode", "AUTO" ); + cfg.setProperty( "jakarta.persistence.validation.mode", "AUTO" ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java index 36dd462e70..3f4046e4ff 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionTest.java @@ -39,7 +39,7 @@ public class MergeNotNullCollectionTest extends BaseCoreFunctionalTestCase { @Override protected void configure(Configuration cfg) { super.configure( cfg ); - cfg.setProperty( "javax.persistence.validation.mode", "AUTO" ); + cfg.setProperty( "jakarta.persistence.validation.mode", "AUTO" ); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java index 400eea0f2b..17ea7aff93 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java @@ -48,7 +48,7 @@ public class MergeNotNullCollectionUsingIdentityTest extends BaseCoreFunctionalT @Override protected void configure(Configuration cfg) { super.configure( cfg ); - cfg.setProperty( "javax.persistence.validation.mode", "AUTO" ); + cfg.setProperty( "jakarta.persistence.validation.mode", "AUTO" ); } @Test diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java index f71bd30bd1..e298adc4e5 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/NotNullManyToOneTest.java @@ -24,7 +24,7 @@ public class NotNullManyToOneTest extends BaseCoreFunctionalTestCase { @Override protected void configure(Configuration configuration) { - configuration.setProperty( AvailableSettings.JPA_VALIDATION_MODE, ValidationMode.AUTO.name() ); + configuration.setProperty( AvailableSettings.JAKARTA_VALIDATION_MODE, ValidationMode.AUTO.name() ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java index 058f8bdcab..709b5948f6 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/beanvalidation/BeanValidationTest.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.fail; */ @Jpa( annotatedClasses = { CupHolder.class }, - integrationSettings = { @Setting(name = AvailableSettings.JPA_VALIDATION_MODE, value = "auto") } + integrationSettings = { @Setting(name = AvailableSettings.JAKARTA_VALIDATION_MODE, value = "auto") } ) public class BeanValidationTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java index 816d63009e..9c0861dfc1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/RemoveOrderingTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; annotatedClasses = { RemoveOrderingTest.Person.class, RemoveOrderingTest.Company.class }, - integrationSettings = { @Setting(name = AvailableSettings.JPA_VALIDATION_MODE, value = "NONE") } + integrationSettings = { @Setting(name = AvailableSettings.JAKARTA_VALIDATION_MODE, value = "NONE") } ) public class RemoveOrderingTest { diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java index 56073e032f..7eacae5ab4 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/legacy/NonReflectiveBinderTest.java @@ -41,7 +41,7 @@ public class NonReflectiveBinderTest { @BeforeEach public void setUp() throws Exception { ssr = new StandardServiceRegistryBuilder() - .applySetting( "javax.persistence.validation.mode", "none" ) + .applySetting( "jakarta.persistence.validation.mode", "none" ) .build(); metadata = new MetadataSources( ssr ) .addResource( "org/hibernate/orm/test/legacy/Wicked.hbm.xml" ) diff --git a/hibernate-core/src/test/resources/hibernate.properties b/hibernate-core/src/test/resources/hibernate.properties index 9b8cde334e..f8b17c08cd 100644 --- a/hibernate-core/src/test/resources/hibernate.properties +++ b/hibernate-core/src/test/resources/hibernate.properties @@ -22,7 +22,7 @@ hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory -javax.persistence.validation.mode=NONE +jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true hibernate.hql.bulk_id_strategy.global_temporary.drop_tables=true diff --git a/hibernate-micrometer/src/test/resources/hibernate.properties b/hibernate-micrometer/src/test/resources/hibernate.properties index cb2fcfccb9..2c24a30557 100644 --- a/hibernate-micrometer/src/test/resources/hibernate.properties +++ b/hibernate-micrometer/src/test/resources/hibernate.properties @@ -22,7 +22,7 @@ hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory -javax.persistence.validation.mode=NONE +jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true hibernate.hql.bulk_id_strategy.global_temporary.drop_tables=true \ No newline at end of file diff --git a/hibernate-testing/src/test/resources/hibernate.properties b/hibernate-testing/src/test/resources/hibernate.properties index 9b8cde334e..f8b17c08cd 100644 --- a/hibernate-testing/src/test/resources/hibernate.properties +++ b/hibernate-testing/src/test/resources/hibernate.properties @@ -22,7 +22,7 @@ hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory -javax.persistence.validation.mode=NONE +jakarta.persistence.validation.mode=NONE hibernate.service.allow_crawling=false hibernate.session.events.log=true hibernate.hql.bulk_id_strategy.global_temporary.drop_tables=true