From 170f01edbafe49165113d55d40e303901f6373da Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Wed, 27 Apr 2022 23:44:43 +0800
Subject: [PATCH] update validation version

---
 CHANGELOG.md                                         |  1 +
 hutool-extra/pom.xml                                 |  8 ++++----
 .../cn/hutool/extra/validation/ValidationUtil.java   | 12 ++++++++----
 .../extra/validation/BeanValidatorUtilTest.java      |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d957022b2..14c1f65d8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 # 5.8.0.M5 (2022-04-27)
 
 ### ❌不兼容特性
+* 【extra  】     升级jakarta.validation-api到3.x，包名变更导致不能向下兼容
 
 ### 🐣新特性
 
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index f5c573c90..4b13a50db 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -361,20 +361,20 @@
 		<dependency>
 			<groupId>jakarta.validation</groupId>
 			<artifactId>jakarta.validation-api</artifactId>
-			<version>2.0.2</version>
+			<version>3.0.1</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>6.1.6.Final</version>
+			<version>7.0.4.Final</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish</groupId>
-			<artifactId>javax.el</artifactId>
-			<version>3.0.0</version>
+			<artifactId>jakarta.el</artifactId>
+			<version>4.0.2</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- 验证工具可选依赖 end -->
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java
index cb9a4cd1c..ca49fa7f9 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java
@@ -2,9 +2,11 @@ package cn.hutool.extra.validation;
 
 import cn.hutool.extra.validation.BeanValidationResult.ErrorMessage;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+
 import java.util.Set;
 
 
@@ -24,7 +26,9 @@ public class ValidationUtil {
 	private static final Validator validator;
 
 	static {
-		validator = Validation.buildDefaultValidatorFactory().getValidator();
+		try(ValidatorFactory factory = Validation.buildDefaultValidatorFactory()){
+			validator = factory.getValidator();
+		}
 	}
 
 	/**
diff --git a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java
index 395f3ad7d..ce2ed7217 100644
--- a/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java
+++ b/hutool-extra/src/test/java/cn/hutool/extra/validation/BeanValidatorUtilTest.java
@@ -3,7 +3,7 @@ package cn.hutool.extra.validation;
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 /**
  * java bean 校验工具类单元测试