This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch feature/WW-5209-bean-validation
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ad9224512dd6e09134833cae967b1846fb401fec
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sun Oct 20 11:35:56 2024 +0200
WW-5209 Upgrade to Jakarta Bean Validation 3.1.0
---
apps/showcase/pom.xml | 6 ++++++
core/src/test/java/org/apache/struts2/components/UIBeanTest.java | 2 +-
plugins/bean-validation/pom.xml | 3 +--
pom.xml | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 802ca8421..9cf119743 100644
--- 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
index dfacfeea3..680fb115d 100644
--- 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 class UIBeanTest extends StrutsInternalTestCase {
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
index 6f3338317..65ce4d168 100644
--- 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
index fb5794ac6..d2544f4db 100644
--- 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>
