diff --git a/pom.xml b/pom.xml index ec631bf6..90a8bbf0 100644 --- a/pom.xml +++ b/pom.xml @@ -201,20 +201,15 @@ commons-cli 1.5.0 - - javax.validation - validation-api - 2.0.1.Final - org.glassfish jakarta.el - 3.0.4 + 4.0.2 org.hibernate.validator hibernate-validator - 6.2.5.Final + 7.0.5.Final org.slf4j diff --git a/src/main/java/com/tngtech/configbuilder/exception/ValidatorException.java b/src/main/java/com/tngtech/configbuilder/exception/ValidatorException.java index b54abbe8..e3e2059e 100644 --- a/src/main/java/com/tngtech/configbuilder/exception/ValidatorException.java +++ b/src/main/java/com/tngtech/configbuilder/exception/ValidatorException.java @@ -2,7 +2,7 @@ import com.google.common.collect.Sets; -import javax.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolation; import java.util.Set; public class ValidatorException extends RuntimeException { diff --git a/src/main/java/com/tngtech/configbuilder/util/ConfigBuilderFactory.java b/src/main/java/com/tngtech/configbuilder/util/ConfigBuilderFactory.java index a481d2b5..77808a6d 100644 --- a/src/main/java/com/tngtech/configbuilder/util/ConfigBuilderFactory.java +++ b/src/main/java/com/tngtech/configbuilder/util/ConfigBuilderFactory.java @@ -11,8 +11,8 @@ import com.tngtech.configbuilder.configuration.ErrorMessageSetup; import com.tngtech.configbuilder.exception.FactoryInstantiationException; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import java.lang.reflect.Constructor; import java.util.Map; diff --git a/src/main/java/com/tngtech/configbuilder/util/ConfigValidator.java b/src/main/java/com/tngtech/configbuilder/util/ConfigValidator.java index 6ac9fcb5..02ca5e69 100644 --- a/src/main/java/com/tngtech/configbuilder/util/ConfigValidator.java +++ b/src/main/java/com/tngtech/configbuilder/util/ConfigValidator.java @@ -7,9 +7,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import java.lang.reflect.Method; import java.util.Set; diff --git a/src/test/java/com/tngtech/configbuilder/ConfigBuilderIntegrationTest.java b/src/test/java/com/tngtech/configbuilder/ConfigBuilderIntegrationTest.java index 2bfcf481..a8b8df3a 100644 --- a/src/test/java/com/tngtech/configbuilder/ConfigBuilderIntegrationTest.java +++ b/src/test/java/com/tngtech/configbuilder/ConfigBuilderIntegrationTest.java @@ -6,7 +6,7 @@ import org.junit.Rule; import org.junit.Test; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; diff --git a/src/test/java/com/tngtech/configbuilder/util/ConfigBuilderFactoryTest.java b/src/test/java/com/tngtech/configbuilder/util/ConfigBuilderFactoryTest.java index 0a6e0362..7bd0e4ad 100644 --- a/src/test/java/com/tngtech/configbuilder/util/ConfigBuilderFactoryTest.java +++ b/src/test/java/com/tngtech/configbuilder/util/ConfigBuilderFactoryTest.java @@ -7,8 +7,8 @@ import org.junit.Before; import org.junit.Test; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/com/tngtech/configbuilder/util/ConfigValidatorTest.java b/src/test/java/com/tngtech/configbuilder/util/ConfigValidatorTest.java index 01e95d40..c389bb2e 100644 --- a/src/test/java/com/tngtech/configbuilder/util/ConfigValidatorTest.java +++ b/src/test/java/com/tngtech/configbuilder/util/ConfigValidatorTest.java @@ -9,9 +9,9 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import javax.validation.ConstraintViolation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import java.util.Set; import static com.google.common.collect.Sets.newHashSet;