Upgrade to Hibernate Validator 9.0

quarkusio · Aug 2, 2024 · b214566 · b214566
1 parent 459ea4e
commit b214566
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -18,7 +18,7 @@
         <bouncycastle.version>1.78.1</bouncycastle.version>
         <bouncycastle.fips.version>1.0.2.5</bouncycastle.fips.version>
         <bouncycastle.tls.fips.version>1.0.19</bouncycastle.tls.fips.version>
-        <expressly.version>5.0.0</expressly.version>
+        <expressly.version>6.0.0-M1</expressly.version>
         <findbugs.version>3.0.2</findbugs.version>
         <jandex.version>3.2.1</jandex.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
@@ -68,7 +68,7 @@
         <jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
         <jakarta.authentication-api>3.0.0</jakarta.authentication-api>
         <jakarta.authorization-api.version>2.1.0</jakarta.authorization-api.version>
-        <jakarta.el-api.version>5.0.1</jakarta.el-api.version>
+        <jakarta.el-api.version>6.0.1</jakarta.el-api.version>
         <jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
         <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
         <jakarta.interceptor-api.version>2.2.0</jakarta.interceptor-api.version>
@@ -79,7 +79,7 @@
         <jakarta.resource-api.version>2.1.0</jakarta.resource-api.version>
         <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
         <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
-        <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
+        <jakarta.validation-api.version>3.1.0</jakarta.validation-api.version>
         <jakarta.websocket-api.version>2.1.1</jakarta.websocket-api.version>
         <jakarta.ws.rs-api.version>3.1.0</jakarta.ws.rs-api.version>
         <jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>

diff --git a/...c/main/java/io/quarkus/hibernate/validator/runtime/ArcConstraintValidatorFactoryImpl.java b/...c/main/java/io/quarkus/hibernate/validator/runtime/ArcConstraintValidatorFactoryImpl.java
@@ -7,7 +7,7 @@
 import jakarta.validation.ConstraintValidator;
 import jakarta.validation.ConstraintValidatorFactory;
 
-import org.hibernate.validator.internal.util.privilegedactions.NewInstance;
+import org.hibernate.validator.internal.util.actions.NewInstance;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InstanceHandle;
@@ -32,7 +32,7 @@ public class ArcConstraintValidatorFactoryImpl implements ConstraintValidatorFac
             }
             return instance;
         }
-        return NewInstance.action(key, "ConstraintValidator").run();
+        return NewInstance.action(key, "ConstraintValidator");
     }
 
     @Override

diff --git a/...n/java/io/quarkus/hibernate/validator/runtime/HibernateBeanValidationConfigValidator.java b/...n/java/io/quarkus/hibernate/validator/runtime/HibernateBeanValidationConfigValidator.java
@@ -8,7 +8,7 @@
 
 import org.hibernate.validator.PredefinedScopeHibernateValidator;
 import org.hibernate.validator.PredefinedScopeHibernateValidatorConfiguration;
-import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorFactoryImpl;
+import org.hibernate.validator.constraintvalidation.spi.DefaultConstraintValidatorFactory;
 
 import io.smallrye.config.validator.BeanValidationConfigValidator;
 
@@ -24,7 +24,7 @@ public HibernateBeanValidationConfigValidator(Set<String> constraints, Set<Class
                 .ignoreXmlConfiguration()
                 .builtinConstraints(constraints)
                 .initializeBeanMetaData(classesToBeValidated)
-                .constraintValidatorFactory(new ConstraintValidatorFactoryImpl());
+                .constraintValidatorFactory(new DefaultConstraintValidatorFactory());
 
         ConfigValidatorHolder.initialize(configuration.buildValidatorFactory());
     }

diff --git a/pom.xml b/pom.xml
@@ -76,7 +76,7 @@
         <bytebuddy.version>1.14.15</bytebuddy.version> <!-- version controlled by Hibernate ORM's needs -->
         <hibernate-commons-annotations.version>6.0.6.Final</hibernate-commons-annotations.version> <!-- version controlled by Hibernate ORM's needs -->
         <hibernate-reactive.version>2.3.1.Final</hibernate-reactive.version> <!-- highly sensitive to Hibernate ORM upgrades -->
-        <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
+        <hibernate-validator.version>9.0.0.Beta2</hibernate-validator.version>
         <hibernate-search.version>7.1.1.Final</hibernate-search.version>
 
         <!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->