XCOMMONS-2108: Upgrade to Bean Validation 3.0.2

XCOMMONS-2475: Use Expressly instead of Apache EL
xwiki · Nov 21, 2024 · 6d5337b · 6d5337b
1 parent c69c5ce
commit 6d5337b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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/...i-rendering-macro-toc/src/main/java/org/xwiki/rendering/macro/toc/TocMacroParameters.java b/...i-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/...cro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooHighException.java b/...cro/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/...acro/src/main/java/org/xwiki/rendering/macro/parameter/ParameterValueTooLowException.java b/...acro/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