Merge pull request #1089 from apache/feature/WW-5209-bean-validation

WW-5209 Upgrade to Jakarta Bean Validation 3.1.0
apache · Oct 21, 2024 · 3d255ca · 3d255ca
2 parents 954453b + ad92245
commit 3d255ca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
@@ -149,6 +149,12 @@
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <version>${hibernate-validator.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.validation</groupId>
+                    <artifactId>jakarta.validation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!--

diff --git a/core/src/test/java/org/apache/struts2/components/UIBeanTest.java b/core/src/test/java/org/apache/struts2/components/UIBeanTest.java
@@ -387,7 +387,7 @@ public void testNonceOfInvalidSession() {
         DoubleSelect dblSelect = new DoubleSelect(stack, req, res);
         dblSelect.evaluateParams();
 
-        assertNull(dblSelect.getParameters().get("nonce"));
+        assertNull(dblSelect.getAttributes().get("nonce"));
     }
 
     public void testSetNullUiStaticContentPath() {

diff --git a/plugins/bean-validation/pom.xml b/plugins/bean-validation/pom.xml
@@ -41,10 +41,9 @@
         <dependency>
            <groupId>jakarta.validation</groupId>
            <artifactId>jakarta.validation-api</artifactId>
-           <version>3.0.2</version>
+           <version>3.1.0</version>
         </dependency>
 
-
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -884,7 +884,7 @@
             <dependency>
                 <groupId>org.htmlunit</groupId>
                 <artifactId>htmlunit</artifactId>
-                <version>3.6.0</version>
+                <version>4.2.0</version>
                 <scope>test</scope>
             </dependency>