From 1358d0d6502dca2636c37afb5cb160d0c15b287f Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Wed, 18 Sep 2024 08:50:34 +0200
Subject: [PATCH] XCOMMONS-2108: Upgrade to Bean Validation 3.0.2
 XCOMMONS-2475: Use Expressly instead of Apache EL

---
 xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml    | 6 +++---
 .../org/xwiki/rendering/macro/toc/TocMacroParameters.java   | 2 +-
 .../macro/parameter/ParameterValueTooHighException.java     | 2 +-
 .../macro/parameter/ParameterValueTooLowException.java      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml b/xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml
index f5b4dcb3bc..05e53bf10a 100644
--- a/xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml
+++ b/xwiki-rendering-macros/xwiki-rendering-macro-toc/pom.xml
@@ -42,9 +42,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jasper</groupId>
-      <artifactId>apache-el</artifactId>
-      <scope>runtime</scope>
+      <groupId>org.glassfish.expressly</groupId>
+      <artifactId>expressly</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java b/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java
index 8b7c2837cf..fc289e371c 100644
--- a/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java
+++ b/xwiki-rendering-macros/xwiki-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java
@@ -19,7 +19,7 @@
  */
 package org.xwiki.rendering.macro.toc;
 
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Min;
 
 import org.xwiki.properties.annotation.PropertyAdvanced;
 import org.xwiki.properties.annotation.PropertyDescription;
diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java
index 08d3932624..40a5ea3eff 100644
--- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java
+++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java
@@ -23,7 +23,7 @@
  * Exception used when the macro parameter is two high.
  *
  * @version $Id$
- * @deprecated use {@link javax.validation.constraints.Max} instead
+ * @deprecated use {@link jakarta.validation.constraints.Max} instead
  */
 @Deprecated
 public class ParameterValueTooHighException extends MacroParameterException
diff --git a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java
index 2652dd22d4..dbbe34a6a0 100644
--- a/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java
+++ b/xwiki-rendering-transformations/xwiki-rendering-transformation-macro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java
@@ -23,7 +23,7 @@
  * Exception used when the macro parameter is two low.
  *
  * @version $Id$
- * @deprecated use {@link javax.validation.constraints.Min} instead
+ * @deprecated use {@link jakarta.validation.constraints.Min} instead
  */
 @Deprecated
 public class ParameterValueTooLowException extends MacroParameterException