change: migrate to jakarta validation (#580)

iocanel · web-flow · commit 9c8fca825cd6 · 2026-04-03T19:34:25.000+03:00
diff --git a/annotations/builder/pom.xml b/annotations/builder/pom.xml
@@ -124,8 +124,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <optional>true</optional>
         </dependency>
 
diff --git a/annotations/builder/readme.md b/annotations/builder/readme.md
@@ -314,13 +314,13 @@ set the `validationEnabled` flag to `true`:
 
 ```java
 package my.demo
-    
-import javax.validation.constraints.NotNull;
+
+import jakarta.validation.constraints.NotNull;
 
 public class Demo {
     @NotNull
     private String value;
-    
+
     @Buildable(validationEnabled=true)
     public Demo(....) {
             // ...
diff --git a/annotations/builder/src/main/java/io/sundr/builder/Constants.java b/annotations/builder/src/main/java/io/sundr/builder/Constants.java
@@ -153,32 +153,32 @@ private Constants() {
 
   //The classes below are created programmatically rather than by class to avoid bringing in more deps
   public static final ClassRef VALIDATION = new TypeDefBuilder()
-      .withPackageName("javax.validation")
+      .withPackageName("jakarta.validation")
       .withName("Validation")
       .build().toInternalReference();
 
   public static final ClassRef VALIDATOR = new TypeDefBuilder()
-      .withPackageName("javax.validation")
+      .withPackageName("jakarta.validation")
       .withName("Validator")
       .build().toInternalReference();
 
   public static final ClassRef VALIDATOR_FACTORY = new TypeDefBuilder()
-      .withPackageName("javax.validation")
+      .withPackageName("jakarta.validation")
       .withName("ValidatorFactory")
       .build().toInternalReference();
 
   public static final ClassRef VALIDATION_EXCEPTION = new TypeDefBuilder()
-      .withPackageName("javax.validation")
+      .withPackageName("jakarta.validation")
       .withName("ValidationException")
       .build().toInternalReference();
 
   public static final ClassRef CONSTRAIN_VIOLATION = new TypeDefBuilder()
-      .withPackageName("javax.validation")
+      .withPackageName("jakarta.validation")
       .withName("ConstraintViolation")
       .build().toInternalReference();
 
   public static final ClassRef CONSTRAIN_VIOLATION_EXCEPTION = new TypeDefBuilder()
-      .withPackageName("javax.validation")
+      .withPackageName("jakarta.validation")
       .withName("ConstraintViolationException")
       .build().toInternalReference();
 
diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/BuilderContext.java b/annotations/builder/src/main/java/io/sundr/builder/internal/BuilderContext.java
@@ -1092,7 +1092,7 @@ public BuilderContext(Elements elements, Types types, Boolean generateBuilderPac
         .accept(new ApplyImportsFromResources("io/sundr/builder/BaseFluent.java"))
         .build();
 
-    ClassRef validatorRef = ClassRef.forName("javax.validation.Validator");
+    ClassRef validatorRef = ClassRef.forName("jakarta.validation.Validator");
     validationUtils = new TypeDefBuilder()
         .withPackageName("io.sundr.builder.internal.resources")
         .withName("ValidationUtils")
@@ -1164,7 +1164,7 @@ public BuilderContext(Elements elements, Types types, Boolean generateBuilderPac
   private static boolean hasValidatorArg(String c) {
     Class validator;
     try {
-      validator = Class.forName("javax.validation.Validator");
+      validator = Class.forName("jakarta.validation.Validator");
     } catch (ClassNotFoundException e) {
       return false;
     }
diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ClazzAs.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ClazzAs.java
@@ -458,7 +458,7 @@ public TypeDef apply(final RichTypeDef item) {
             .build())
             .forEach(constructors::add);
 
-        ClassRef validatorRef = new ClassRefBuilder().withFullyQualifiedName("javax.validation.Validator").build();
+        ClassRef validatorRef = new ClassRefBuilder().withFullyQualifiedName("jakarta.validation.Validator").build();
 
         Field validatorProperty = new FieldBuilder().withName("validator").withTypeRef(validatorRef).build();
 
diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/resources/ValidationUtils.java b/annotations/builder/src/main/java/io/sundr/builder/internal/resources/ValidationUtils.java
@@ -18,14 +18,13 @@
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-
 import io.sundr.resourcecify.annotations.Resourcecify;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 
 @Resourcecify
 public final class ValidationUtils {
diff --git a/components/swagger/src/main/resources/handlebars/JavaFluent/BeanValidationException.mustache b/components/swagger/src/main/resources/handlebars/JavaFluent/BeanValidationException.mustache
@@ -2,8 +2,8 @@ package {{invokerPackage}};
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidationException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ValidationException;
 
 public class BeanValidationException extends ValidationException {
     /**
diff --git a/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/jersey2/pom.mustache b/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/jersey2/pom.mustache
@@ -290,9 +290,9 @@
     {{#useBeanValidation}}
     <!-- Bean Validation API support -->
     <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>1.1.0.Final</version>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>3.0.2</version>
       <scope>provided</scope>
     </dependency>
     {{/useBeanValidation}}
diff --git a/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/okhttp-gson/api.mustache b/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/okhttp-gson/api.mustache
@@ -19,13 +19,13 @@ import com.google.gson.reflect.TypeToken;
 import java.io.IOException;
 
 {{#useBeanValidation}}
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.executable.ExecutableValidator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.executable.ExecutableValidator;
 import java.util.Set;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/okhttp-gson/pom.mustache b/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/okhttp-gson/pom.mustache
@@ -247,9 +247,9 @@
     {{#useBeanValidation}}
     <!-- Bean Validation API support -->
     <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>3.0.2</version>
         <scope>provided</scope>
     </dependency>
     {{/useBeanValidation}}
diff --git a/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/okhttp-jackson/api.mustache b/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/okhttp-jackson/api.mustache
@@ -19,13 +19,13 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import java.io.IOException;
 
 {{#useBeanValidation}}
-import javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
 {{/useBeanValidation}}
 {{#performBeanValidation}}
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.executable.ExecutableValidator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.executable.ExecutableValidator;
 import java.util.Set;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
diff --git a/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/okhttp-jackson/pom.mustache b/components/swagger/src/main/resources/handlebars/JavaFluent/libraries/okhttp-jackson/pom.mustache
@@ -264,9 +264,9 @@
     {{#useBeanValidation}}
     <!-- Bean Validation API support -->
     <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>3.0.2</version>
         <scope>provided</scope>
     </dependency>
     {{/useBeanValidation}}
diff --git a/components/swagger/src/main/resources/handlebars/JavaFluent/pom.mustache b/components/swagger/src/main/resources/handlebars/JavaFluent/pom.mustache
@@ -293,9 +293,9 @@
 {{#useBeanValidation}}
     <!-- Bean Validation API support -->
     <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.1.0.Final</version>
+        <groupId>jakarta.validation</groupId>
+        <artifactId>jakarta.validation-api</artifactId>
+        <version>3.0.2</version>
         <scope>provided</scope>
     </dependency>
 {{/useBeanValidation}}
diff --git a/examples/curator-dsl/validation/pom.xml b/examples/curator-dsl/validation/pom.xml
@@ -41,19 +41,14 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.0.18.Final</version>
+            <version>8.0.1.Final</version>
         </dependency>
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>3.0.0</version>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>10.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/examples/curator-dsl/validation/src/main/java/io/sundr/examples/validation/Address.java b/examples/curator-dsl/validation/src/main/java/io/sundr/examples/validation/Address.java
@@ -15,12 +15,11 @@
  */
 package io.sundr.examples.validation;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 import io.sundr.builder.annotations.Buildable;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 @Buildable(validationEnabled = true)
 public interface Address {
diff --git a/examples/curator-dsl/validation/src/test/java/io/sundr/examples/validation/AddressValidationTest.java b/examples/curator-dsl/validation/src/test/java/io/sundr/examples/validation/AddressValidationTest.java
@@ -18,12 +18,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.Validator;
-
 import org.junit.jupiter.api.Test;
 
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
 public class AddressValidationTest {
 
   Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
@@ -55,17 +55,20 @@ public void shouldAcceptZeroNumber() {
 
   @Test
   public void shouldNotAcceptZeroNumberViaConstructor() {
-    assertThrows(ConstraintViolationException.class, () -> new DefaultAddressBuilder(true).withStreet("Sesame").withNumber(0).build());
+    assertThrows(ConstraintViolationException.class,
+        () -> new DefaultAddressBuilder(true).withStreet("Sesame").withNumber(0).build());
   }
 
   @Test
   public void shouldNotAcceptZeroNumberViaUsingValidation() {
-    assertThrows(ConstraintViolationException.class, () -> new DefaultAddressBuilder().withStreet("Sesame").withNumber(0).usingValidation().build());
+    assertThrows(ConstraintViolationException.class,
+        () -> new DefaultAddressBuilder().withStreet("Sesame").withNumber(0).usingValidation().build());
   }
 
   @Test
   public void shoulNotdAcceptZeroNumberViaUsingValidator() {
-    assertThrows(ConstraintViolationException.class, () -> new DefaultAddressBuilder().withStreet("Sesame").withNumber(0).usingValidator(validator).build());
+    assertThrows(ConstraintViolationException.class,
+        () -> new DefaultAddressBuilder().withStreet("Sesame").withNumber(0).usingValidator(validator).build());
   }
 
   @Test
diff --git a/examples/validation/pom.xml b/examples/validation/pom.xml
@@ -41,19 +41,14 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.0.18.Final</version>
+            <version>8.0.1.Final</version>
         </dependency>
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>3.0.0</version>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-el</artifactId>
+            <version>10.1.18</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/examples/validation/src/main/java/io/sundr/examples/validation/Address.java b/examples/validation/src/main/java/io/sundr/examples/validation/Address.java
@@ -15,12 +15,11 @@
  */
 package io.sundr.examples.validation;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-
 import io.sundr.builder.annotations.Buildable;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 @Buildable(validationEnabled = true)
 public interface Address {
diff --git a/examples/validation/src/test/java/io/sundr/examples/validation/AddressValidationTest.java b/examples/validation/src/test/java/io/sundr/examples/validation/AddressValidationTest.java
@@ -18,12 +18,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validation;
-import javax.validation.Validator;
-
 import org.junit.jupiter.api.Test;
 
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
 public class AddressValidationTest {
 
   Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
diff --git a/model/builder/src/main/java/io/sundr/model/PropertyBuilder.java b/model/builder/src/main/java/io/sundr/model/PropertyBuilder.java
@@ -2,10 +2,6 @@
 
 import io.sundr.builder.VisitableBuilder;
 
-/**
- * @deprecated This class has been replaced by {@link FieldBuilder}, {@link ArgumentBuilder}, and {@link LocalVariableBuilder}.
- */
-@Deprecated
 public class PropertyBuilder extends PropertyFluent<PropertyBuilder> implements VisitableBuilder<Property, PropertyBuilder> {
 
   PropertyFluent<?> fluent;
diff --git a/model/builder/src/main/java/io/sundr/model/PropertyFluent.java b/model/builder/src/main/java/io/sundr/model/PropertyFluent.java
@@ -20,11 +20,8 @@
 
 /**
  * Generated
- *
- * @deprecated This class has been replaced by {@link FieldFluent}, {@link ArgumentFluent}, and {@link LocalVariableFluent}.
  */
 @SuppressWarnings("unchecked")
-@Deprecated
 public class PropertyFluent<A extends io.sundr.model.PropertyFluent<A>> extends ModifierSupportFluent<A> {
 
   private ArrayList<AnnotationRefBuilder> annotations = new ArrayList<AnnotationRefBuilder>();
diff --git a/model/utils/src/test/java/io/sundr/model/utils/GetterTest.java b/model/utils/src/test/java/io/sundr/model/utils/GetterTest.java
@@ -17,12 +17,10 @@
 
 package io.sundr.model.utils;
 
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
-
 import io.sundr.model.Field;
 import io.sundr.model.FieldBuilder;
 import io.sundr.model.Method;
diff --git a/pom.xml b/pom.xml
diff --git a/tests/buildable-pojos/pom.xml b/tests/buildable-pojos/pom.xml
diff --git a/tests/shapes/pom.xml b/tests/shapes/pom.xml
diff --git a/tests/visitor-filtering/pom.xml b/tests/visitor-filtering/pom.xml
diff --git a/tests/visitor/pom.xml b/tests/visitor/pom.xml
