Branch: refs/heads/wip/6.0 Home: https://github.com/hibernate/hibernate-orm Commit: b9a24f458c6e9c5331b2362f58eb36e5c244de5e https://github.com/hibernate/hibernate-orm/commit/b9a24f458c6e9c5331b2362... Author: Sanne Grinovero <sanne(a)hibernate.org&gt; Date: 2020-04-20 (Mon, 20 Apr 2020) Changed paths: M gradle/libraries.gradle M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java Log Message: ----------- 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. Commit: 60abc8aa764929920478888d1d6b08b95df3846a https://github.com/hibernate/hibernate-orm/commit/60abc8aa764929920478888... Author: Sanne Grinovero <sanne(a)hibernate.org&gt; Date: 2020-04-20 (Mon, 20 Apr 2020) Changed paths: M documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc M hibernate-core/hibernate-core.gradle M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java M hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/BeanValidationTest.java M hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/CupHolder.java M hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidTitle.java M hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidatorFactory2PhaseInjectionTest.java M hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh9798/Shipment.java M hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java M hibernate-core/src/test/java/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java M hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedMaster.java Log Message: ----------- 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' Commit: 88d65adafb99cc381c91e85e94bf3b7266d8871a https://github.com/hibernate/hibernate-orm/commit/88d65adafb99cc381c91e85... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-04-20 (Mon, 20 Apr 2020) Changed paths: M documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc M gradle/libraries.gradle M hibernate-core/hibernate-core.gradle M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationEventListener.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/BeanValidationIntegrator.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/GroupsPerOperation.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/HibernateTraversableResolver.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/TypeSafeActivator.java M hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ValidationMode.java M hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/BeanValidationTest.java M hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/CupHolder.java M hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidTitle.java M hibernate-core/src/test/java/org/hibernate/jpa/test/beanvalidation/ValidatorFactory2PhaseInjectionTest.java M hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryOrdinalParametersTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Address.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationAutoTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationDisabledTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationGroupsTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/BeanValidationProvidedFactoryTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Button.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Color.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/CupHolder.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLWithoutCallbackTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Display.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DisplayConnector.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/HibernateTraversableResolverTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MergeNotNullCollectionUsingIdentityTest.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/MinMax.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/PowerSupply.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Rock.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Screen.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/Tv.java M hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/TvOwner.java M hibernate-core/src/test/java/org/hibernate/test/annotations/embeddables/collection/EmbeddableWithOneToMany_HHH_8564_Test.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/A.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/B.java M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/C.java A hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh9798/Shipment.java M hibernate-core/src/test/java/org/hibernate/test/annotations/uniqueconstraint/House.java M hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/UninitializedAssociationsInCacheTest.java M hibernate-core/src/test/java/org/hibernate/test/formulajoin/AnnotatedMaster.java M hibernate-core/src/test_legacy/org/hibernate/test/criteria/mapsid/MapsIdOneToOneSelectTest.java Log Message: ----------- Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_35 Commit: 56873732b78af072a2507cf33b7c7059f6920388 https://github.com/hibernate/hibernate-orm/commit/56873732b78af072a2507cf... Author: Andrea Boriero <andrea(a)hibernate.org&gt; Date: 2020-04-20 (Mon, 20 Apr 2020) Changed paths: M hibernate-core/src/test/java/org/hibernate/orm/test/onetoone/hhh9798/Shipment.java R hibernate-core/src/test/java/org/hibernate/test/annotations/onetoone/hhh9798/Shipment.java Log Message: ----------- Fix errors after merge Compare: https://github.com/hibernate/hibernate-orm/compare/0a5ae91c0895...5687373...