You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by jl...@apache.org on 2023/02/06 10:25:26 UTC
[bval] 02/02: Move packages to jakarta and update deployment descriptors
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakarta-namespace
in repository https://gitbox.apache.org/repos/asf/bval.git
commit b61798dce9baacfb1a4890f8cb6bb3d32df33804
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Mon Feb 6 11:18:16 2023 +0100
Move packages to jakarta and update deployment descriptors
---
CHANGES.txt | 2 +-
README.txt | 2 +-
.../extras/constraints/checkdigit/ABANumber.java | 4 +-
.../bval/extras/constraints/checkdigit/CUSIP.java | 4 +-
.../bval/extras/constraints/checkdigit/EAN13.java | 4 +-
.../bval/extras/constraints/checkdigit/IBAN.java | 4 +-
.../constraints/checkdigit/IBANValidator.java | 4 +-
.../bval/extras/constraints/checkdigit/ISBN10.java | 4 +-
.../bval/extras/constraints/checkdigit/Luhn.java | 4 +-
.../constraints/checkdigit/ModulusValidator.java | 4 +-
.../bval/extras/constraints/checkdigit/Sedol.java | 4 +-
.../extras/constraints/checkdigit/Verhoeff.java | 4 +-
.../constraints/checkdigit/VerhoeffValidator.java | 4 +-
.../constraints/creditcard/AmericanExpress.java | 6 +-
.../bval/extras/constraints/creditcard/Diners.java | 6 +-
.../extras/constraints/creditcard/Discover.java | 6 +-
.../extras/constraints/creditcard/Mastercard.java | 6 +-
.../bval/extras/constraints/creditcard/Visa.java | 6 +-
.../bval/extras/constraints/file/Directory.java | 4 +-
.../constraints/file/DirectoryValidator.java | 4 +-
.../bval/extras/constraints/file/NotDirectory.java | 4 +-
.../constraints/file/NotDirectoryValidator.java | 4 +-
.../bval/extras/constraints/file/Symlink.java | 4 +-
.../extras/constraints/file/SymlinkValidator.java | 4 +-
.../apache/bval/extras/constraints/net/Domain.java | 4 +-
.../extras/constraints/net/DomainValidator.java | 4 +-
.../bval/extras/constraints/net/InetAddress.java | 4 +-
.../constraints/net/InetAddressValidator.java | 4 +-
.../checkdigit/ABANumberValidatorTest.java | 2 +-
.../checkdigit/AbstractCheckDigitTest.java | 2 +-
.../constraints/checkdigit/CUSIPValidatorTest.java | 2 +-
.../checkdigit/EAN13CheckDigitTest.java | 2 +-
.../constraints/checkdigit/IBANCheckDigitTest.java | 2 +-
.../checkdigit/ISBN10CheckDigitTest.java | 2 +-
.../constraints/checkdigit/LuhnCheckDigitTest.java | 2 +-
.../checkdigit/SedolCheckDigitTest.java | 2 +-
.../checkdigit/VerhoeffCheckDigitTest.java | 2 +-
.../constraints/net/DomainValidatorTest.java | 2 +-
.../main/java/org/apache/bval/cdi/AnyLiteral.java | 2 +-
.../org/apache/bval/cdi/BValAnnotatedType.java | 8 +-
.../main/java/org/apache/bval/cdi/BValBinding.java | 2 +-
.../java/org/apache/bval/cdi/BValExtension.java | 57 ++--
.../java/org/apache/bval/cdi/BValInterceptor.java | 36 +--
.../org/apache/bval/cdi/BValInterceptorBean.java | 24 +-
.../java/org/apache/bval/cdi/DefaultLiteral.java | 2 +-
.../apache/bval/cdi/EmptyAnnotationLiteral.java | 2 +-
.../java/org/apache/bval/cdi/ValidatorBean.java | 17 +-
.../org/apache/bval/cdi/ValidatorFactoryBean.java | 17 +-
.../bval/constraints/AbstractPatternValidator.java | 6 +-
.../bval/constraints/AssertFalseValidator.java | 6 +-
.../bval/constraints/AssertTrueValidator.java | 6 +-
.../bval/constraints/DecimalMaxValidator.java | 6 +-
.../bval/constraints/DecimalMinValidator.java | 6 +-
.../bval/constraints/DigitsValidatorForNumber.java | 6 +-
.../bval/constraints/DigitsValidatorForString.java | 6 +-
.../java/org/apache/bval/constraints/Email.java | 14 +-
.../apache/bval/constraints/EmailValidator.java | 6 +-
.../bval/constraints/FutureOrPresentValidator.java | 4 +-
.../apache/bval/constraints/FutureValidator.java | 4 +-
.../bval/constraints/MaxValidatorForNumber.java | 6 +-
.../bval/constraints/MaxValidatorForString.java | 6 +-
.../bval/constraints/MinValidatorForNumber.java | 6 +-
.../bval/constraints/MinValidatorForString.java | 6 +-
.../apache/bval/constraints/NotBlankValidator.java | 6 +-
.../java/org/apache/bval/constraints/NotEmpty.java | 10 +-
.../apache/bval/constraints/NotEmptyValidator.java | 8 +-
.../NotEmptyValidatorForCharSequence.java | 6 +-
.../NotEmptyValidatorForCollection.java | 6 +-
.../bval/constraints/NotEmptyValidatorForMap.java | 6 +-
.../apache/bval/constraints/NotNullValidator.java | 6 +-
.../org/apache/bval/constraints/NullValidator.java | 6 +-
.../bval/constraints/NumberSignValidator.java | 12 +-
.../bval/constraints/PastOrPresentValidator.java | 4 +-
.../org/apache/bval/constraints/PastValidator.java | 4 +-
.../apache/bval/constraints/PatternValidator.java | 4 +-
.../org/apache/bval/constraints/SizeValidator.java | 8 +-
.../org/apache/bval/constraints/TimeValidator.java | 4 +-
.../src/main/java/org/apache/bval/el/ELFacade.java | 24 +-
.../org/apache/bval/jsr/ApacheFactoryContext.java | 18 +-
.../org/apache/bval/jsr/ApacheMessageContext.java | 4 +-
.../apache/bval/jsr/ApacheValidationProvider.java | 14 +-
.../bval/jsr/ApacheValidatorConfiguration.java | 6 +-
.../apache/bval/jsr/ApacheValidatorFactory.java | 22 +-
.../bval/jsr/BootstrapConfigurationImpl.java | 4 +-
.../bval/jsr/CascadingPropertyValidator.java | 20 +-
.../org/apache/bval/jsr/ConfigurationImpl.java | 26 +-
.../bval/jsr/ConstraintAnnotationAttributes.java | 8 +-
.../java/org/apache/bval/jsr/ConstraintCached.java | 8 +-
.../org/apache/bval/jsr/ConstraintDefaults.java | 2 +-
.../apache/bval/jsr/ConstraintViolationImpl.java | 8 +-
.../jsr/DefaultConstraintValidatorFactory.java | 6 +-
.../bval/jsr/DefaultMessageInterpolator.java | 2 +-
.../jsr/DefaultValidationProviderResolver.java | 8 +-
.../java/org/apache/bval/jsr/GraphContext.java | 4 +-
.../org/apache/bval/jsr/ParticipantFactory.java | 2 +-
.../java/org/apache/bval/jsr/ValidatorImpl.java | 8 +-
.../java/org/apache/bval/jsr/descriptor/BeanD.java | 10 +-
.../bval/jsr/descriptor/CascadableContainerD.java | 8 +-
.../org/apache/bval/jsr/descriptor/ComposedD.java | 14 +-
.../apache/bval/jsr/descriptor/ConstraintD.java | 26 +-
.../apache/bval/jsr/descriptor/ConstructorD.java | 2 +-
.../bval/jsr/descriptor/ContainerElementTypeD.java | 2 +-
.../bval/jsr/descriptor/CrossParameterD.java | 2 +-
.../bval/jsr/descriptor/DescriptorManager.java | 12 +-
.../org/apache/bval/jsr/descriptor/ElementD.java | 4 +-
.../apache/bval/jsr/descriptor/ExecutableD.java | 8 +-
.../org/apache/bval/jsr/descriptor/Finder.java | 14 +-
.../apache/bval/jsr/descriptor/MetadataReader.java | 18 +-
.../org/apache/bval/jsr/descriptor/MethodD.java | 4 +-
.../org/apache/bval/jsr/descriptor/ParameterD.java | 2 +-
.../org/apache/bval/jsr/descriptor/PropertyD.java | 4 +-
.../apache/bval/jsr/descriptor/ReturnValueD.java | 8 +-
.../java/org/apache/bval/jsr/groups/Group.java | 4 +-
.../apache/bval/jsr/groups/GroupConversion.java | 2 +-
.../java/org/apache/bval/jsr/groups/Groups.java | 2 +-
.../org/apache/bval/jsr/groups/GroupsComputer.java | 10 +-
.../jsr/job/ComputeConstraintValidatorClass.java | 8 +-
.../jsr/job/ConstraintValidatorContextImpl.java | 14 +-
.../apache/bval/jsr/job/ValidateExecutable.java | 4 +-
.../apache/bval/jsr/job/ValidateParameters.java | 8 +-
.../org/apache/bval/jsr/job/ValidateProperty.java | 20 +-
.../apache/bval/jsr/job/ValidateReturnValue.java | 2 +-
.../org/apache/bval/jsr/job/ValidationJob.java | 30 +-
.../apache/bval/jsr/job/ValidationJobFactory.java | 6 +-
...AnnotationDeclaredValidatorMappingProvider.java | 4 +-
.../apache/bval/jsr/metadata/CompositeBuilder.java | 4 +-
.../bval/jsr/metadata/ContainerElementKey.java | 6 +-
.../apache/bval/jsr/metadata/HierarchyBuilder.java | 4 +-
.../java/org/apache/bval/jsr/metadata/Liskov.java | 8 +-
.../apache/bval/jsr/metadata/MetadataBuilders.java | 2 +-
.../apache/bval/jsr/metadata/MetadataSource.java | 4 +-
.../bval/jsr/metadata/ReflectionBuilder.java | 14 +-
.../apache/bval/jsr/metadata/ValidatorMapping.java | 2 +-
.../jsr/metadata/ValidatorMappingProvider.java | 4 +-
.../org/apache/bval/jsr/metadata/XmlBuilder.java | 12 +-
.../jsr/metadata/XmlValidationMappingProvider.java | 2 +-
.../parameter/DefaultParameterNameProvider.java | 2 +-
.../apache/bval/jsr/resolver/CachingRelevant.java | 2 +-
.../jsr/resolver/CachingTraversableResolver.java | 4 +-
.../jsr/resolver/DefaultTraversableResolver.java | 8 +-
.../bval/jsr/resolver/JPATraversableResolver.java | 8 +-
.../jsr/resolver/SimpleTraversableResolver.java | 4 +-
.../org/apache/bval/jsr/util/AnnotationProxy.java | 2 +-
.../bval/jsr/util/AnnotationProxyBuilder.java | 12 +-
.../apache/bval/jsr/util/AnnotationsManager.java | 16 +-
...rElementNodeBuilderCustomizableContextImpl.java | 10 +-
...tainerElementNodeBuilderDefinedContextImpl.java | 10 +-
.../ContainerElementNodeContextBuilderImpl.java | 12 +-
.../org/apache/bval/jsr/util/ExecutableTypes.java | 2 +-
.../LeafNodeBuilderCustomizableContextImpl.java | 8 +-
.../util/NodeBuilderCustomizableContextImpl.java | 8 +-
.../jsr/util/NodeBuilderDefinedContextImpl.java | 4 +-
.../bval/jsr/util/NodeContextBuilderImpl.java | 6 +-
.../java/org/apache/bval/jsr/util/NodeImpl.java | 18 +-
.../java/org/apache/bval/jsr/util/PathImpl.java | 2 +-
.../org/apache/bval/jsr/util/PathNavigation.java | 2 +-
.../bval/jsr/valueextraction/ExtractValues.java | 4 +-
.../bval/jsr/valueextraction/FxExtractor.java | 6 +-
.../valueextraction/IterableElementExtractor.java | 4 +-
.../jsr/valueextraction/ListElementExtractor.java | 4 +-
.../bval/jsr/valueextraction/MapExtractor.java | 4 +-
.../jsr/valueextraction/OptionalExtractor.java | 6 +-
.../bval/jsr/valueextraction/ValueExtractors.java | 12 +-
.../org/apache/bval/jsr/xml/MappingValidator.java | 2 +-
.../org/apache/bval/jsr/xml/SchemaManager.java | 8 +-
.../bval/jsr/xml/ValidationMappingParser.java | 6 +-
.../org/apache/bval/jsr/xml/ValidationParser.java | 13 +-
.../java/org/apache/bval/util/ValidatorUtils.java | 4 +-
...ion => jakarta.enterprise.inject.spi.Extension} | 32 +-
...r => jakarta.validation.spi.ValidationProvider} | 0
.../apache/bval/jsr/DefaultConstraints.properties | 46 +--
.../apache/bval/jsr/ValidationMessages.properties | 44 +--
.../bval/jsr/ValidationMessages_de.properties | 26 +-
.../bval/jsr/ValidationMessages_es.properties | 26 +-
.../bval/jsr/ValidationMessages_it.properties | 26 +-
.../valueextraction/DefaultExtractors.properties | 4 +-
bval-jsr/src/main/xjb/binding-customization.xjb | 20 +-
.../bval/constraints/AuthorAddressKnown.java | 8 +-
.../org/apache/bval/constraints/CompanyEmail.java | 8 +-
.../constraints/DecimalMinMaxValidatorsTest.java | 6 +-
.../bval/constraints/EmailValidatorTest.java | 2 +-
.../org/apache/bval/constraints/FrenchZipCode.java | 12 +-
.../bval/constraints/FrenchZipcodeValidator.java | 4 +-
.../bval/constraints/HasStringValidator.java | 4 +-
.../java/org/apache/bval/constraints/HasValue.java | 4 +-
.../constraints/MinMaxValidatorsForNumberTest.java | 10 +-
.../java/org/apache/bval/constraints/Password.java | 8 +-
.../bval/constraints/ZipCodeCityCoherence.java | 4 +-
.../constraints/ZipCodeCityCoherenceValidator.java | 4 +-
.../org/apache/bval/jsr/BeanDescriptorTest.java | 22 +-
.../java/org/apache/bval/jsr/BootstrapTest.java | 24 +-
.../apache/bval/jsr/CircularReferencesTest.java | 6 +-
.../apache/bval/jsr/ComposedConstraintsTest.java | 8 +-
.../apache/bval/jsr/ConstraintCompositionTest.java | 18 +-
.../apache/bval/jsr/ConstraintDefinitionsTest.java | 12 +-
.../jsr/ContextConstraintValidatorFactoryTest.java | 16 +-
.../jsr/CustomConstraintValidatorFactoryTest.java | 16 +-
.../bval/jsr/CustomValidatorFactoryTest.java | 22 +-
.../bval/jsr/DefaultMessageInterpolatorTest.java | 27 +-
.../apache/bval/jsr/ExceptionsContractTest.java | 10 +-
.../src/test/java/org/apache/bval/jsr/FooTest.java | 6 +-
.../test/java/org/apache/bval/jsr/Jsr303Test.java | 16 +-
.../test/java/org/apache/bval/jsr/LiskovTest.java | 6 +-
.../test/java/org/apache/bval/jsr/PayloadTest.java | 6 +-
.../org/apache/bval/jsr/TckReproducerTest.java | 4 +-
.../java/org/apache/bval/jsr/ValidationTest.java | 18 +-
.../org/apache/bval/jsr/ValidationTestBase.java | 6 +-
.../apache/bval/jsr/ValidatorResolutionTest.java | 12 +-
.../bval/jsr/example/AccessTestBusinessObject.java | 2 +-
.../java/org/apache/bval/jsr/example/Address.java | 10 +-
.../java/org/apache/bval/jsr/example/Author.java | 6 +-
.../java/org/apache/bval/jsr/example/Book.java | 10 +-
.../apache/bval/jsr/example/BusinessAddress.java | 2 +-
.../org/apache/bval/jsr/example/Continent.java | 4 +-
.../java/org/apache/bval/jsr/example/Country.java | 4 +-
.../java/org/apache/bval/jsr/example/Customer.java | 2 +-
.../java/org/apache/bval/jsr/example/Engine.java | 2 +-
.../java/org/apache/bval/jsr/example/Library.java | 4 +-
.../org/apache/bval/jsr/example/MaxTestEntity.java | 2 +-
.../bval/jsr/example/NoValidatorTestEntity.java | 2 +-
.../apache/bval/jsr/example/PreferredGuest.java | 2 +-
.../org/apache/bval/jsr/example/RecursiveFoo.java | 2 +-
.../apache/bval/jsr/example/SizeTestEntity.java | 2 +-
.../bval/jsr/extensions/ExampleMethodService.java | 8 +-
.../jsr/extensions/MethodValidatorImplTest.java | 12 +-
.../org/apache/bval/jsr/groups/BillableUser.java | 4 +-
.../bval/jsr/groups/CollectionValidationTest.java | 8 +-
.../bval/jsr/groups/CyclicGroupSequence.java | 2 +-
.../bval/jsr/groups/CyclicGroupSequence1.java | 2 +-
.../bval/jsr/groups/CyclicGroupSequence2.java | 2 +-
.../bval/jsr/groups/DefaultGroupSequenceTest.java | 4 +-
.../java/org/apache/bval/jsr/groups/GClass2.java | 2 +-
.../java/org/apache/bval/jsr/groups/GClass3.java | 2 +-
.../org/apache/bval/jsr/groups/GInterface1.java | 2 +-
.../jsr/groups/GroupSequenceIsolationTest.java | 8 +-
.../apache/bval/jsr/groups/GroupSequenceTest.java | 8 +-
.../bval/jsr/groups/GroupValidationTest.java | 2 +-
.../apache/bval/jsr/groups/GroupsComputerTest.java | 6 +-
.../apache/bval/jsr/groups/implicit/Auditable.java | 2 +-
.../jsr/groups/implicit/ImplicitGroupingTest.java | 4 +-
.../org/apache/bval/jsr/groups/implicit/Order.java | 4 +-
.../bval/jsr/groups/inheritance/BillableUser.java | 4 +-
.../bval/jsr/groups/inheritance/BuyInOneClick.java | 2 +-
.../groups/inheritance/GroupInheritanceTest.java | 4 +-
.../apache/bval/jsr/groups/redefining/Address.java | 6 +-
.../InvalidRedefinedDefaultGroupAddress.java | 4 +-
.../redefining/RedefiningDefaultGroupTest.java | 4 +-
.../java/org/apache/bval/jsr/issues/BVAL174.java | 8 +-
.../org/apache/bval/jsr/issues/BVAL174Test.java | 8 +-
.../org/apache/bval/jsr/util/PathImplTest.java | 4 +-
.../java/org/apache/bval/jsr/util/TestUtils.java | 6 +-
.../test/java/org/apache/bval/jsr/xml/Demo.java | 8 +-
.../apache/bval/jsr/xml/ValidationParserTest.java | 12 +-
.../test/resources/ValidationMessages.properties | 4 +-
bval-jsr/src/test/resources/sample-constraints.xml | 6 +-
.../java/org/apache/bval/jsr/Jsr303Benchmark.java | 14 +-
bval-tck-jakarta/pom.xml | 326 ---------------------
.../bval/arquillian/BValArquillianExtension.java | 55 ----
.../org/apache/bval/arquillian/EJBEnricher.java | 60 ----
.../apache/bval/arquillian/LogTckFormatter.java | 41 ---
.../bval/arquillian/jndi/BValJndiFactory.java | 55 ----
...org.jboss.arquillian.core.spi.LoadableExtension | 1 -
.../src/main/resources/jndi.properties | 17 --
.../src/test/beanvalidation-tck-tests-suite.xml | 36 ---
bval-tck-jakarta/src/test/resources/arquillian.xml | 28 --
.../src/test/resources/logging.properties | 21 --
bval-tck-jakarta/work-tests-suite.xml | 31 --
.../org/apache/bval/arquillian/EJBEnricher.java | 10 +-
.../bval/arquillian/jndi/BValJndiFactory.java | 2 +-
bval-tck/src/test/resources/arquillian.xml | 2 +-
src/site/resources/images/bval-bean-small.png | Bin 8302 -> 15147 bytes
271 files changed, 1003 insertions(+), 1677 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index b82e385..3d125bc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,7 +15,7 @@ Content
Overview
========
This is an implementation of the Java Bean Validation (JSRs 303, 349, 380)
-specification for Java EE and Java SE.
+specification for Jakarta EE and Java SE.
The technical objective is to provide a class level constraint declaration and
validation facility for the Java application developer, as well as a constraint
metadata repository and query API.
diff --git a/README.txt b/README.txt
index 12f27ff..58b6a3e 100644
--- a/README.txt
+++ b/README.txt
@@ -5,7 +5,7 @@ Licensed under Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0
About
=====
This is an implementation of the Java Bean Validation (JSRs 303, 349, 380)
-specification for Java EE and Java SE.
+specification for Jakarta EE and Java SE.
The technical objective is to provide a class level constraint declaration and
validation facility for the Java application developer, as well as a constraint
metadata repository and query API.
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java
index 821b6aa..58270d4 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ABANumber.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java
index 139ab50..892eef3 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/CUSIP.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java
index 667c786..a1f5d0b 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/EAN13.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java
index c48173f..3cbe937 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBAN.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java
index 1f392c7..f8016af 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/IBANValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import static java.lang.Character.getNumericValue;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java
index 9ce9b19..b6437cd 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ISBN10.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java
index 4e7ede5..b2c8c84 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Luhn.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java
index 57d463d..9db7609 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/ModulusValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import java.lang.annotation.Annotation;
import static java.lang.Character.getNumericValue;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java
index 67a2c01..ab9d0e3 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Sedol.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java
index d3afc67..4808726 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/Verhoeff.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java
index b6c6249..8807edb 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import static java.lang.Character.getNumericValue;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java
index 051d210..93d9a61 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/AmericanExpress.java
@@ -20,9 +20,9 @@ package org.apache.bval.extras.constraints.creditcard;
import org.apache.bval.extras.constraints.checkdigit.Luhn;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.Pattern;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java
index efb0772..6d40062 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Diners.java
@@ -20,9 +20,9 @@ package org.apache.bval.extras.constraints.creditcard;
import org.apache.bval.extras.constraints.checkdigit.Luhn;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.Pattern;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java
index 4e5ddd5..fdad2b6 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Discover.java
@@ -20,9 +20,9 @@ package org.apache.bval.extras.constraints.creditcard;
import org.apache.bval.extras.constraints.checkdigit.Luhn;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.Pattern;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java
index 1a9b6a5..e9502fe 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Mastercard.java
@@ -20,9 +20,9 @@ package org.apache.bval.extras.constraints.creditcard;
import org.apache.bval.extras.constraints.checkdigit.Luhn;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.Pattern;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java
index 2177f4a..74b874a 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/creditcard/Visa.java
@@ -20,9 +20,9 @@ package org.apache.bval.extras.constraints.creditcard;
import org.apache.bval.extras.constraints.checkdigit.Luhn;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.Pattern;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java
index 9604fab..95027d1 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Directory.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.file;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java
index 6bca3b7..d2163db 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/DirectoryValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.file;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import java.io.File;
/**
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java
index a3b85a2..7d9925e 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectory.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.file;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java
index 026f29a..e316b79 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/NotDirectoryValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.file;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import java.io.File;
/**
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java
index 8be6687..efa1096 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/Symlink.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.file;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java
index ef85896..281d5a5 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/file/SymlinkValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.file;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import java.io.File;
import java.io.IOException;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java
index 6f3aa97..e1e8c74 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/Domain.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.net;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java
index c7668d5..7dbe188 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.net;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java
index c720141..b732bf5 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddress.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.net;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java
index d482e01..94424b5 100644
--- a/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java
+++ b/bval-extras/src/main/java/org/apache/bval/extras/constraints/net/InetAddressValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.extras.constraints.net;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import java.util.regex.Pattern;
/**
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java
index 8cd2399..9986b5b 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ABANumberValidatorTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
/**
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java
index 190bd5b..9429454 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/AbstractCheckDigitTest.java
@@ -20,7 +20,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java
index fe13c4b..64d0fa2 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/CUSIPValidatorTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
/**
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java
index 052a1c9..2176ad5 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/EAN13CheckDigitTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
/**
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java
index 04cfd73..47ed9ca 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/IBANCheckDigitTest.java
@@ -19,7 +19,7 @@ package org.apache.bval.extras.constraints.checkdigit;
import org.junit.Ignore;
import org.junit.Test;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.List;
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java
index 4940c8b..c494280 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/ISBN10CheckDigitTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
/**
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java
index 2b09d50..d5b95c8 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/LuhnCheckDigitTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
/**
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java
index 55d1f51..d35c945 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/SedolCheckDigitTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.bval.extras.constraints.checkdigit;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
/**
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java
index fbd3c7f..fb70bea 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/checkdigit/VerhoeffCheckDigitTest.java
@@ -19,7 +19,7 @@ package org.apache.bval.extras.constraints.checkdigit;
import org.junit.Ignore;
import org.junit.Test;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import java.lang.annotation.Annotation;
/**
diff --git a/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java b/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java
index 33ffbf2..db85f58 100644
--- a/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java
+++ b/bval-extras/src/test/java/org/apache/bval/extras/constraints/net/DomainValidatorTest.java
@@ -19,7 +19,7 @@ package org.apache.bval.extras.constraints.net;
import org.junit.Before;
import org.junit.Test;
-import javax.validation.Payload;
+import jakarta.validation.Payload;
import java.lang.annotation.Annotation;
import static org.junit.Assert.assertFalse;
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/AnyLiteral.java b/bval-jsr/src/main/java/org/apache/bval/cdi/AnyLiteral.java
index 1e14f1e..2262420 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/AnyLiteral.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/AnyLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.cdi;
-import javax.enterprise.inject.Any;
+import jakarta.enterprise.inject.Any;
public class AnyLiteral extends EmptyAnnotationLiteral<Any> implements Any {
private static final long serialVersionUID = 1L;
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/BValAnnotatedType.java b/bval-jsr/src/main/java/org/apache/bval/cdi/BValAnnotatedType.java
index fa230f9..d8866af 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/BValAnnotatedType.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/BValAnnotatedType.java
@@ -23,10 +23,10 @@ import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.AnnotatedConstructor;
+import jakarta.enterprise.inject.spi.AnnotatedField;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
public class BValAnnotatedType<A> implements AnnotatedType<A> {
private final AnnotatedType<A> delegate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/BValBinding.java b/bval-jsr/src/main/java/org/apache/bval/cdi/BValBinding.java
index b8d7c11..8ce03ed 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/BValBinding.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/BValBinding.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.cdi;
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java b/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java
index e32bbf7..9943ca4 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/BValExtension.java
@@ -29,30 +29,31 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Stream;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.AfterDeploymentValidation;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeBeanDiscovery;
-import javax.enterprise.inject.spi.CDI;
-import javax.enterprise.inject.spi.Extension;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.ProcessAnnotatedType;
-import javax.enterprise.inject.spi.ProcessBean;
-import javax.validation.BootstrapConfiguration;
-import javax.validation.Configuration;
-import javax.validation.Constraint;
-import javax.validation.Valid;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.executable.ExecutableType;
-import javax.validation.executable.ValidateOnExecution;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanAttributes;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.enterprise.inject.spi.Extension;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
+import jakarta.enterprise.inject.spi.ProcessBean;
+import jakarta.validation.BootstrapConfiguration;
+import jakarta.validation.Configuration;
+import jakarta.validation.Constraint;
+import jakarta.validation.Valid;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.executable.ExecutableType;
+import jakarta.validation.executable.ValidateOnExecution;
import org.apache.bval.jsr.ConfigurationImpl;
import org.apache.bval.jsr.util.ExecutableTypes;
@@ -214,7 +215,7 @@ public class BValExtension implements Extension {
if (isSkippedAnnotation(type)) {
return false;
}
- if (type.getName().startsWith("javax.validation.constraints")) {
+ if (type.getName().startsWith("jakarta.validation.constraints")) {
return true;
}
if (notBValAnnotation.contains(type)) { // more likely so faster first
@@ -232,10 +233,10 @@ public class BValExtension implements Extension {
if (type.getName().startsWith("java.")) {
return true;
}
- if (type.getName().startsWith("javax.enterprise.")) {
+ if (type.getName().startsWith("jakarta.enterprise.")) {
return true;
}
- if (type.getName().startsWith("javax.inject.")) {
+ if (type.getName().startsWith("jakarta.inject.")) {
return true;
}
return false;
@@ -274,7 +275,7 @@ public class BValExtension implements Extension {
return null;
}
final AnnotatedType<T> annotatedType = beanManager.createAnnotatedType(clazz);
- final InjectionTarget<T> it = beanManager.createInjectionTarget(annotatedType);
+ final InjectionTarget<T> it = beanManager.getInjectionTargetFactory(annotatedType).createInjectionTarget(null);
final CreationalContext<T> context = beanManager.createCreationalContext(null);
final T instance = it.produce(context);
it.inject(instance, context);
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptor.java b/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptor.java
index 6a5a59c..77949ff 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptor.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptor.java
@@ -34,24 +34,24 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.BiPredicate;
-import javax.annotation.Priority;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.CDI;
-import javax.inject.Inject;
-import javax.interceptor.AroundConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InterceptorBinding;
-import javax.interceptor.InvocationContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validator;
-import javax.validation.executable.ExecutableType;
-import javax.validation.executable.ExecutableValidator;
-import javax.validation.executable.ValidateOnExecution;
-import javax.validation.metadata.ConstructorDescriptor;
-import javax.validation.metadata.MethodDescriptor;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.inject.spi.AnnotatedMethod;
+import jakarta.enterprise.inject.spi.AnnotatedType;
+import jakarta.enterprise.inject.spi.CDI;
+import jakarta.inject.Inject;
+import jakarta.interceptor.AroundConstruct;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InterceptorBinding;
+import jakarta.interceptor.InvocationContext;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
+import jakarta.validation.executable.ExecutableType;
+import jakarta.validation.executable.ExecutableValidator;
+import jakarta.validation.executable.ValidateOnExecution;
+import jakarta.validation.metadata.ConstructorDescriptor;
+import jakarta.validation.metadata.MethodDescriptor;
import org.apache.bval.jsr.descriptor.DescriptorManager;
import org.apache.bval.jsr.metadata.Signature;
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptorBean.java b/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptorBean.java
index 94a173c..c737d64 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptorBean.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/BValInterceptorBean.java
@@ -18,14 +18,14 @@
*/
package org.apache.bval.cdi;
-import javax.enterprise.context.Dependent;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.InjectionTarget;
-import javax.enterprise.inject.spi.PassivationCapable;
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Annotated;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.PassivationCapable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.lang.reflect.Type;
@@ -53,7 +53,8 @@ public class BValInterceptorBean implements Bean<BValInterceptor>, PassivationCa
q.add(AnyLiteral.INSTANCE);
qualifiers = Collections.unmodifiableSet(q);
- injectionTarget = bm.createInjectionTarget(bm.createAnnotatedType(BValInterceptor.class));
+ injectionTarget = bm.getInjectionTargetFactory(bm.createAnnotatedType(BValInterceptor.class))
+ .createInjectionTarget(null); // todo should it be this instead?
injectionPoints = Collections.singleton(InjectionPoint.class
.cast(new BValInterceptorInjectionPoint(this, injectionTarget.getInjectionPoints().iterator().next())));
}
@@ -78,11 +79,6 @@ public class BValInterceptorBean implements Bean<BValInterceptor>, PassivationCa
return null;
}
- @Override
- public boolean isNullable() {
- return false;
- }
-
@Override
public Set<InjectionPoint> getInjectionPoints() {
return injectionPoints;
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/DefaultLiteral.java b/bval-jsr/src/main/java/org/apache/bval/cdi/DefaultLiteral.java
index e86db31..8136f5c 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/DefaultLiteral.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/DefaultLiteral.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.cdi;
-import javax.enterprise.inject.Default;
+import jakarta.enterprise.inject.Default;
public class DefaultLiteral extends EmptyAnnotationLiteral<Default> implements Default {
private static final long serialVersionUID = 1L;
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/EmptyAnnotationLiteral.java b/bval-jsr/src/main/java/org/apache/bval/cdi/EmptyAnnotationLiteral.java
index e9e9f1a..37fcc01 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/EmptyAnnotationLiteral.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/EmptyAnnotationLiteral.java
@@ -22,7 +22,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.util.AnnotationLiteral;
/**
* Base class for AnnotationLiterals which have no members.
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorBean.java b/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorBean.java
index ee4f152..05f6aee 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorBean.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorBean.java
@@ -18,12 +18,12 @@
*/
package org.apache.bval.cdi;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.validation.Validator;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.validation.Validator;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collections;
@@ -73,11 +73,6 @@ public class ValidatorBean implements Bean<Validator>, PassivationCapable {
return null;
}
- @Override
- public boolean isNullable() {
- return false;
- }
-
@Override
public Set<InjectionPoint> getInjectionPoints() {
return Collections.emptySet();
diff --git a/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java b/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java
index 8dd7073..e0daeb1 100644
--- a/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java
+++ b/bval-jsr/src/main/java/org/apache/bval/cdi/ValidatorFactoryBean.java
@@ -18,12 +18,12 @@
*/
package org.apache.bval.cdi;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
-import javax.enterprise.inject.spi.PassivationCapable;
-import javax.validation.ValidatorFactory;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.InjectionPoint;
+import jakarta.enterprise.inject.spi.PassivationCapable;
+import jakarta.validation.ValidatorFactory;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Collections;
@@ -73,11 +73,6 @@ public class ValidatorFactoryBean implements Bean<ValidatorFactory>, Passivation
return null;
}
- @Override
- public boolean isNullable() {
- return false;
- }
-
@Override
public Set<InjectionPoint> getInjectionPoints() {
return Collections.emptySet();
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/AbstractPatternValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/AbstractPatternValidator.java
index 888eb51..34b66e9 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/AbstractPatternValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/AbstractPatternValidator.java
@@ -23,9 +23,9 @@ import java.util.function.Function;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Pattern.Flag;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Pattern.Flag;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/AssertFalseValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/AssertFalseValidator.java
index 143b76a..b71f0b8 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/AssertFalseValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/AssertFalseValidator.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.AssertFalse;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.AssertFalse;
/**
* Description: assert that value is false<br/>
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/AssertTrueValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/AssertTrueValidator.java
index 93ae933..fc8d9ee 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/AssertTrueValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/AssertTrueValidator.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.AssertTrue;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.AssertTrue;
/**
* Description: assert that value is true<br/>
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMaxValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMaxValidator.java
index 1862168..5ba2462 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMaxValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMaxValidator.java
@@ -21,9 +21,9 @@ package org.apache.bval.constraints;
import java.math.BigDecimal;
import java.math.BigInteger;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.DecimalMax;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.DecimalMax;
public abstract class DecimalMaxValidator<T> implements ConstraintValidator<DecimalMax, T> {
public static class ForString extends DecimalMaxValidator<String> {
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMinValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMinValidator.java
index 9ada336..f53e918 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMinValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/DecimalMinValidator.java
@@ -21,9 +21,9 @@ package org.apache.bval.constraints;
import java.math.BigDecimal;
import java.math.BigInteger;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.DecimalMin;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.DecimalMin;
public abstract class DecimalMinValidator<T> implements ConstraintValidator<DecimalMin, T> {
public static class ForString extends DecimalMinValidator<String> {
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/DigitsValidatorForNumber.java b/bval-jsr/src/main/java/org/apache/bval/constraints/DigitsValidatorForNumber.java
index bee7a94..f2dd35f 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/DigitsValidatorForNumber.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/DigitsValidatorForNumber.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Digits;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Digits;
import java.math.BigDecimal;
/**
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/DigitsValidatorForString.java b/bval-jsr/src/main/java/org/apache/bval/constraints/DigitsValidatorForString.java
index 1506f7d..d541e3c 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/DigitsValidatorForString.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/DigitsValidatorForString.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Digits;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Digits;
import java.math.BigDecimal;
/**
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/Email.java b/bval-jsr/src/main/java/org/apache/bval/constraints/Email.java
index f1f9435..e2ad0f7 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/Email.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/Email.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.Constraint;
-import javax.validation.OverridesAttribute;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.OverridesAttribute;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
@@ -44,16 +44,16 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Deprecated
@Documented
@Constraint(validatedBy = {})
-@javax.validation.constraints.Email
+@jakarta.validation.constraints.Email
@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
@Retention(RUNTIME)
public @interface Email {
- @OverridesAttribute(constraint = javax.validation.constraints.Email.class, name = "groups")
+ @OverridesAttribute(constraint = jakarta.validation.constraints.Email.class, name = "groups")
Class<?>[] groups() default {};
- @OverridesAttribute(constraint = javax.validation.constraints.Email.class, name = "message")
+ @OverridesAttribute(constraint = jakarta.validation.constraints.Email.class, name = "message")
String message() default "{org.apache.bval.constraints.Email.message}";
- @OverridesAttribute(constraint = javax.validation.constraints.Email.class, name = "payload")
+ @OverridesAttribute(constraint = jakarta.validation.constraints.Email.class, name = "payload")
Class<? extends Payload>[] payload() default {};
}
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/EmailValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/EmailValidator.java
index dca7753..4e33882 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/EmailValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/EmailValidator.java
@@ -18,15 +18,15 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Pattern.Flag;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Pattern.Flag;
import org.apache.bval.routines.EMailValidationUtils;
/**
* Description: <br/>
*/
-public class EmailValidator extends AbstractPatternValidator<javax.validation.constraints.Email, CharSequence> {
+public class EmailValidator extends AbstractPatternValidator<jakarta.validation.constraints.Email, CharSequence> {
public EmailValidator() {
super(email -> new PatternDescriptor() {
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/FutureOrPresentValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/FutureOrPresentValidator.java
index fc358b4..9bead53 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/FutureOrPresentValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/FutureOrPresentValidator.java
@@ -39,8 +39,8 @@ import java.util.GregorianCalendar;
import java.util.function.Function;
import java.util.function.IntPredicate;
-import javax.validation.ConstraintValidator;
-import javax.validation.constraints.FutureOrPresent;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.constraints.FutureOrPresent;
/**
* Defines built-in {@link ConstraintValidator} implementations for {@link FutureOrPresent}.
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/FutureValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/FutureValidator.java
index 1362cae..c248b38 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/FutureValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/FutureValidator.java
@@ -39,8 +39,8 @@ import java.util.GregorianCalendar;
import java.util.function.Function;
import java.util.function.IntPredicate;
-import javax.validation.ConstraintValidator;
-import javax.validation.constraints.Future;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.constraints.Future;
/**
* Defines built-in {@link ConstraintValidator} implementations for {@link Future}.
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/MaxValidatorForNumber.java b/bval-jsr/src/main/java/org/apache/bval/constraints/MaxValidatorForNumber.java
index 0ad81a8..56896c2 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/MaxValidatorForNumber.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/MaxValidatorForNumber.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Max;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Max;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/MaxValidatorForString.java b/bval-jsr/src/main/java/org/apache/bval/constraints/MaxValidatorForString.java
index f14f8e7..061f6ec 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/MaxValidatorForString.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/MaxValidatorForString.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Max;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Max;
import java.math.BigDecimal;
/**
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/MinValidatorForNumber.java b/bval-jsr/src/main/java/org/apache/bval/constraints/MinValidatorForNumber.java
index c467de2..0218cc5 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/MinValidatorForNumber.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/MinValidatorForNumber.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Min;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Min;
import java.math.BigDecimal;
import java.math.BigInteger;
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/MinValidatorForString.java b/bval-jsr/src/main/java/org/apache/bval/constraints/MinValidatorForString.java
index 5d45fc2..ec5ab8d 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/MinValidatorForString.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/MinValidatorForString.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Min;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Min;
import java.math.BigDecimal;
/**
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NotBlankValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NotBlankValidator.java
index 178bbc1..9d87173 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NotBlankValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NotBlankValidator.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.NotBlank;
/**
* Validate {@link NotBlank} for {@link CharSequence}.
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmpty.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmpty.java
index 00497ea..5bec1d2 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmpty.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmpty.java
@@ -30,9 +30,9 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.OverridesAttribute;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.OverridesAttribute;
+import jakarta.validation.Payload;
/**
* <pre>
@@ -44,12 +44,12 @@ import javax.validation.Payload;
@Constraint(validatedBy = {})
@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
@Retention(RUNTIME)
-@javax.validation.constraints.NotEmpty
+@jakarta.validation.constraints.NotEmpty
@Deprecated
public @interface NotEmpty {
Class<?>[] groups() default {};
- @OverridesAttribute(constraint = javax.validation.constraints.NotEmpty.class, name = "message")
+ @OverridesAttribute(constraint = jakarta.validation.constraints.NotEmpty.class, name = "message")
String message() default "{org.apache.bval.constraints.NotEmpty.message}";
Class<? extends Payload>[] payload() default {};
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java
index 73b3feb..0d49323 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidator.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.NotEmpty;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
@@ -31,7 +31,7 @@ import java.lang.reflect.Method;
* Additionally, check the non-emptiness of an
* any object that has a public isEmpty():boolean or a valid toString() method.
*/
-public class NotEmptyValidator implements ConstraintValidator<javax.validation.constraints.NotEmpty, Object> {
+public class NotEmptyValidator implements ConstraintValidator<jakarta.validation.constraints.NotEmpty, Object> {
@Override
public boolean isValid(Object value, ConstraintValidatorContext context) {
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForCharSequence.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForCharSequence.java
index d408ab7..44bd2ae 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForCharSequence.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForCharSequence.java
@@ -18,14 +18,14 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
/**
* Description: <br/>
*/
public class NotEmptyValidatorForCharSequence
- implements ConstraintValidator<javax.validation.constraints.NotEmpty, CharSequence> {
+ implements ConstraintValidator<jakarta.validation.constraints.NotEmpty, CharSequence> {
@Override
public boolean isValid(CharSequence value, ConstraintValidatorContext context) {
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForCollection.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForCollection.java
index ab8a39b..da77739 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForCollection.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForCollection.java
@@ -18,15 +18,15 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import java.util.Collection;
/**
* Description: <br/>
*/
public class NotEmptyValidatorForCollection
- implements ConstraintValidator<javax.validation.constraints.NotEmpty, Collection<?>> {
+ implements ConstraintValidator<jakarta.validation.constraints.NotEmpty, Collection<?>> {
@Override
public boolean isValid(Collection<?> value, ConstraintValidatorContext context) {
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForMap.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForMap.java
index 1ce6c9b..b2fd0fd 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForMap.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NotEmptyValidatorForMap.java
@@ -18,14 +18,14 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import java.util.Map;
/**
* Description: <br/>
*/
-public class NotEmptyValidatorForMap implements ConstraintValidator<javax.validation.constraints.NotEmpty, Map<?, ?>> {
+public class NotEmptyValidatorForMap implements ConstraintValidator<jakarta.validation.constraints.NotEmpty, Map<?, ?>> {
@Override
public boolean isValid(Map<?, ?> value, ConstraintValidatorContext context) {
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NotNullValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NotNullValidator.java
index c14cff2..e6f1c80 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NotNullValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NotNullValidator.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.NotNull;
/** valid when object is NOT null */
public class NotNullValidator implements ConstraintValidator<NotNull, Object> {
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NullValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NullValidator.java
index 523ef75..2330f70 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NullValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NullValidator.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Null;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Null;
/**
* Description: valid when object is null<br/>
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java
index 6635387..5790dd0 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java
@@ -21,12 +21,12 @@ package org.apache.bval.constraints;
import java.lang.annotation.Annotation;
import java.util.function.IntPredicate;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.constraints.Negative;
-import javax.validation.constraints.NegativeOrZero;
-import javax.validation.constraints.Positive;
-import javax.validation.constraints.PositiveOrZero;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.constraints.Negative;
+import jakarta.validation.constraints.NegativeOrZero;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/PastOrPresentValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/PastOrPresentValidator.java
index c678827..d399040 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/PastOrPresentValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/PastOrPresentValidator.java
@@ -39,8 +39,8 @@ import java.util.GregorianCalendar;
import java.util.function.Function;
import java.util.function.IntPredicate;
-import javax.validation.ConstraintValidator;
-import javax.validation.constraints.PastOrPresent;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.constraints.PastOrPresent;
/**
* Defines built-in {@link ConstraintValidator} implementations for {@link PastOrPresent}.
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/PastValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/PastValidator.java
index ae61fcc..ef1fb97 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/PastValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/PastValidator.java
@@ -39,8 +39,8 @@ import java.util.GregorianCalendar;
import java.util.function.Function;
import java.util.function.IntPredicate;
-import javax.validation.ConstraintValidator;
-import javax.validation.constraints.Past;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.constraints.Past;
/**
* Defines built-in {@link ConstraintValidator} implementations for {@link Past}.
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/PatternValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/PatternValidator.java
index 3d0fdd4..d0c8479 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/PatternValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/PatternValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.constraints;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Pattern.Flag;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Pattern.Flag;
/**
* validator using a regular expression, based on the jsr Pattern constraint annotation.
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidator.java
index ea916c5..2bbbdd1 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/SizeValidator.java
@@ -23,10 +23,10 @@ import java.util.Collection;
import java.util.Map;
import java.util.function.ToIntFunction;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ValidationException;
-import javax.validation.constraints.Size;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ValidationException;
+import jakarta.validation.constraints.Size;
/**
* Description: Abstract validator impl. for @Size annotation.
diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/TimeValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/TimeValidator.java
index 034e9d1..5c58813 100644
--- a/bval-jsr/src/main/java/org/apache/bval/constraints/TimeValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/constraints/TimeValidator.java
@@ -27,8 +27,8 @@ import java.util.Comparator;
import java.util.function.Function;
import java.util.function.IntPredicate;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
public abstract class TimeValidator<A extends Annotation, T> implements ConstraintValidator<A, T> {
protected static final Comparator<ChronoLocalDate> CHRONO_LOCAL_DATE_COMPARATOR =
diff --git a/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java b/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java
index acdf5e0..f9e3ee3 100644
--- a/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java
+++ b/bval-jsr/src/main/java/org/apache/bval/el/ELFacade.java
@@ -21,18 +21,18 @@ import java.util.Formatter;
import java.util.HashMap;
import java.util.Map;
-import javax.el.ArrayELResolver;
-import javax.el.BeanELResolver;
-import javax.el.CompositeELResolver;
-import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.ExpressionFactory;
-import javax.el.FunctionMapper;
-import javax.el.ListELResolver;
-import javax.el.MapELResolver;
-import javax.el.ResourceBundleELResolver;
-import javax.el.ValueExpression;
-import javax.el.VariableMapper;
+import jakarta.el.ArrayELResolver;
+import jakarta.el.BeanELResolver;
+import jakarta.el.CompositeELResolver;
+import jakarta.el.ELContext;
+import jakarta.el.ELResolver;
+import jakarta.el.ExpressionFactory;
+import jakarta.el.FunctionMapper;
+import jakarta.el.ListELResolver;
+import jakarta.el.MapELResolver;
+import jakarta.el.ResourceBundleELResolver;
+import jakarta.el.ValueExpression;
+import jakarta.el.VariableMapper;
import org.apache.bval.jsr.util.LookBehindRegexHolder;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheFactoryContext.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheFactoryContext.java
index 1ea3aed..6dde017 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheFactoryContext.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheFactoryContext.java
@@ -21,15 +21,15 @@ package org.apache.bval.jsr;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Supplier;
-import javax.validation.ClockProvider;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.ParameterNameProvider;
-import javax.validation.TraversableResolver;
-import javax.validation.Validator;
-import javax.validation.ValidatorContext;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.ClockProvider;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorContext;
+import jakarta.validation.valueextraction.ValueExtractor;
import org.apache.bval.jsr.descriptor.ConstraintD;
import org.apache.bval.jsr.descriptor.DescriptorManager;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheMessageContext.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheMessageContext.java
index 2733299..e6da474 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheMessageContext.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheMessageContext.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr;
-import javax.validation.MessageInterpolator;
-import javax.validation.MessageInterpolator.Context;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.MessageInterpolator.Context;
/**
* Vendor-specific {@link MessageInterpolator.Context} interface extension to
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidationProvider.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidationProvider.java
index 896529e..d1dced4 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidationProvider.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidationProvider.java
@@ -18,12 +18,12 @@
*/
package org.apache.bval.jsr;
-import javax.validation.Configuration;
-import javax.validation.ValidationException;
-import javax.validation.ValidatorFactory;
-import javax.validation.spi.BootstrapState;
-import javax.validation.spi.ConfigurationState;
-import javax.validation.spi.ValidationProvider;
+import jakarta.validation.Configuration;
+import jakarta.validation.ValidationException;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.spi.BootstrapState;
+import jakarta.validation.spi.ConfigurationState;
+import jakarta.validation.spi.ValidationProvider;
import org.apache.bval.util.Exceptions;
import org.apache.bval.util.reflection.Reflection;
@@ -69,7 +69,7 @@ public class ApacheValidationProvider implements ValidationProvider<ApacheValida
/**
* {@inheritDoc}
*
- * @throws javax.validation.ValidationException
+ * @throws jakarta.validation.ValidationException
* if the ValidatorFactory cannot be built
*/
@Override
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorConfiguration.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorConfiguration.java
index c2167d6..5303a19 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorConfiguration.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorConfiguration.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.jsr;
-import javax.validation.Configuration;
-import javax.validation.ValidatorFactory;
-import javax.validation.spi.ConfigurationState;
+import jakarta.validation.Configuration;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.spi.ConfigurationState;
/**
* Description: Uniquely identify Apache BVal in the Bean Validation bootstrap
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorFactory.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorFactory.java
index 5be6796..a7b6188 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorFactory.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ApacheValidatorFactory.java
@@ -27,17 +27,17 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiConsumer;
-import javax.validation.ClockProvider;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.ParameterNameProvider;
-import javax.validation.TraversableResolver;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.spi.ConfigurationState;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.ClockProvider;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.spi.ConfigurationState;
+import jakarta.validation.valueextraction.ValueExtractor;
import org.apache.bval.jsr.descriptor.DescriptorManager;
import org.apache.bval.jsr.groups.GroupsComputer;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java
index 0052998..058a8c1 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/BootstrapConfigurationImpl.java
@@ -23,8 +23,8 @@ import java.util.EnumSet;
import java.util.Map;
import java.util.Set;
-import javax.validation.BootstrapConfiguration;
-import javax.validation.executable.ExecutableType;
+import jakarta.validation.BootstrapConfiguration;
+import jakarta.validation.executable.ExecutableType;
import org.apache.bval.jsr.util.ExecutableTypes;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/CascadingPropertyValidator.java b/bval-jsr/src/main/java/org/apache/bval/jsr/CascadingPropertyValidator.java
index f183c12..478b635 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/CascadingPropertyValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/CascadingPropertyValidator.java
@@ -16,10 +16,10 @@
*/
package org.apache.bval.jsr;
-import javax.validation.ConstraintViolation;
-import javax.validation.Valid;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Valid;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
import java.util.Set;
@@ -45,7 +45,7 @@ public interface CascadingPropertyValidator extends Validator {
* @param propertyName property to validate (i.e. field and getter constraints). Nested
* properties may be referenced (e.g. prop[2].subpropA.subpropB)
* @param groups group or list of groups targeted for validation (default to
- * {@link javax.validation.groups.Default})
+ * {@link jakarta.validation.groups.Default})
* @return constraint violations or an empty {@link Set} if none
* @throws IllegalArgumentException if {@code object} is {@code null}, if {@code propertyName null},
* empty or not a valid object property or if {@code null} is
@@ -65,14 +65,14 @@ public interface CascadingPropertyValidator extends Validator {
* properties may be referenced (e.g. prop[2].subpropA.subpropB)
* @param cascade whether to cascade along {@link Valid} properties
* @param groups group or list of groups targeted for validation (default to
- * {@link javax.validation.groups.Default})
+ * {@link jakarta.validation.groups.Default})
* @return constraint violations or an empty {@link Set} if none
* @throws IllegalArgumentException if {@code object} is {@code null}, if {@code propertyName null},
* empty or not a valid object property or if {@code null} is
* passed to the varargs {@code groups}
* @throws ValidationException if a non recoverable error happens during the validation process
*/
- <T> Set<javax.validation.ConstraintViolation<T>> validateProperty(T object, String propertyName, boolean cascade,
+ <T> Set<jakarta.validation.ConstraintViolation<T>> validateProperty(T object, String propertyName, boolean cascade,
Class<?>... groups);
/**
@@ -86,7 +86,7 @@ public interface CascadingPropertyValidator extends Validator {
* @param propertyName property to validate
* @param value property value to validate
* @param groups group or list of groups targeted for validation (default to
- * {@link javax.validation.groups.Default})
+ * {@link jakarta.validation.groups.Default})
* @return constraint violations or an empty {@link Set} if none
* @throws IllegalArgumentException if {@code beanType} is {@code null}, if
* {@code propertyName null}, empty or not a valid object
@@ -110,13 +110,13 @@ public interface CascadingPropertyValidator extends Validator {
* @param propertyName property to validate
* @param value property value to validate
* @param groups group or list of groups targeted for validation (default to
- * {@link javax.validation.groups.Default})
+ * {@link jakarta.validation.groups.Default})
* @return constraint violations or an empty {@link Set} if none
* @throws IllegalArgumentException if {@code beanType} is {@code null}, if
* {@code propertyName null}, empty or not a valid object
* property or if {@code null} is passed to the varargs {@code groups}
* @throws ValidationException if a non recoverable error happens during the validation process
*/
- <T> Set<javax.validation.ConstraintViolation<T>> validateValue(Class<T> beanType, String propertyName, Object value,
+ <T> Set<jakarta.validation.ConstraintViolation<T>> validateValue(Class<T> beanType, String propertyName, Object value,
boolean cascade, Class<?>... groups);
}
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
index 0bc02aa..4309552 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConfigurationImpl.java
@@ -30,19 +30,19 @@ import java.util.Optional;
import java.util.Set;
import java.util.function.Supplier;
-import javax.validation.BootstrapConfiguration;
-import javax.validation.ClockProvider;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.ParameterNameProvider;
-import javax.validation.TraversableResolver;
-import javax.validation.ValidationException;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.ValidatorFactory;
-import javax.validation.spi.BootstrapState;
-import javax.validation.spi.ConfigurationState;
-import javax.validation.spi.ValidationProvider;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.BootstrapConfiguration;
+import jakarta.validation.ClockProvider;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.ValidationException;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.spi.BootstrapState;
+import jakarta.validation.spi.ConfigurationState;
+import jakarta.validation.spi.ValidationProvider;
+import jakarta.validation.valueextraction.ValueExtractor;
import org.apache.bval.jsr.parameter.DefaultParameterNameProvider;
import org.apache.bval.jsr.resolver.DefaultTraversableResolver;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java
index ecc1ef7..5798a28 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintAnnotationAttributes.java
@@ -27,9 +27,9 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Predicate;
-import javax.validation.Constraint;
-import javax.validation.ConstraintTarget;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintTarget;
+import jakarta.validation.Payload;
import org.apache.bval.util.Exceptions;
import org.apache.bval.util.ObjectUtils;
@@ -150,7 +150,7 @@ public enum ConstraintAnnotationAttributes {
}
public <C extends Annotation> Worker<C> analyze(final Class<C> clazz) {
- if (clazz.getName().startsWith("javax.validation.constraint.")) { // cache only APIs classes to avoid memory leaks
+ if (clazz.getName().startsWith("jakarta.validation.constraint.")) { // cache only APIs classes to avoid memory leaks
@SuppressWarnings({ "unchecked", "rawtypes" })
final Worker<C> w = (Worker<C>) WORKER_CACHE.computeIfAbsent(clazz, c -> new Worker((c)));
return w;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java
index 7af0488..2dc1279 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java
@@ -30,10 +30,10 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
-import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintValidator;
-import javax.validation.constraintvalidation.SupportedValidationTarget;
-import javax.validation.constraintvalidation.ValidationTarget;
+import jakarta.validation.ConstraintDefinitionException;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.constraintvalidation.SupportedValidationTarget;
+import jakarta.validation.constraintvalidation.ValidationTarget;
import org.apache.bval.jsr.descriptor.ConstraintD;
import org.apache.bval.jsr.metadata.AnnotationDeclaredValidatorMappingProvider;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintDefaults.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintDefaults.java
index e5184c3..e21453e 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintDefaults.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintDefaults.java
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import org.apache.bval.jsr.metadata.ClassLoadingValidatorMappingProvider;
import org.apache.bval.jsr.metadata.ValidatorMapping;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintViolationImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintViolationImpl.java
index 2bf6d3b..75a99ec 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintViolationImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintViolationImpl.java
@@ -16,10 +16,10 @@
*/
package org.apache.bval.jsr;
-import javax.validation.ConstraintViolation;
-import javax.validation.Path;
-import javax.validation.ValidationException;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Path;
+import jakarta.validation.ValidationException;
+import jakarta.validation.metadata.ConstraintDescriptor;
import org.apache.bval.util.Exceptions;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultConstraintValidatorFactory.java b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultConstraintValidatorFactory.java
index 7bfb7bf..704dcd0 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultConstraintValidatorFactory.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultConstraintValidatorFactory.java
@@ -20,9 +20,9 @@ package org.apache.bval.jsr;
import org.apache.bval.cdi.BValExtension;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.ValidationException;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.ValidationException;
import java.io.Closeable;
import java.io.IOException;
import java.util.Collection;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java
index 1b98c0b..568a6a7 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultMessageInterpolator.java
@@ -36,7 +36,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
-import javax.validation.MessageInterpolator;
+import jakarta.validation.MessageInterpolator;
import org.apache.bval.el.MessageEvaluator;
import org.apache.bval.jsr.util.LookBehindRegexHolder;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java
index e63bdf4..d1d3f7d 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/DefaultValidationProviderResolver.java
@@ -24,9 +24,9 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
-import javax.validation.ValidationException;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.spi.ValidationProvider;
+import jakarta.validation.ValidationException;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.spi.ValidationProvider;
import org.apache.bval.util.reflection.Reflection;
import org.apache.commons.weaver.privilizer.Privilizing;
@@ -36,7 +36,7 @@ import org.apache.commons.weaver.privilizer.Privilizing.CallTo;
public class DefaultValidationProviderResolver implements ValidationProviderResolver {
//TODO - Spec recommends caching per classloader
- private static final String SPI_CFG = "META-INF/services/javax.validation.spi.ValidationProvider";
+ private static final String SPI_CFG = "META-INF/services/jakarta.validation.spi.ValidationProvider";
private static ClassLoader getCurrentClassLoader() {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/GraphContext.java b/bval-jsr/src/main/java/org/apache/bval/jsr/GraphContext.java
index 24ec601..380d78b 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/GraphContext.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/GraphContext.java
@@ -23,8 +23,8 @@ import java.lang.reflect.TypeVariable;
import java.util.Map;
import java.util.Objects;
-import javax.validation.Path;
-import javax.validation.ValidationException;
+import jakarta.validation.Path;
+import jakarta.validation.ValidationException;
import org.apache.bval.jsr.metadata.ContainerElementKey;
import org.apache.bval.jsr.util.NodeImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ParticipantFactory.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ParticipantFactory.java
index 006bbcd..3a5e475 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ParticipantFactory.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ParticipantFactory.java
@@ -36,7 +36,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
-import javax.validation.ValidationException;
+import jakarta.validation.ValidationException;
import org.apache.bval.cdi.BValExtension;
import org.apache.bval.jsr.util.ToUnmodifiable;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ValidatorImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ValidatorImpl.java
index 3d095cf..6de3d8a 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ValidatorImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ValidatorImpl.java
@@ -23,10 +23,10 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidationException;
-import javax.validation.executable.ExecutableValidator;
-import javax.validation.metadata.BeanDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.executable.ExecutableValidator;
+import jakarta.validation.metadata.BeanDescriptor;
import org.apache.bval.jsr.job.ValidationJobFactory;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java
index ce5e7ff..d85ddff 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/BeanD.java
@@ -26,11 +26,11 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import javax.validation.metadata.BeanDescriptor;
-import javax.validation.metadata.ConstructorDescriptor;
-import javax.validation.metadata.MethodDescriptor;
-import javax.validation.metadata.MethodType;
-import javax.validation.metadata.PropertyDescriptor;
+import jakarta.validation.metadata.BeanDescriptor;
+import jakarta.validation.metadata.ConstructorDescriptor;
+import jakarta.validation.metadata.MethodDescriptor;
+import jakarta.validation.metadata.MethodType;
+import jakarta.validation.metadata.PropertyDescriptor;
import org.apache.bval.jsr.groups.GroupStrategy;
import org.apache.bval.jsr.metadata.Signature;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java
index a9c5539..ea506eb 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java
@@ -21,10 +21,10 @@ package org.apache.bval.jsr.descriptor;
import java.lang.reflect.AnnotatedElement;
import java.util.Set;
-import javax.validation.metadata.CascadableDescriptor;
-import javax.validation.metadata.ContainerDescriptor;
-import javax.validation.metadata.ContainerElementTypeDescriptor;
-import javax.validation.metadata.GroupConversionDescriptor;
+import jakarta.validation.metadata.CascadableDescriptor;
+import jakarta.validation.metadata.ContainerDescriptor;
+import jakarta.validation.metadata.ContainerElementTypeDescriptor;
+import jakarta.validation.metadata.GroupConversionDescriptor;
import org.apache.bval.jsr.groups.GroupConversion;
import org.apache.bval.jsr.util.ToUnmodifiable;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ComposedD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ComposedD.java
index 321d425..2ddb44d 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ComposedD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ComposedD.java
@@ -24,13 +24,13 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Stream;
-import javax.validation.metadata.CascadableDescriptor;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ContainerDescriptor;
-import javax.validation.metadata.ContainerElementTypeDescriptor;
-import javax.validation.metadata.ElementDescriptor;
-import javax.validation.metadata.GroupConversionDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
+import jakarta.validation.metadata.CascadableDescriptor;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.ContainerDescriptor;
+import jakarta.validation.metadata.ContainerElementTypeDescriptor;
+import jakarta.validation.metadata.ElementDescriptor;
+import jakarta.validation.metadata.GroupConversionDescriptor;
+import jakarta.validation.metadata.PropertyDescriptor;
import org.apache.bval.jsr.groups.GroupsComputer;
import org.apache.bval.jsr.util.ToUnmodifiable;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java
index 423520d..bc70298 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstraintD.java
@@ -30,19 +30,19 @@ import java.util.Set;
import java.util.function.Supplier;
import java.util.stream.Stream;
-import javax.validation.ConstraintDeclarationException;
-import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintTarget;
-import javax.validation.ConstraintValidator;
-import javax.validation.Payload;
-import javax.validation.ReportAsSingleViolation;
-import javax.validation.ValidationException;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.Scope;
-import javax.validation.metadata.ValidateUnwrappedValue;
-import javax.validation.valueextraction.Unwrapping;
-import javax.validation.valueextraction.Unwrapping.Skip;
-import javax.validation.valueextraction.Unwrapping.Unwrap;
+import jakarta.validation.ConstraintDeclarationException;
+import jakarta.validation.ConstraintDefinitionException;
+import jakarta.validation.ConstraintTarget;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.Payload;
+import jakarta.validation.ReportAsSingleViolation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.Scope;
+import jakarta.validation.metadata.ValidateUnwrappedValue;
+import jakarta.validation.valueextraction.Unwrapping;
+import jakarta.validation.valueextraction.Unwrapping.Skip;
+import jakarta.validation.valueextraction.Unwrapping.Unwrap;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.ConstraintAnnotationAttributes;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java
index f917d35..1ca88db 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java
@@ -20,7 +20,7 @@ package org.apache.bval.jsr.descriptor;
import java.lang.reflect.Constructor;
-import javax.validation.metadata.ConstructorDescriptor;
+import jakarta.validation.metadata.ConstructorDescriptor;
public class ConstructorD<T> extends ExecutableD<Constructor<? extends T>, MetadataReader.ForConstructor<T>, ConstructorD<T>>
implements ConstructorDescriptor {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ContainerElementTypeD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ContainerElementTypeD.java
index c6850ba..ac5337a 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ContainerElementTypeD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ContainerElementTypeD.java
@@ -20,7 +20,7 @@ package org.apache.bval.jsr.descriptor;
import java.lang.reflect.AnnotatedType;
-import javax.validation.metadata.ContainerElementTypeDescriptor;
+import jakarta.validation.metadata.ContainerElementTypeDescriptor;
import org.apache.bval.jsr.metadata.ContainerElementKey;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CrossParameterD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CrossParameterD.java
index ff924d5..4c39aed 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CrossParameterD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CrossParameterD.java
@@ -18,7 +18,7 @@ package org.apache.bval.jsr.descriptor;
import java.lang.reflect.Executable;
-import javax.validation.metadata.CrossParameterDescriptor;
+import jakarta.validation.metadata.CrossParameterDescriptor;
public class CrossParameterD<P extends ExecutableD<?, ?, P>, E extends Executable>
extends ElementD.NonRoot<P, E, MetadataReader.ForElement<E, ?>> implements CrossParameterDescriptor {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java
index ef4f953..a2cc0aa 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java
@@ -23,12 +23,12 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import javax.validation.metadata.BeanDescriptor;
-import javax.validation.metadata.CascadableDescriptor;
-import javax.validation.metadata.ContainerDescriptor;
-import javax.validation.metadata.ElementDescriptor;
-import javax.validation.metadata.ExecutableDescriptor;
-import javax.validation.metadata.MethodType;
+import jakarta.validation.metadata.BeanDescriptor;
+import jakarta.validation.metadata.CascadableDescriptor;
+import jakarta.validation.metadata.ContainerDescriptor;
+import jakarta.validation.metadata.ElementDescriptor;
+import jakarta.validation.metadata.ExecutableDescriptor;
+import jakarta.validation.metadata.MethodType;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.metadata.AnnotationBehaviorMergeStrategy;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ElementD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ElementD.java
index e0d7746..207f7ed 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ElementD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ElementD.java
@@ -25,8 +25,8 @@ import java.lang.reflect.TypeVariable;
import java.util.Map;
import java.util.Set;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ElementDescriptor;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.ElementDescriptor;
import org.apache.bval.jsr.groups.GroupStrategy;
import org.apache.bval.jsr.groups.GroupsComputer;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java
index 4a73771..f5a2bf1 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java
@@ -21,10 +21,10 @@ package org.apache.bval.jsr.descriptor;
import java.lang.reflect.Executable;
import java.util.List;
-import javax.validation.metadata.CrossParameterDescriptor;
-import javax.validation.metadata.ExecutableDescriptor;
-import javax.validation.metadata.ParameterDescriptor;
-import javax.validation.metadata.ReturnValueDescriptor;
+import jakarta.validation.metadata.CrossParameterDescriptor;
+import jakarta.validation.metadata.ExecutableDescriptor;
+import jakarta.validation.metadata.ParameterDescriptor;
+import jakarta.validation.metadata.ReturnValueDescriptor;
public abstract class ExecutableD<E extends Executable, R extends MetadataReader.ForExecutable<E, R>, SELF extends ExecutableD<E, R, SELF>>
extends ElementD.NonRoot<BeanD<?>, E, R> implements ExecutableDescriptor {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/Finder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/Finder.java
index 600b44e..c352352 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/Finder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/Finder.java
@@ -30,13 +30,13 @@ import java.util.function.UnaryOperator;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.validation.GroupDefinitionException;
-import javax.validation.GroupSequence;
-import javax.validation.groups.Default;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ElementDescriptor;
-import javax.validation.metadata.ElementDescriptor.ConstraintFinder;
-import javax.validation.metadata.Scope;
+import jakarta.validation.GroupDefinitionException;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.groups.Default;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.ElementDescriptor;
+import jakarta.validation.metadata.ElementDescriptor.ConstraintFinder;
+import jakarta.validation.metadata.Scope;
import org.apache.bval.jsr.groups.Group;
import org.apache.bval.jsr.groups.Groups;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java
index 6ef1a86..5bd43c7 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MetadataReader.java
@@ -44,15 +44,15 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import javax.validation.ConstraintDeclarationException;
-import javax.validation.GroupDefinitionException;
-import javax.validation.GroupSequence;
-import javax.validation.ParameterNameProvider;
-import javax.validation.Valid;
-import javax.validation.groups.ConvertGroup;
-import javax.validation.groups.Default;
-import javax.validation.metadata.PropertyDescriptor;
-import javax.validation.metadata.Scope;
+import jakarta.validation.ConstraintDeclarationException;
+import jakarta.validation.GroupDefinitionException;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.Valid;
+import jakarta.validation.groups.ConvertGroup;
+import jakarta.validation.groups.Default;
+import jakarta.validation.metadata.PropertyDescriptor;
+import jakarta.validation.metadata.Scope;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.ConstraintAnnotationAttributes;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java
index 04ff63e..b1409e7 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java
@@ -20,8 +20,8 @@ package org.apache.bval.jsr.descriptor;
import java.lang.reflect.Method;
-import javax.validation.metadata.MethodDescriptor;
-import javax.validation.metadata.MethodType;
+import jakarta.validation.metadata.MethodDescriptor;
+import jakarta.validation.metadata.MethodType;
import org.apache.bval.jsr.util.Methods;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java
index 9bb4276..8093c50 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ParameterD.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Parameter;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
-import javax.validation.metadata.ParameterDescriptor;
+import jakarta.validation.metadata.ParameterDescriptor;
import org.apache.bval.jsr.metadata.Meta;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/PropertyD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/PropertyD.java
index 267d3de..21d7bfb 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/PropertyD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/PropertyD.java
@@ -22,8 +22,8 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.stream.Stream;
-import javax.validation.ValidationException;
-import javax.validation.metadata.PropertyDescriptor;
+import jakarta.validation.ValidationException;
+import jakarta.validation.metadata.PropertyDescriptor;
import org.apache.bval.jsr.GraphContext;
import org.apache.bval.jsr.util.Methods;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ReturnValueD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ReturnValueD.java
index 7be73f9..89803d4 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ReturnValueD.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ReturnValueD.java
@@ -23,11 +23,11 @@ import java.lang.reflect.Executable;
import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.Set;
-import javax.validation.ConstraintValidator;
-import javax.validation.UnexpectedTypeException;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.UnexpectedTypeException;
+import jakarta.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ReturnValueDescriptor;
+import jakarta.validation.metadata.ReturnValueDescriptor;
import org.apache.bval.util.ValidatorUtils;
import org.apache.bval.util.reflection.TypeUtils;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java
index 9092eb8..6426cf0 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Group.java
@@ -29,8 +29,8 @@ import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
-import javax.validation.GroupDefinitionException;
-import javax.validation.groups.Default;
+import jakarta.validation.GroupDefinitionException;
+import jakarta.validation.groups.Default;
import org.apache.bval.util.Exceptions;
import org.apache.bval.util.ObjectWrapper;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupConversion.java b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupConversion.java
index 68babdf..648c6bc 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupConversion.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupConversion.java
@@ -19,7 +19,7 @@ package org.apache.bval.jsr.groups;
import java.util.Objects;
import java.util.Optional;
-import javax.validation.metadata.GroupConversionDescriptor;
+import jakarta.validation.metadata.GroupConversionDescriptor;
import org.apache.bval.util.Lazy;
import org.apache.bval.util.LazyInt;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java
index 4fd10c1..92eefb4 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/Groups.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
-import javax.validation.GroupDefinitionException;
+import jakarta.validation.GroupDefinitionException;
import org.apache.bval.util.Exceptions;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java
index 7d5e9bf..5a5e4e6 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/groups/GroupsComputer.java
@@ -29,11 +29,11 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.validation.GroupDefinitionException;
-import javax.validation.GroupSequence;
-import javax.validation.ValidationException;
-import javax.validation.groups.Default;
-import javax.validation.metadata.GroupConversionDescriptor;
+import jakarta.validation.GroupDefinitionException;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.ValidationException;
+import jakarta.validation.groups.Default;
+import jakarta.validation.metadata.GroupConversionDescriptor;
import org.apache.bval.util.Exceptions;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ComputeConstraintValidatorClass.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ComputeConstraintValidatorClass.java
index 1336e2f..39f89d4 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ComputeConstraintValidatorClass.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ComputeConstraintValidatorClass.java
@@ -28,10 +28,10 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintValidator;
-import javax.validation.UnexpectedTypeException;
-import javax.validation.constraintvalidation.ValidationTarget;
+import jakarta.validation.ConstraintDefinitionException;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.UnexpectedTypeException;
+import jakarta.validation.constraintvalidation.ValidationTarget;
import org.apache.bval.jsr.ConstraintCached;
import org.apache.bval.jsr.ConstraintCached.ConstraintValidatorInfo;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ConstraintValidatorContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ConstraintValidatorContextImpl.java
index 8a95581..d464515 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ConstraintValidatorContextImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ConstraintValidatorContextImpl.java
@@ -21,13 +21,13 @@ package org.apache.bval.jsr.job;
import java.util.HashSet;
import java.util.Set;
-import javax.validation.ClockProvider;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintViolation;
-import javax.validation.ElementKind;
-import javax.validation.ValidationException;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.CrossParameterDescriptor;
+import jakarta.validation.ClockProvider;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ElementKind;
+import jakarta.validation.ValidationException;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.CrossParameterDescriptor;
import org.apache.bval.jsr.ApacheMessageContext;
import org.apache.bval.jsr.descriptor.ComposedD;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateExecutable.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateExecutable.java
index 8d835e0..b222f3e 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateExecutable.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateExecutable.java
@@ -23,8 +23,8 @@ import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.function.Function;
-import javax.validation.Path;
-import javax.validation.Path.Node;
+import jakarta.validation.Path;
+import jakarta.validation.Path.Node;
import org.apache.bval.jsr.ApacheFactoryContext;
import org.apache.bval.jsr.metadata.Meta;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateParameters.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateParameters.java
index a6b9ced..2f67de4 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateParameters.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateParameters.java
@@ -29,10 +29,10 @@ import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.validation.ConstraintViolation;
-import javax.validation.ParameterNameProvider;
-import javax.validation.constraintvalidation.ValidationTarget;
-import javax.validation.metadata.ExecutableDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.constraintvalidation.ValidationTarget;
+import jakarta.validation.metadata.ExecutableDescriptor;
import org.apache.bval.jsr.ApacheFactoryContext;
import org.apache.bval.jsr.ConstraintViolationImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java
index a489d1c..ee06734 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateProperty.java
@@ -30,16 +30,16 @@ import java.util.Set;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
-import javax.validation.ConstraintViolation;
-import javax.validation.ValidationException;
-import javax.validation.metadata.BeanDescriptor;
-import javax.validation.metadata.CascadableDescriptor;
-import javax.validation.metadata.ContainerDescriptor;
-import javax.validation.metadata.ContainerElementTypeDescriptor;
-import javax.validation.metadata.ElementDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
-import javax.validation.valueextraction.ValueExtractor;
-import javax.validation.valueextraction.ValueExtractor.ValueReceiver;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.metadata.BeanDescriptor;
+import jakarta.validation.metadata.CascadableDescriptor;
+import jakarta.validation.metadata.ContainerDescriptor;
+import jakarta.validation.metadata.ContainerElementTypeDescriptor;
+import jakarta.validation.metadata.ElementDescriptor;
+import jakarta.validation.metadata.PropertyDescriptor;
+import jakarta.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ValueExtractor.ValueReceiver;
import org.apache.bval.jsr.ApacheFactoryContext;
import org.apache.bval.jsr.ConstraintViolationImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java
index 416f7c5..e22431a 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidateReturnValue.java
@@ -21,7 +21,7 @@ import java.lang.reflect.Executable;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
-import javax.validation.metadata.ExecutableDescriptor;
+import jakarta.validation.metadata.ExecutableDescriptor;
import org.apache.bval.jsr.ApacheFactoryContext;
import org.apache.bval.jsr.ConstraintViolationImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidationJob.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidationJob.java
index 7ab3ddf..f4a2f2d 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidationJob.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidationJob.java
@@ -37,21 +37,21 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintViolation;
-import javax.validation.ElementKind;
-import javax.validation.MessageInterpolator;
-import javax.validation.Path;
-import javax.validation.TraversableResolver;
-import javax.validation.UnexpectedTypeException;
-import javax.validation.ValidationException;
-import javax.validation.constraintvalidation.ValidationTarget;
-import javax.validation.groups.Default;
-import javax.validation.metadata.CascadableDescriptor;
-import javax.validation.metadata.ContainerDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
-import javax.validation.metadata.ValidateUnwrappedValue;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ElementKind;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Path;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.UnexpectedTypeException;
+import jakarta.validation.ValidationException;
+import jakarta.validation.constraintvalidation.ValidationTarget;
+import jakarta.validation.groups.Default;
+import jakarta.validation.metadata.CascadableDescriptor;
+import jakarta.validation.metadata.ContainerDescriptor;
+import jakarta.validation.metadata.PropertyDescriptor;
+import jakarta.validation.metadata.ValidateUnwrappedValue;
+import jakarta.validation.valueextraction.ValueExtractor;
import org.apache.bval.jsr.ApacheFactoryContext;
import org.apache.bval.jsr.ConstraintViolationImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidationJobFactory.java b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidationJobFactory.java
index 2a23192..f5cf6a0 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidationJobFactory.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/job/ValidationJobFactory.java
@@ -21,9 +21,9 @@ package org.apache.bval.jsr.job;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.executable.ExecutableValidator;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
+import jakarta.validation.executable.ExecutableValidator;
import org.apache.bval.jsr.ApacheFactoryContext;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/AnnotationDeclaredValidatorMappingProvider.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/AnnotationDeclaredValidatorMappingProvider.java
index b2126ac..325a388 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/AnnotationDeclaredValidatorMappingProvider.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/AnnotationDeclaredValidatorMappingProvider.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Annotation;
import java.util.Arrays;
import java.util.List;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java
index b02f149..5896412 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/CompositeBuilder.java
@@ -37,8 +37,8 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import javax.validation.ElementKind;
-import javax.validation.ParameterNameProvider;
+import jakarta.validation.ElementKind;
+import jakarta.validation.ParameterNameProvider;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.groups.GroupConversion;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java
index ed45601..0b840c7 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ContainerElementKey.java
@@ -37,9 +37,9 @@ import java.util.logging.Logger;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import javax.validation.valueextraction.ExtractedValue;
-import javax.validation.valueextraction.ValueExtractor;
-import javax.validation.valueextraction.ValueExtractorDefinitionException;
+import jakarta.validation.valueextraction.ExtractedValue;
+import jakarta.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ValueExtractorDefinitionException;
import org.apache.bval.util.EmulatedAnnotatedType;
import org.apache.bval.util.Exceptions;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java
index e9209fb..19b0daf 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java
@@ -38,8 +38,8 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import javax.validation.ElementKind;
-import javax.validation.ParameterNameProvider;
+import jakarta.validation.ElementKind;
+import jakarta.validation.ParameterNameProvider;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.groups.GroupConversion;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Liskov.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Liskov.java
index d286898..c5945b0 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Liskov.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/Liskov.java
@@ -30,10 +30,10 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.validation.ConstraintDeclarationException;
-import javax.validation.ElementKind;
-import javax.validation.Valid;
-import javax.validation.executable.ValidateOnExecution;
+import jakarta.validation.ConstraintDeclarationException;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Valid;
+import jakarta.validation.executable.ValidateOnExecution;
import org.apache.bval.jsr.metadata.HierarchyBuilder.ContainerDelegate;
import org.apache.bval.jsr.metadata.HierarchyBuilder.ElementDelegate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilders.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilders.java
index 82de16d..333849a 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilders.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataBuilders.java
@@ -23,7 +23,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import javax.validation.ValidationException;
+import jakarta.validation.ValidationException;
import org.apache.bval.jsr.util.Methods;
import org.apache.bval.util.Exceptions;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataSource.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataSource.java
index 1a2f4f7..45f26b8 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataSource.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/MetadataSource.java
@@ -19,8 +19,8 @@ package org.apache.bval.jsr.metadata;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
-import javax.validation.ConstraintValidator;
-import javax.validation.spi.ConfigurationState;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.spi.ConfigurationState;
import org.apache.bval.jsr.ApacheValidatorFactory;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java
index daa531e..892bdda 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java
@@ -43,13 +43,13 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import javax.validation.ConstraintDeclarationException;
-import javax.validation.ConstraintTarget;
-import javax.validation.GroupSequence;
-import javax.validation.ParameterNameProvider;
-import javax.validation.Valid;
-import javax.validation.constraintvalidation.ValidationTarget;
-import javax.validation.groups.ConvertGroup;
+import jakarta.validation.ConstraintDeclarationException;
+import jakarta.validation.ConstraintTarget;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.Valid;
+import jakarta.validation.constraintvalidation.ValidationTarget;
+import jakarta.validation.groups.ConvertGroup;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.ConstraintAnnotationAttributes;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ValidatorMapping.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ValidatorMapping.java
index bd2ce7f..e68a39b 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ValidatorMapping.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ValidatorMapping.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ValidatorMappingProvider.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ValidatorMappingProvider.java
index e06e30e..04e37fd 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ValidatorMappingProvider.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ValidatorMappingProvider.java
@@ -22,8 +22,8 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Optional;
-import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintDefinitionException;
+import jakarta.validation.ConstraintValidator;
import org.apache.bval.util.Exceptions;
import org.apache.bval.util.reflection.TypeUtils;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
index 51ae673..98a2044 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlBuilder.java
@@ -38,12 +38,12 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.validation.ConstraintDeclarationException;
-import javax.validation.ConstraintTarget;
-import javax.validation.Payload;
-import javax.validation.ValidationException;
-import javax.validation.groups.Default;
-import javax.xml.bind.JAXBElement;
+import jakarta.validation.ConstraintDeclarationException;
+import jakarta.validation.ConstraintTarget;
+import jakarta.validation.Payload;
+import jakarta.validation.ValidationException;
+import jakarta.validation.groups.Default;
+import jakarta.xml.bind.JAXBElement;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.ConstraintAnnotationAttributes;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlValidationMappingProvider.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlValidationMappingProvider.java
index a47d1c6..c589d6d 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlValidationMappingProvider.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/XmlValidationMappingProvider.java
@@ -23,7 +23,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
import org.apache.bval.jsr.xml.ValidatedByType;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/parameter/DefaultParameterNameProvider.java b/bval-jsr/src/main/java/org/apache/bval/jsr/parameter/DefaultParameterNameProvider.java
index dec9ae8..353c8b3 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/parameter/DefaultParameterNameProvider.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/parameter/DefaultParameterNameProvider.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.validation.ParameterNameProvider;
+import jakarta.validation.ParameterNameProvider;
public class DefaultParameterNameProvider implements ParameterNameProvider {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingRelevant.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingRelevant.java
index 78b9508..a9b5150 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingRelevant.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingRelevant.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.resolver;
-import javax.validation.TraversableResolver;
+import jakarta.validation.TraversableResolver;
/**
* Description: indicator interface to let the implementation choose
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java
index 2f212de..88ab079 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/CachingTraversableResolver.java
@@ -16,8 +16,8 @@
*/
package org.apache.bval.jsr.resolver;
-import javax.validation.Path;
-import javax.validation.TraversableResolver;
+import jakarta.validation.Path;
+import jakarta.validation.TraversableResolver;
import java.lang.annotation.ElementType;
import java.util.HashMap;
import java.util.Map;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java
index 5b790c5..af88caf 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/DefaultTraversableResolver.java
@@ -20,21 +20,21 @@ import org.apache.bval.util.reflection.Reflection;
import org.apache.commons.weaver.privilizer.Privilizing;
import org.apache.commons.weaver.privilizer.Privilizing.CallTo;
-import javax.validation.Path;
-import javax.validation.TraversableResolver;
+import jakarta.validation.Path;
+import jakarta.validation.TraversableResolver;
import java.lang.annotation.ElementType;
import java.util.logging.Level;
import java.util.logging.Logger;
-/** @see javax.validation.TraversableResolver */
+/** @see jakarta.validation.TraversableResolver */
@Privilizing(@CallTo(Reflection.class))
public class DefaultTraversableResolver implements TraversableResolver, CachingRelevant {
private static final Logger log = Logger.getLogger(DefaultTraversableResolver.class.getName());
private static final boolean LOG_FINEST = log.isLoggable(Level.FINEST);
/** Class to load to check whether JPA 2 is on the classpath. */
- private static final String PERSISTENCE_UTIL_CLASSNAME = "javax.persistence.PersistenceUtil";
+ private static final String PERSISTENCE_UTIL_CLASSNAME = "jakarta.persistence.PersistenceUtil";
/** Class to instantiate in case JPA 2 is on the classpath. */
private static final String JPA_AWARE_TRAVERSABLE_RESOLVER_CLASSNAME =
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java
index ecc0078..0ccef48 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/JPATraversableResolver.java
@@ -16,12 +16,12 @@
*/
package org.apache.bval.jsr.resolver;
-import javax.persistence.Persistence;
-import javax.validation.Path;
-import javax.validation.TraversableResolver;
+import jakarta.persistence.Persistence;
+import jakarta.validation.Path;
+import jakarta.validation.TraversableResolver;
import java.lang.annotation.ElementType;
-/** @see javax.validation.TraversableResolver */
+/** @see jakarta.validation.TraversableResolver */
public class JPATraversableResolver implements TraversableResolver, CachingRelevant {
/**
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java
index 316b2be..b5426ae 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/resolver/SimpleTraversableResolver.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr.resolver;
-import javax.validation.Path;
-import javax.validation.TraversableResolver;
+import jakarta.validation.Path;
+import jakarta.validation.TraversableResolver;
import java.lang.annotation.ElementType;
/**
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationProxy.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationProxy.java
index 2443f42..a110c42 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationProxy.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationProxy.java
@@ -26,7 +26,7 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.stream.Collectors;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import org.apache.bval.jsr.metadata.Signature;
import org.apache.bval.util.Exceptions;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationProxyBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationProxyBuilder.java
index a7c376e..461af35 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationProxyBuilder.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationProxyBuilder.java
@@ -26,12 +26,12 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentMap;
-import javax.enterprise.util.AnnotationLiteral;
-import javax.validation.ConstraintTarget;
-import javax.validation.Payload;
-import javax.validation.Valid;
-import javax.validation.ValidationException;
-import javax.validation.groups.ConvertGroup;
+import jakarta.enterprise.util.AnnotationLiteral;
+import jakarta.validation.ConstraintTarget;
+import jakarta.validation.Payload;
+import jakarta.validation.Valid;
+import jakarta.validation.ValidationException;
+import jakarta.validation.groups.ConvertGroup;
import org.apache.bval.cdi.EmptyAnnotationLiteral;
import org.apache.bval.jsr.ConstraintAnnotationAttributes;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java
index e1d47b5..edc90f2 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/AnnotationsManager.java
@@ -43,14 +43,14 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.validation.Constraint;
-import javax.validation.ConstraintDeclarationException;
-import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintTarget;
-import javax.validation.OverridesAttribute;
-import javax.validation.Payload;
-import javax.validation.ValidationException;
-import javax.validation.constraintvalidation.ValidationTarget;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintDeclarationException;
+import jakarta.validation.ConstraintDefinitionException;
+import jakarta.validation.ConstraintTarget;
+import jakarta.validation.OverridesAttribute;
+import jakarta.validation.Payload;
+import jakarta.validation.ValidationException;
+import jakarta.validation.constraintvalidation.ValidationTarget;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.ConstraintAnnotationAttributes;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeBuilderCustomizableContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeBuilderCustomizableContextImpl.java
index f60d1e4..e2782e6 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeBuilderCustomizableContextImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeBuilderCustomizableContextImpl.java
@@ -18,11 +18,11 @@
*/
package org.apache.bval.jsr.util;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeContextBuilder;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeContextBuilder;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext;
import org.apache.bval.jsr.job.ConstraintValidatorContextImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeBuilderDefinedContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeBuilderDefinedContextImpl.java
index 013b86d..0eb5980 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeBuilderDefinedContextImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeBuilderDefinedContextImpl.java
@@ -18,11 +18,11 @@
*/
package org.apache.bval.jsr.util;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderDefinedContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderDefinedContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext;
import org.apache.bval.jsr.job.ConstraintValidatorContextImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeContextBuilderImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeContextBuilderImpl.java
index aeff169..de24df0 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeContextBuilderImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ContainerElementNodeContextBuilderImpl.java
@@ -18,12 +18,12 @@
*/
package org.apache.bval.jsr.util;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderDefinedContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeContextBuilder;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderDefinedContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeContextBuilder;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext;
import org.apache.bval.jsr.job.ConstraintValidatorContextImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ExecutableTypes.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ExecutableTypes.java
index d94cd33..3731fe1 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/ExecutableTypes.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/ExecutableTypes.java
@@ -24,7 +24,7 @@ import java.util.Collections;
import java.util.EnumSet;
import java.util.Set;
-import javax.validation.executable.ExecutableType;
+import jakarta.validation.executable.ExecutableType;
import org.apache.bval.util.Exceptions;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java
index 527b56c..ea8008e 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/LeafNodeBuilderCustomizableContextImpl.java
@@ -18,10 +18,10 @@
*/
package org.apache.bval.jsr.util;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeContextBuilder;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeBuilderDefinedContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.LeafNodeContextBuilder;
import org.apache.bval.jsr.job.ConstraintValidatorContextImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java
index 3f1f288..3fe75a7 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderCustomizableContextImpl.java
@@ -18,15 +18,15 @@
*/
package org.apache.bval.jsr.util;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext;
import org.apache.bval.jsr.job.ConstraintValidatorContextImpl;
/**
* Description: implementation of
- * {@link javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext}.<br/>
+ * {@link jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext}.<br/>
*/
public final class NodeBuilderCustomizableContextImpl
implements ConstraintValidatorContext.ConstraintViolationBuilder.NodeBuilderCustomizableContext {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java
index 4d6ba24..126eb7f 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeBuilderDefinedContextImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr.util;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
import org.apache.bval.jsr.job.ConstraintValidatorContextImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java
index 40c3c60..d809316 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeContextBuilderImpl.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.jsr.util;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeContextBuilder;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.ContainerElementNodeBuilderCustomizableContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder.NodeContextBuilder;
import org.apache.bval.jsr.job.ConstraintValidatorContextImpl;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java
index 57bf7c0..f0b182b 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/NodeImpl.java
@@ -31,15 +31,15 @@ import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Function;
-import javax.validation.ElementKind;
-import javax.validation.Path;
-import javax.validation.Path.BeanNode;
-import javax.validation.Path.ConstructorNode;
-import javax.validation.Path.ContainerElementNode;
-import javax.validation.Path.MethodNode;
-import javax.validation.Path.Node;
-import javax.validation.Path.ParameterNode;
-import javax.validation.Path.PropertyNode;
+import jakarta.validation.ElementKind;
+import jakarta.validation.Path;
+import jakarta.validation.Path.BeanNode;
+import jakarta.validation.Path.ConstructorNode;
+import jakarta.validation.Path.ContainerElementNode;
+import jakarta.validation.Path.MethodNode;
+import jakarta.validation.Path.Node;
+import jakarta.validation.Path.ParameterNode;
+import jakarta.validation.Path.PropertyNode;
import org.apache.bval.util.Comparators;
import org.apache.bval.util.Exceptions;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathImpl.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathImpl.java
index 841d1e0..e60926e 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathImpl.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathImpl.java
@@ -25,7 +25,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
-import javax.validation.Path;
+import jakarta.validation.Path;
import org.apache.bval.util.Comparators;
import org.apache.bval.util.Exceptions;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java b/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java
index 70faa3b..2b51807 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/util/PathNavigation.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.validation.ValidationException;
+import jakarta.validation.ValidationException;
import org.apache.bval.util.Exceptions;
import org.apache.bval.util.Validate;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ExtractValues.java b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ExtractValues.java
index 01295c6..6949981 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ExtractValues.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ExtractValues.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import javax.validation.ValidationException;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.ValidationException;
+import jakarta.validation.valueextraction.ValueExtractor;
import org.apache.bval.jsr.GraphContext;
import org.apache.bval.jsr.metadata.ContainerElementKey;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/FxExtractor.java b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/FxExtractor.java
index 15601b2..263229e 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/FxExtractor.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/FxExtractor.java
@@ -21,9 +21,9 @@ package org.apache.bval.jsr.valueextraction;
import java.util.Optional;
import java.util.function.BooleanSupplier;
-import javax.validation.valueextraction.ExtractedValue;
-import javax.validation.valueextraction.UnwrapByDefault;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ExtractedValue;
+import jakarta.validation.valueextraction.UnwrapByDefault;
+import jakarta.validation.valueextraction.ValueExtractor;
import org.apache.bval.util.reflection.Reflection;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/IterableElementExtractor.java b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/IterableElementExtractor.java
index 8fd2fc0..c4c8f65 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/IterableElementExtractor.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/IterableElementExtractor.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr.valueextraction;
-import javax.validation.valueextraction.ExtractedValue;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ExtractedValue;
+import jakarta.validation.valueextraction.ValueExtractor;
public class IterableElementExtractor implements ValueExtractor<Iterable<@ExtractedValue ?>> {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ListElementExtractor.java b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ListElementExtractor.java
index bd84726..6775420 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ListElementExtractor.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ListElementExtractor.java
@@ -20,8 +20,8 @@ package org.apache.bval.jsr.valueextraction;
import java.util.List;
-import javax.validation.valueextraction.ExtractedValue;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ExtractedValue;
+import jakarta.validation.valueextraction.ValueExtractor;
public class ListElementExtractor implements ValueExtractor<List<@ExtractedValue ?>> {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/MapExtractor.java b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/MapExtractor.java
index a6848b8..c0c2873 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/MapExtractor.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/MapExtractor.java
@@ -20,8 +20,8 @@ package org.apache.bval.jsr.valueextraction;
import java.util.Map;
-import javax.validation.valueextraction.ExtractedValue;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ExtractedValue;
+import jakarta.validation.valueextraction.ValueExtractor;
public abstract class MapExtractor {
public static class ForKey implements ValueExtractor<Map<@ExtractedValue ?, ?>> {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/OptionalExtractor.java b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/OptionalExtractor.java
index 5f073cc..eb891c1 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/OptionalExtractor.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/OptionalExtractor.java
@@ -23,9 +23,9 @@ import java.util.OptionalDouble;
import java.util.OptionalInt;
import java.util.OptionalLong;
-import javax.validation.valueextraction.ExtractedValue;
-import javax.validation.valueextraction.UnwrapByDefault;
-import javax.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ExtractedValue;
+import jakarta.validation.valueextraction.UnwrapByDefault;
+import jakarta.validation.valueextraction.ValueExtractor;
public abstract class OptionalExtractor {
public static class ForObject implements ValueExtractor<Optional<@ExtractedValue ?>> {
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java
index 1f0537b..1066cc0 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/valueextraction/ValueExtractors.java
@@ -25,12 +25,12 @@ import org.apache.bval.util.reflection.Reflection;
import org.apache.bval.util.reflection.Reflection.Interfaces;
import org.apache.bval.util.reflection.TypeUtils;
-import javax.validation.ConstraintDeclarationException;
-import javax.validation.metadata.ValidateUnwrappedValue;
-import javax.validation.valueextraction.UnwrapByDefault;
-import javax.validation.valueextraction.ValueExtractor;
-import javax.validation.valueextraction.ValueExtractorDeclarationException;
-import javax.validation.valueextraction.ValueExtractorDefinitionException;
+import jakarta.validation.ConstraintDeclarationException;
+import jakarta.validation.metadata.ValidateUnwrappedValue;
+import jakarta.validation.valueextraction.UnwrapByDefault;
+import jakarta.validation.valueextraction.ValueExtractor;
+import jakarta.validation.valueextraction.ValueExtractorDeclarationException;
+import jakarta.validation.valueextraction.ValueExtractorDefinitionException;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Type;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java
index 9b9f4a4..699a2c7 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/MappingValidator.java
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import javax.validation.ValidationException;
+import jakarta.validation.ValidationException;
import org.apache.bval.jsr.ConstraintAnnotationAttributes;
import org.apache.bval.jsr.metadata.ContainerElementKey;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java
index 268ad1a..b496f38 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/SchemaManager.java
@@ -29,11 +29,11 @@ import java.util.function.Function;
import java.util.logging.Level;
import java.util.logging.Logger;
-import javax.validation.ValidationException;
+import jakarta.validation.ValidationException;
import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.UnmarshallerHandler;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.UnmarshallerHandler;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
index c9067c4..dbeaaac 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationMappingParser.java
@@ -29,9 +29,9 @@ import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import javax.validation.ValidationException;
-import javax.validation.ValidatorFactory;
-import javax.validation.spi.ConfigurationState;
+import jakarta.validation.ValidationException;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.spi.ConfigurationState;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.metadata.MetadataBuilder;
diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
index b5615f3..e4702e0 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/xml/ValidationParser.java
@@ -33,9 +33,9 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
-import javax.validation.BootstrapConfiguration;
-import javax.validation.ValidationException;
-import javax.validation.executable.ExecutableType;
+import jakarta.validation.BootstrapConfiguration;
+import jakarta.validation.ValidationException;
+import jakarta.validation.executable.ExecutableType;
import org.apache.bval.jsr.BootstrapConfigurationImpl;
import org.apache.bval.jsr.ConfigurationImpl;
@@ -57,15 +57,18 @@ public class ValidationParser {
private static final String DEFAULT_VALIDATION_XML_FILE = "META-INF/validation.xml";
private static final Logger log = Logger.getLogger(ValidationParser.class.getName());
+ /*
+ The order is very important because the last entry is used to override all schema location before parsing
+ */
private static final SchemaManager SCHEMA_MANAGER = new SchemaManager.Builder()
.add(XmlBuilder.Version.v10.getId(), "http://jboss.org/xml/ns/javax/validation/configuration",
"META-INF/validation-configuration-1.0.xsd")
.add(XmlBuilder.Version.v11.getId(), "http://jboss.org/xml/ns/javax/validation/configuration",
"META-INF/validation-configuration-1.1.xsd")
- .add(XmlBuilder.Version.v30.getId(), "https://jakarta.ee/xml/ns/validation/configuration",
- "META-INF/validation-configuration-3.0.xsd")
.add(XmlBuilder.Version.v20.getId(), "http://xmlns.jcp.org/xml/ns/validation/configuration",
"META-INF/validation-configuration-2.0.xsd")
+ .add(XmlBuilder.Version.v30.getId(), "https://jakarta.ee/xml/ns/validation/configuration",
+ "META-INF/validation-configuration-3.0.xsd")
.build();
private static String getValidationXmlFile(String file) {
diff --git a/bval-jsr/src/main/java/org/apache/bval/util/ValidatorUtils.java b/bval-jsr/src/main/java/org/apache/bval/util/ValidatorUtils.java
index 11dad25..7c38ebf 100644
--- a/bval-jsr/src/main/java/org/apache/bval/util/ValidatorUtils.java
+++ b/bval-jsr/src/main/java/org/apache/bval/util/ValidatorUtils.java
@@ -20,8 +20,8 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.WildcardType;
import java.util.stream.Stream;
-import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintDefinitionException;
+import jakarta.validation.ConstraintValidator;
import org.apache.bval.util.reflection.TypeUtils;
public class ValidatorUtils {
diff --git a/bval-jsr/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/bval-jsr/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 94%
rename from bval-jsr/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to bval-jsr/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
index 029d7a3..68229cb 100644
--- a/bval-jsr/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/bval-jsr/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -1,17 +1,17 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
org.apache.bval.cdi.BValExtension
\ No newline at end of file
diff --git a/bval-jsr/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider b/bval-jsr/src/main/resources/META-INF/services/jakarta.validation.spi.ValidationProvider
similarity index 100%
rename from bval-jsr/src/main/resources/META-INF/services/javax.validation.spi.ValidationProvider
rename to bval-jsr/src/main/resources/META-INF/services/jakarta.validation.spi.ValidationProvider
diff --git a/bval-jsr/src/main/resources/org/apache/bval/jsr/DefaultConstraints.properties b/bval-jsr/src/main/resources/org/apache/bval/jsr/DefaultConstraints.properties
index 1c71110..526ccbd 100644
--- a/bval-jsr/src/main/resources/org/apache/bval/jsr/DefaultConstraints.properties
+++ b/bval-jsr/src/main/resources/org/apache/bval/jsr/DefaultConstraints.properties
@@ -15,28 +15,28 @@
# specific language governing permissions and limitations
# under the License.
-# configuration for mapping of javax.validation.constraints to ConstraintValidator implementations
+# configuration for mapping of jakarta.validation.constraints to ConstraintValidator implementations
# the annotations from the JSR303 validation-api are mentioned here, but you could
# also extend the configuration to get a default implementation for other constraint-annotations.
# format: key=constraint-annotation-class value=constraint-validator-class (multiple classes: comma-separated)
-javax.validation.constraints.AssertFalse=org.apache.bval.constraints.AssertFalseValidator
-javax.validation.constraints.AssertTrue=org.apache.bval.constraints.AssertTrueValidator
+jakarta.validation.constraints.AssertFalse=org.apache.bval.constraints.AssertFalseValidator
+jakarta.validation.constraints.AssertTrue=org.apache.bval.constraints.AssertTrueValidator
-javax.validation.constraints.DecimalMax=\
+jakarta.validation.constraints.DecimalMax=\
org.apache.bval.constraints.DecimalMaxValidator$ForNumber,\
org.apache.bval.constraints.DecimalMaxValidator$ForString
-javax.validation.constraints.DecimalMin=\
+jakarta.validation.constraints.DecimalMin=\
org.apache.bval.constraints.DecimalMinValidator$ForNumber,\
org.apache.bval.constraints.DecimalMinValidator$ForString
-javax.validation.constraints.Digits=org.apache.bval.constraints.DigitsValidatorForNumber,\
+jakarta.validation.constraints.Digits=org.apache.bval.constraints.DigitsValidatorForNumber,\
org.apache.bval.constraints.DigitsValidatorForString
-javax.validation.constraints.Email=org.apache.bval.constraints.EmailValidator
+jakarta.validation.constraints.Email=org.apache.bval.constraints.EmailValidator
-javax.validation.constraints.Future=\
+jakarta.validation.constraints.Future=\
org.apache.bval.constraints.FutureValidator$ForCalendar,\
org.apache.bval.constraints.FutureValidator$ForDate,\
org.apache.bval.constraints.FutureValidator$ForChronoLocalDate,\
@@ -50,7 +50,7 @@ javax.validation.constraints.Future=\
org.apache.bval.constraints.FutureValidator$ForYear,\
org.apache.bval.constraints.FutureValidator$ForYearMonth
-javax.validation.constraints.FutureOrPresent=\
+jakarta.validation.constraints.FutureOrPresent=\
org.apache.bval.constraints.FutureOrPresentValidator$ForCalendar,\
org.apache.bval.constraints.FutureOrPresentValidator$ForDate,\
org.apache.bval.constraints.FutureOrPresentValidator$ForChronoLocalDate,\
@@ -64,26 +64,26 @@ javax.validation.constraints.FutureOrPresent=\
org.apache.bval.constraints.FutureOrPresentValidator$ForYear,\
org.apache.bval.constraints.FutureOrPresentValidator$ForYearMonth
-javax.validation.constraints.Max=org.apache.bval.constraints.MaxValidatorForNumber,\
+jakarta.validation.constraints.Max=org.apache.bval.constraints.MaxValidatorForNumber,\
org.apache.bval.constraints.MaxValidatorForString
-javax.validation.constraints.Min=org.apache.bval.constraints.MinValidatorForNumber,\
+jakarta.validation.constraints.Min=org.apache.bval.constraints.MinValidatorForNumber,\
org.apache.bval.constraints.MinValidatorForString
-javax.validation.constraints.Negative=org.apache.bval.constraints.NumberSignValidator$ForNegative
-javax.validation.constraints.NegativeOrZero=org.apache.bval.constraints.NumberSignValidator$ForNegative$OrZero
+jakarta.validation.constraints.Negative=org.apache.bval.constraints.NumberSignValidator$ForNegative
+jakarta.validation.constraints.NegativeOrZero=org.apache.bval.constraints.NumberSignValidator$ForNegative$OrZero
-javax.validation.constraints.NotBlank=org.apache.bval.constraints.NotBlankValidator
+jakarta.validation.constraints.NotBlank=org.apache.bval.constraints.NotBlankValidator
-javax.validation.constraints.NotEmpty=org.apache.bval.constraints.NotEmptyValidator,\
+jakarta.validation.constraints.NotEmpty=org.apache.bval.constraints.NotEmptyValidator,\
org.apache.bval.constraints.NotEmptyValidatorForCharSequence,\
org.apache.bval.constraints.NotEmptyValidatorForCollection,\
org.apache.bval.constraints.NotEmptyValidatorForMap
-javax.validation.constraints.NotNull=org.apache.bval.constraints.NotNullValidator
-javax.validation.constraints.Null=org.apache.bval.constraints.NullValidator
+jakarta.validation.constraints.NotNull=org.apache.bval.constraints.NotNullValidator
+jakarta.validation.constraints.Null=org.apache.bval.constraints.NullValidator
-javax.validation.constraints.Past=\
+jakarta.validation.constraints.Past=\
org.apache.bval.constraints.PastValidator$ForCalendar,\
org.apache.bval.constraints.PastValidator$ForDate,\
org.apache.bval.constraints.PastValidator$ForChronoLocalDate,\
@@ -97,7 +97,7 @@ javax.validation.constraints.Past=\
org.apache.bval.constraints.PastValidator$ForYear,\
org.apache.bval.constraints.PastValidator$ForYearMonth
-javax.validation.constraints.PastOrPresent=\
+jakarta.validation.constraints.PastOrPresent=\
org.apache.bval.constraints.PastOrPresentValidator$ForCalendar,\
org.apache.bval.constraints.PastOrPresentValidator$ForDate,\
org.apache.bval.constraints.PastOrPresentValidator$ForChronoLocalDate,\
@@ -111,10 +111,10 @@ javax.validation.constraints.PastOrPresent=\
org.apache.bval.constraints.PastOrPresentValidator$ForYear,\
org.apache.bval.constraints.PastOrPresentValidator$ForYearMonth
-javax.validation.constraints.Positive=org.apache.bval.constraints.NumberSignValidator$ForPositive
-javax.validation.constraints.PositiveOrZero=org.apache.bval.constraints.NumberSignValidator$ForPositive$OrZero
+jakarta.validation.constraints.Positive=org.apache.bval.constraints.NumberSignValidator$ForPositive
+jakarta.validation.constraints.PositiveOrZero=org.apache.bval.constraints.NumberSignValidator$ForPositive$OrZero
-javax.validation.constraints.Size=\
+jakarta.validation.constraints.Size=\
org.apache.bval.constraints.SizeValidator$ForArray$OfObject,\
org.apache.bval.constraints.SizeValidator$ForArray$OfByte,\
org.apache.bval.constraints.SizeValidator$ForArray$OfShort,\
@@ -128,4 +128,4 @@ javax.validation.constraints.Size=\
org.apache.bval.constraints.SizeValidator$ForCollection,\
org.apache.bval.constraints.SizeValidator$ForMap
-javax.validation.constraints.Pattern=org.apache.bval.constraints.PatternValidator
+jakarta.validation.constraints.Pattern=org.apache.bval.constraints.PatternValidator
diff --git a/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages.properties b/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages.properties
index 00d70d7..06cca0c 100644
--- a/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages.properties
+++ b/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages.properties
@@ -18,28 +18,28 @@
# The properties listed below are resolved by the default message resolver.
# standard
-javax.validation.constraints.AssertTrue.message=must be true
-javax.validation.constraints.AssertFalse.message=must be false
-javax.validation.constraints.DecimalMax.message=must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
-javax.validation.constraints.DecimalMin.message=must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
-javax.validation.constraints.Digits.message=numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-javax.validation.constraints.Email.message=must be a well-formed email address
-javax.validation.constraints.Future.message=must be a future date
-javax.validation.constraints.FutureOrPresent.message=must be a date in the present or in the future
-javax.validation.constraints.Max.message=must be less than or equal to {value}
-javax.validation.constraints.Min.message=must be greater than or equal to {value}
-javax.validation.constraints.Negative.message=must be less than 0
-javax.validation.constraints.NegativeOrZero.message=must be less than or equal to 0
-javax.validation.constraints.NotBlank.message=must not be blank
-javax.validation.constraints.NotEmpty.message=must not be empty
-javax.validation.constraints.NotNull.message=may not be null
-javax.validation.constraints.Null.message=must be null
-javax.validation.constraints.Past.message=must be a past date
-javax.validation.constraints.PastOrPresent.message=must be a date in the past or in the present
-javax.validation.constraints.Positive.message=must be greater than 0
-javax.validation.constraints.PositiveOrZero.message=must be greater than or equal to 0
-javax.validation.constraints.Pattern.message=must match the following regular expression: {regexp}
-javax.validation.constraints.Size.message=size must be between {min} and {max}
+jakarta.validation.constraints.AssertTrue.message=must be true
+jakarta.validation.constraints.AssertFalse.message=must be false
+jakarta.validation.constraints.DecimalMax.message=must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
+jakarta.validation.constraints.DecimalMin.message=must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
+jakarta.validation.constraints.Digits.message=numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+jakarta.validation.constraints.Email.message=must be a well-formed email address
+jakarta.validation.constraints.Future.message=must be a future date
+jakarta.validation.constraints.FutureOrPresent.message=must be a date in the present or in the future
+jakarta.validation.constraints.Max.message=must be less than or equal to {value}
+jakarta.validation.constraints.Min.message=must be greater than or equal to {value}
+jakarta.validation.constraints.Negative.message=must be less than 0
+jakarta.validation.constraints.NegativeOrZero.message=must be less than or equal to 0
+jakarta.validation.constraints.NotBlank.message=must not be blank
+jakarta.validation.constraints.NotEmpty.message=must not be empty
+jakarta.validation.constraints.NotNull.message=may not be null
+jakarta.validation.constraints.Null.message=must be null
+jakarta.validation.constraints.Past.message=must be a past date
+jakarta.validation.constraints.PastOrPresent.message=must be a date in the past or in the present
+jakarta.validation.constraints.Positive.message=must be greater than 0
+jakarta.validation.constraints.PositiveOrZero.message=must be greater than or equal to 0
+jakarta.validation.constraints.Pattern.message=must match the following regular expression: {regexp}
+jakarta.validation.constraints.Size.message=size must be between {min} and {max}
# additional built-ins
org.apache.bval.constraints.NotEmpty.message=may not be empty
diff --git a/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_de.properties b/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_de.properties
index d55a8fd..d7d38b2 100644
--- a/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_de.properties
+++ b/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_de.properties
@@ -18,19 +18,19 @@
# The properties listed below are resolved by the default message resolver.
# standard
-javax.validation.constraints.Null.message=muss "null" sein
-javax.validation.constraints.NotNull.message=darf nicht "null" sein
-javax.validation.constraints.AssertTrue.message=muss "true" sein
-javax.validation.constraints.AssertFalse.message=muss "false" sein
-javax.validation.constraints.Min.message=muss gr\u00F6\u00DFer oder gleich {value} sein
-javax.validation.constraints.Max.message=muss kleiner oder gleich {value} sein
-javax.validation.constraints.Size.message=Gr\u00F6\u00DFe muss zwischen {min} und {max} liegen
-javax.validation.constraints.Digits.message=numerischer Wert au\u00DFerhalb des G\u00FCltigkeitsbereiches (erwarte: <{integer} digits>.<{fraction} digits>)
-javax.validation.constraints.Past.message=muss Datum in der Vergangenheit sein
-javax.validation.constraints.Future.message=muss Datum in der Zukunft sein
-javax.validation.constraints.Pattern.message=Muss mit regul\u00E4rem Ausdruck \u00FCbereinstimmen: {regexp}
-javax.validation.constraints.DecimalMax.message=muss kleiner oder gleich {value} sein
-javax.validation.constraints.DecimalMin.message=muss gr\u00F6\u00DFer oder gleich {value} sein
+jakarta.validation.constraints.Null.message=muss "null" sein
+jakarta.validation.constraints.NotNull.message=darf nicht "null" sein
+jakarta.validation.constraints.AssertTrue.message=muss "true" sein
+jakarta.validation.constraints.AssertFalse.message=muss "false" sein
+jakarta.validation.constraints.Min.message=muss gr\u00F6\u00DFer oder gleich {value} sein
+jakarta.validation.constraints.Max.message=muss kleiner oder gleich {value} sein
+jakarta.validation.constraints.Size.message=Gr\u00F6\u00DFe muss zwischen {min} und {max} liegen
+jakarta.validation.constraints.Digits.message=numerischer Wert au\u00DFerhalb des G\u00FCltigkeitsbereiches (erwarte: <{integer} digits>.<{fraction} digits>)
+jakarta.validation.constraints.Past.message=muss Datum in der Vergangenheit sein
+jakarta.validation.constraints.Future.message=muss Datum in der Zukunft sein
+jakarta.validation.constraints.Pattern.message=Muss mit regul\u00E4rem Ausdruck \u00FCbereinstimmen: {regexp}
+jakarta.validation.constraints.DecimalMax.message=muss kleiner oder gleich {value} sein
+jakarta.validation.constraints.DecimalMin.message=muss gr\u00F6\u00DFer oder gleich {value} sein
# additional built-ins
org.apache.bval.constraints.NotEmpty.message=darf nicht leer sein
diff --git a/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_es.properties b/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_es.properties
index ca7bc90..0cd6a08 100644
--- a/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_es.properties
+++ b/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_es.properties
@@ -18,19 +18,19 @@
# The properties listed below are resolved by the default message resolver.
# standard
-javax.validation.constraints.Null.message=tiene que ser null
-javax.validation.constraints.NotNull.message=no puede ser null
-javax.validation.constraints.AssertTrue.message=tiene que ser true
-javax.validation.constraints.AssertFalse.message=tiene que ser false
-javax.validation.constraints.Min.message=tiene que ser menor o igual que {value}
-javax.validation.constraints.Max.message=tiene que ser mayor o igual que {value}
-javax.validation.constraints.Size.message=el tama\u00F1o tiene que estar comprendido entre {min} y {max}
-javax.validation.constraints.Digits.message=valor num\u00E9rico fuera de los l\u00EDmites (se espera <{integer} cifras>.<{fraction} cifras>)
-javax.validation.constraints.Past.message=tiene que ser una fecha en el pasado
-javax.validation.constraints.Future.message=tiene que ser una fecha en el futuro
-javax.validation.constraints.Pattern.message=tiene que corresponder a la expresi\u00F3n regular "{regexp}"
-javax.validation.constraints.DecimalMax.message=tiene que ser mayor o igual que {value}
-javax.validation.constraints.DecimalMin.message=tiene que ser menor o igual que {value}
+jakarta.validation.constraints.Null.message=tiene que ser null
+jakarta.validation.constraints.NotNull.message=no puede ser null
+jakarta.validation.constraints.AssertTrue.message=tiene que ser true
+jakarta.validation.constraints.AssertFalse.message=tiene que ser false
+jakarta.validation.constraints.Min.message=tiene que ser menor o igual que {value}
+jakarta.validation.constraints.Max.message=tiene que ser mayor o igual que {value}
+jakarta.validation.constraints.Size.message=el tama\u00F1o tiene que estar comprendido entre {min} y {max}
+jakarta.validation.constraints.Digits.message=valor num\u00E9rico fuera de los l\u00EDmites (se espera <{integer} cifras>.<{fraction} cifras>)
+jakarta.validation.constraints.Past.message=tiene que ser una fecha en el pasado
+jakarta.validation.constraints.Future.message=tiene que ser una fecha en el futuro
+jakarta.validation.constraints.Pattern.message=tiene que corresponder a la expresi\u00F3n regular "{regexp}"
+jakarta.validation.constraints.DecimalMax.message=tiene que ser mayor o igual que {value}
+jakarta.validation.constraints.DecimalMin.message=tiene que ser menor o igual que {value}
# additional built-ins
org.apache.bval.constraints.NotEmpty.message=no puede ser vac\u00EDo
diff --git a/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_it.properties b/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_it.properties
index 87e3273..d757900 100644
--- a/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_it.properties
+++ b/bval-jsr/src/main/resources/org/apache/bval/jsr/ValidationMessages_it.properties
@@ -18,19 +18,19 @@
# The properties listed below are resolved by the default message resolver.
# standard
-javax.validation.constraints.Null.message=deve essere null
-javax.validation.constraints.NotNull.message=non pu\u00F2 essere null
-javax.validation.constraints.AssertTrue.message=deve essere true
-javax.validation.constraints.AssertFalse.message=deve essere false
-javax.validation.constraints.Min.message=deve essere minore o uguale di {value}
-javax.validation.constraints.Max.message=deve essere maggiore o uguale di {value}
-javax.validation.constraints.Size.message=le dimensioni devono essere tra {min} e {max}
-javax.validation.constraints.Digits.message=valore numerico fuori dai limiti (atteso <{integer} cifre>.<{fraction} cifre>)
-javax.validation.constraints.Past.message=deve essere una data nel passato
-javax.validation.constraints.Future.message=deve essere una data futura
-javax.validation.constraints.Pattern.message=deve corrispondere all'espressione regolare "{regexp}"
-javax.validation.constraints.DecimalMax.message=deve essere maggiore o uguale di {value}
-javax.validation.constraints.DecimalMin.message=deve essere minore o uguale di {value}
+jakarta.validation.constraints.Null.message=deve essere null
+jakarta.validation.constraints.NotNull.message=non pu\u00F2 essere null
+jakarta.validation.constraints.AssertTrue.message=deve essere true
+jakarta.validation.constraints.AssertFalse.message=deve essere false
+jakarta.validation.constraints.Min.message=deve essere minore o uguale di {value}
+jakarta.validation.constraints.Max.message=deve essere maggiore o uguale di {value}
+jakarta.validation.constraints.Size.message=le dimensioni devono essere tra {min} e {max}
+jakarta.validation.constraints.Digits.message=valore numerico fuori dai limiti (atteso <{integer} cifre>.<{fraction} cifre>)
+jakarta.validation.constraints.Past.message=deve essere una data nel passato
+jakarta.validation.constraints.Future.message=deve essere una data futura
+jakarta.validation.constraints.Pattern.message=deve corrispondere all'espressione regolare "{regexp}"
+jakarta.validation.constraints.DecimalMax.message=deve essere maggiore o uguale di {value}
+jakarta.validation.constraints.DecimalMin.message=deve essere minore o uguale di {value}
# additional built-ins
org.apache.bval.constraints.NotEmpty.message=non pu\u00F2 essere vuoto
diff --git a/bval-jsr/src/main/resources/org/apache/bval/jsr/valueextraction/DefaultExtractors.properties b/bval-jsr/src/main/resources/org/apache/bval/jsr/valueextraction/DefaultExtractors.properties
index 9d9b768..2ea0afd 100644
--- a/bval-jsr/src/main/resources/org/apache/bval/jsr/valueextraction/DefaultExtractors.properties
+++ b/bval-jsr/src/main/resources/org/apache/bval/jsr/valueextraction/DefaultExtractors.properties
@@ -15,11 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-javax.validation.valueextraction.ValueExtractor=\
+jakarta.validation.valueextraction.ValueExtractor=\
org.apache.bval.jsr.valueextraction.IterableElementExtractor,\
org.apache.bval.jsr.valueextraction.ListElementExtractor
-javax.validation.valueextraction.ValueExtractor.container=\
+jakarta.validation.valueextraction.ValueExtractor.container=\
org.apache.bval.jsr.valueextraction.MapExtractor,\
org.apache.bval.jsr.valueextraction.OptionalExtractor,\
org.apache.bval.jsr.valueextraction.FxExtractor
diff --git a/bval-jsr/src/main/xjb/binding-customization.xjb b/bval-jsr/src/main/xjb/binding-customization.xjb
index 762a058..9a2fbab 100644
--- a/bval-jsr/src/main/xjb/binding-customization.xjb
+++ b/bval-jsr/src/main/xjb/binding-customization.xjb
@@ -17,22 +17,28 @@
specific language governing permissions and limitations
under the License.
-->
-<jxb:bindings version="1.0" xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
- <jxb:bindings schemaLocation="../xsd/validation-mapping-2.0.xsd" node="/xs:schema">
+<jxb:bindings xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xjc="https://jakarta.ee/xml/ns/jaxb"
+ version="3.0">
+
+ <jxb:bindings schemaLocation="../xsd/validation-mapping-3.0.xsd" node="/xs:schema">
<jxb:globalBindings>
+ <!-- adapter attribute not supported anymore
<xjc:javaType name="java.lang.String" xmlType="xs:string"
adapter="javax.xml.bind.annotation.adapters.CollapsedStringAdapter"/>
+ -->
</jxb:globalBindings>
-
<jxb:bindings node="//xs:complexType[@name='beanType']/xs:sequence[1]/xs:element[1]">
<jxb:property name="classType"/>
</jxb:bindings>
</jxb:bindings>
- <jxb:bindings schemaLocation="../xsd/validation-configuration-2.0.xsd" node="/xs:schema">
+
+ <jxb:bindings schemaLocation="../xsd/validation-configuration-3.0.xsd" node="/xs:schema">
<jxb:bindings node="//xs:element[@name='executable-type']">
- <jxb:javaType name="javax.validation.executable.ExecutableType"
- parseMethod="javax.validation.executable.ExecutableType.valueOf"/>
+ <jxb:javaType name="jakarta.validation.executable.ExecutableType"
+ parseMethod="jakarta.validation.executable.ExecutableType.valueOf"/>
</jxb:bindings>
</jxb:bindings>
+
</jxb:bindings>
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java b/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java
index 093c714..ffe7625 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/AuthorAddressKnown.java
@@ -19,10 +19,10 @@ package org.apache.bval.constraints;
import org.apache.bval.jsr.example.Address;
import org.apache.bval.jsr.example.Author;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java b/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java
index 5a68bb3..8e4a8d9 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/CompanyEmail.java
@@ -18,10 +18,10 @@
*/
package org.apache.bval.constraints;
-import javax.validation.Constraint;
-import javax.validation.OverridesAttribute;
-import javax.validation.Payload;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.Constraint;
+import jakarta.validation.OverridesAttribute;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.Pattern;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/DecimalMinMaxValidatorsTest.java b/bval-jsr/src/test/java/org/apache/bval/constraints/DecimalMinMaxValidatorsTest.java
index 085ff35..321ca4e 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/DecimalMinMaxValidatorsTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/DecimalMinMaxValidatorsTest.java
@@ -22,9 +22,9 @@ import static org.junit.Assert.assertFalse;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.constraints.DecimalMax;
-import javax.validation.constraints.DecimalMin;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
import org.apache.bval.jsr.ValidationTestBase;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/EmailValidatorTest.java b/bval-jsr/src/test/java/org/apache/bval/constraints/EmailValidatorTest.java
index 76239ad..0bc7537 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/EmailValidatorTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/EmailValidatorTest.java
@@ -21,7 +21,7 @@ package org.apache.bval.constraints;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import javax.validation.Validator;
+import jakarta.validation.Validator;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.example.Customer;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java b/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java
index a562052..7d47677 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipCode.java
@@ -18,12 +18,12 @@
*/
package org.apache.bval.constraints;
-import javax.validation.Constraint;
-import javax.validation.OverridesAttribute;
-import javax.validation.Payload;
-import javax.validation.ReportAsSingleViolation;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Constraint;
+import jakarta.validation.OverridesAttribute;
+import jakarta.validation.Payload;
+import jakarta.validation.ReportAsSingleViolation;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipcodeValidator.java b/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipcodeValidator.java
index d6384f1..64d31bc 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipcodeValidator.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/FrenchZipcodeValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
/**
* Description: not implemented (test only)<br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/HasStringValidator.java b/bval-jsr/src/test/java/org/apache/bval/constraints/HasStringValidator.java
index 868a16e..de59723 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/HasStringValidator.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/HasStringValidator.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.constraints;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import org.apache.bval.util.ObjectUtils;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java b/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java
index b4a5e2c..ac8b731 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/HasValue.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.constraints;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/MinMaxValidatorsForNumberTest.java b/bval-jsr/src/test/java/org/apache/bval/constraints/MinMaxValidatorsForNumberTest.java
index 94da107..449ba7b 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/MinMaxValidatorsForNumberTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/MinMaxValidatorsForNumberTest.java
@@ -22,11 +22,11 @@ import static org.junit.Assert.assertFalse;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java b/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java
index 56ecd1c..6c1707e 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/Password.java
@@ -18,10 +18,10 @@
*/
package org.apache.bval.constraints;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java b/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java
index 8c4dff1..3f23148 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherence.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.constraints;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java b/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java
index 4aeeeb0..910fb2c 100644
--- a/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java
+++ b/bval-jsr/src/test/java/org/apache/bval/constraints/ZipCodeCityCoherenceValidator.java
@@ -20,8 +20,8 @@ package org.apache.bval.constraints;
import org.apache.bval.jsr.example.ZipCodeCityCarrier;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
/**
* Description: Class not implemented! simple dummy implemenation for tests only! <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java
index fa3d406..2f3b4e6 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/BeanDescriptorTest.java
@@ -33,16 +33,16 @@ import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.Set;
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
-import javax.validation.groups.Default;
-import javax.validation.metadata.BeanDescriptor;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ElementDescriptor;
-import javax.validation.metadata.ElementDescriptor.ConstraintFinder;
-import javax.validation.metadata.PropertyDescriptor;
-import javax.validation.metadata.Scope;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.groups.Default;
+import jakarta.validation.metadata.BeanDescriptor;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.ElementDescriptor;
+import jakarta.validation.metadata.ElementDescriptor.ConstraintFinder;
+import jakarta.validation.metadata.PropertyDescriptor;
+import jakarta.validation.metadata.Scope;
import org.apache.bval.jsr.util.TestUtils;
import org.junit.Test;
@@ -150,7 +150,7 @@ public class BeanDescriptorTest extends ValidationTestBase {
/**
* Check the correct behavior of
- * {@link ConstraintFinder#lookingAt(javax.validation.metadata.Scope)}.
+ * {@link ConstraintFinder#lookingAt(jakarta.validation.metadata.Scope)}.
*/
@Test
public void testConstraintFinderLookingAt() {
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java
index d6187df..4465498 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/BootstrapTest.java
@@ -28,18 +28,18 @@ import java.util.List;
import java.util.Locale;
import java.util.Set;
-import javax.validation.Configuration;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.ValidationProviderResolver;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.bootstrap.ProviderSpecificBootstrap;
-import javax.validation.spi.ValidationProvider;
+import jakarta.validation.Configuration;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.ValidationProviderResolver;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.bootstrap.ProviderSpecificBootstrap;
+import jakarta.validation.spi.ValidationProvider;
import org.apache.bval.constraints.NotNullValidator;
import org.apache.bval.jsr.example.Customer;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/CircularReferencesTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/CircularReferencesTest.java
index ef70f77..9c20f38 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/CircularReferencesTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/CircularReferencesTest.java
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertEquals;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Valid;
-import javax.validation.constraints.Size;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Size;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java
index 70250a1..d9483d5 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ComposedConstraintsTest.java
@@ -24,10 +24,10 @@ import static org.junit.Assert.assertTrue;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.constraints.Size;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ElementDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.ElementDescriptor;
import org.apache.bval.jsr.example.CompanyAddress;
import org.apache.bval.jsr.example.FrenchAddress;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java
index c75e96c..dbf8505 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintCompositionTest.java
@@ -32,15 +32,15 @@ import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.Set;
-import javax.validation.Constraint;
-import javax.validation.ConstraintViolation;
-import javax.validation.OverridesAttribute;
-import javax.validation.Payload;
-import javax.validation.ReportAsSingleViolation;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.OverridesAttribute;
+import jakarta.validation.Payload;
+import jakarta.validation.ReportAsSingleViolation;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.metadata.ConstraintDescriptor;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java
index aa7d02f..642aa97 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ConstraintDefinitionsTest.java
@@ -29,12 +29,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.util.Set;
-import javax.validation.Constraint;
-import javax.validation.ConstraintDefinitionException;
-import javax.validation.Payload;
-import javax.validation.constraints.Min;
-import javax.validation.metadata.BeanDescriptor;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintDefinitionException;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.metadata.BeanDescriptor;
+import jakarta.validation.metadata.ConstraintDescriptor;
import org.apache.bval.constraints.NotNullValidator;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java
index 7de16e8..857bf4e 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ContextConstraintValidatorFactoryTest.java
@@ -27,14 +27,14 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.Set;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.ConstraintViolation;
-import javax.validation.Payload;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Payload;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java
index e2ac750..7abc2f2 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/CustomConstraintValidatorFactoryTest.java
@@ -28,14 +28,14 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.Payload;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.Payload;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
import org.apache.bval.jsr.CustomConstraintValidatorFactoryTest.GoodPerson.GoodPersonValidator;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java
index fca45d1..e553679 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/CustomValidatorFactoryTest.java
@@ -20,17 +20,17 @@ package org.apache.bval.jsr;
import static org.hamcrest.CoreMatchers.isA;
-import javax.validation.ClockProvider;
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.ParameterNameProvider;
-import javax.validation.TraversableResolver;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.ValidatorContext;
-import javax.validation.ValidatorFactory;
-import javax.validation.spi.ConfigurationState;
+import jakarta.validation.ClockProvider;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.ParameterNameProvider;
+import jakarta.validation.TraversableResolver;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorContext;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.spi.ConfigurationState;
import org.junit.Rule;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
index cb7b47d..1ce9a25 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java
@@ -36,15 +36,14 @@ import java.util.Objects;
import java.util.function.Predicate;
import java.util.function.Supplier;
-import javax.el.ExpressionFactory;
-import javax.validation.MessageInterpolator;
-import javax.validation.Validator;
-import javax.validation.constraints.Digits;
-import javax.validation.constraints.Pattern;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.el.ExpressionFactory;
+import jakarta.validation.MessageInterpolator;
+import jakarta.validation.Validator;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.metadata.ConstraintDescriptor;
import org.apache.bval.constraints.NotEmpty;
-import org.apache.bval.jsr.ApacheValidatorConfiguration;
import org.apache.bval.jsr.example.Author;
import org.apache.bval.jsr.example.PreferredGuest;
import org.junit.After;
@@ -64,10 +63,10 @@ public class DefaultMessageInterpolatorTest {
@Parameters(name="{0}")
public static List<Object[]> generateParameters(){
return Arrays.asList(new Object[] { "default", null },
- new Object[] { "ri", "com.sun.el.ExpressionFactoryImpl" },
+ new Object[] { "ri", "org.glassfish.expressly.ExpressionFactoryImpl" },
new Object[] { "tomcat", "org.apache.el.ExpressionFactoryImpl" },
- new Object[] { "juel", "de.odysseus.el.ExpressionFactoryImpl" },
- new Object[] { "invalid", "java.lang.Object" });
+ // new Object[] { "juel", "de.odysseus.el.ExpressionFactoryImpl" },
+ new Object[] { "invalid", "java.lang.String" });
}
@AfterClass
@@ -106,6 +105,8 @@ public class DefaultMessageInterpolatorTest {
elFactoryClass = Class.forName(elFactory);
System.setProperty(ExpressionFactory.class.getName(), elFactory);
}
+ // todo clarify why we would get a different instance while the service loader will always pick up the first
+ // in the classpath. As we have 3 implementations, we will always get the same one
assertTrue(elFactoryClass.isInstance(ExpressionFactory.newInstance()));
elAvailable = true;
} catch (Exception e) {
@@ -294,21 +295,21 @@ public class DefaultMessageInterpolatorTest {
@Test
public void testEscapedELPattern() {
assertEquals("$must match \"....$\"",
- interpolator.interpolate("\\${javax.validation.constraints.Pattern.message}",
+ interpolator.interpolate("\\${jakarta.validation.constraints.Pattern.message}",
context("12345678",
() -> validator.getConstraintsForClass(Person.class).getConstraintsForProperty("idNumber")
.getConstraintDescriptors().stream().filter(forConstraintType(Pattern.class)).findFirst()
.orElseThrow(() -> new AssertionError("expected constraint missing")))));
assertEquals("$must match \"....$\"",
- interpolator.interpolate("\\${javax.validation.constraints.Pattern.message}",
+ interpolator.interpolate("\\${jakarta.validation.constraints.Pattern.message}",
context("12345678",
() -> validator.getConstraintsForClass(Person.class).getConstraintsForProperty("idNumber")
.getConstraintDescriptors().stream().filter(forConstraintType(Pattern.class)).findFirst()
.orElseThrow(() -> new AssertionError("expected constraint missing")))));
assertEquals("\\$must match \"....$\"",
- interpolator.interpolate("\\\\\\${javax.validation.constraints.Pattern.message}",
+ interpolator.interpolate("\\\\\\${jakarta.validation.constraints.Pattern.message}",
context("12345678",
() -> validator.getConstraintsForClass(Person.class).getConstraintsForProperty("idNumber")
.getConstraintDescriptors().stream().filter(forConstraintType(Pattern.class)).findFirst()
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ExceptionsContractTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ExceptionsContractTest.java
index 05dbc71..92b8e7d 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ExceptionsContractTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ExceptionsContractTest.java
@@ -18,11 +18,11 @@
*/
package org.apache.bval.jsr;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.metadata.BeanDescriptor;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.metadata.BeanDescriptor;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/FooTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/FooTest.java
index 10b8741..5bf40e0 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/FooTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/FooTest.java
@@ -22,9 +22,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
import org.junit.Before;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java b/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java
index bc49aee..14eb0b1 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/Jsr303Test.java
@@ -31,14 +31,14 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Set;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintViolation;
-import javax.validation.UnexpectedTypeException;
-import javax.validation.constraints.Max;
-import javax.validation.metadata.BeanDescriptor;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ElementDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.UnexpectedTypeException;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.metadata.BeanDescriptor;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.ElementDescriptor;
+import jakarta.validation.metadata.PropertyDescriptor;
import org.apache.bval.constraints.SizeValidator;
import org.apache.bval.jsr.example.Address;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/LiskovTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/LiskovTest.java
index 9f52f51..1321462 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/LiskovTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/LiskovTest.java
@@ -18,9 +18,9 @@
*/
package org.apache.bval.jsr;
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.NotNull;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/PayloadTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/PayloadTest.java
index 00754ce..35e0b68 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/PayloadTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/PayloadTest.java
@@ -24,9 +24,9 @@ import static org.junit.Assert.assertTrue;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
import org.apache.bval.jsr.util.TestUtils;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java
index 0fed395..bff2f75 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/TckReproducerTest.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertEquals;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.constraints.Pattern;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java
index 197fcf9..6a0af3f 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTest.java
@@ -36,15 +36,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.constraints.AssertTrue;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import javax.validation.groups.Default;
-import javax.validation.metadata.BeanDescriptor;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.PropertyDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.constraints.AssertTrue;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.groups.Default;
+import jakarta.validation.metadata.BeanDescriptor;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.PropertyDescriptor;
import org.apache.bval.constraints.NotEmptyValidatorForCharSequence;
import org.apache.bval.jsr.example.AccessTestBusinessObject;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTestBase.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTestBase.java
index 6f0235d..538f50a 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTestBase.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidationTestBase.java
@@ -20,9 +20,9 @@ package org.apache.bval.jsr;
import java.util.Locale;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java
index 2574c1d..be00ae7 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/ValidatorResolutionTest.java
@@ -27,12 +27,12 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.ConstraintDefinitionException;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintDefinitionException;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
+import jakarta.validation.constraints.NotNull;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java
index 51413f3..589e4a0 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/AccessTestBusinessObject.java
@@ -20,7 +20,7 @@ package org.apache.bval.jsr.example;
import org.apache.bval.constraints.HasValue;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java
index 0d7b2f1..a2dd01e 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Address.java
@@ -20,11 +20,11 @@ package org.apache.bval.jsr.example;
import org.apache.bval.constraints.ZipCodeCityCoherence;
-import javax.validation.GroupSequence;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import javax.validation.groups.Default;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.groups.Default;
@ZipCodeCityCoherence
public class Address implements ZipCodeCityCarrier {
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java
index 4cbd6a3..f7f1a50 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Author.java
@@ -20,9 +20,9 @@ package org.apache.bval.jsr.example;
import org.apache.bval.constraints.NotEmpty;
-import javax.validation.GroupSequence;
-import javax.validation.Valid;
-import javax.validation.constraints.Size;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Size;
import java.util.List;
@GroupSequence({ First.class, Author.class, Last.class })
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java
index 386c5df..0d183bf 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Book.java
@@ -18,11 +18,11 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.GroupSequence;
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
@GroupSequence({ First.class, Second.class, Book.class, Last.class })
public class Book {
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/BusinessAddress.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/BusinessAddress.java
index b7999ea..a2b8b06 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/BusinessAddress.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/BusinessAddress.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java
index 94f5e03..e7a1267 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Continent.java
@@ -19,8 +19,8 @@
package org.apache.bval.jsr.example;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
import java.util.HashSet;
import java.util.Set;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java
index 23144c1..282b3dd 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Country.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
public class Country {
@NotNull
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java
index 8348108..bde6169 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Customer.java
@@ -21,7 +21,7 @@ package org.apache.bval.jsr.example;
import org.apache.bval.constraints.Email;
import org.apache.bval.constraints.Password;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
public class Customer implements Person {
private String firstName;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java
index b65d091..5e09f14 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Engine.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Pattern;
public class Engine {
// TODO See about Windows bug with container @ Field#getAnnotatedType()
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Library.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Library.java
index 0d72ecc..22479d6 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/Library.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/Library.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/MaxTestEntity.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/MaxTestEntity.java
index 5d6efd5..b73d924 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/MaxTestEntity.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/MaxTestEntity.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.constraints.Max;
+import jakarta.validation.constraints.Max;
import java.math.BigDecimal;
/**
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java
index 261a8ee..0a6ea2d 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/NoValidatorTestEntity.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.constraints.Max;
+import jakarta.validation.constraints.Max;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/PreferredGuest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/PreferredGuest.java
index 5765277..8bcc5c9 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/PreferredGuest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/PreferredGuest.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.constraints.Digits;
+import jakarta.validation.constraints.Digits;
public class PreferredGuest extends Customer {
@Digits(integer = 10, fraction = 0)
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java
index ad4a1ba..d942b84 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/RecursiveFoo.java
@@ -20,7 +20,7 @@ package org.apache.bval.jsr.example;
import org.apache.bval.constraints.NotEmpty;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java b/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java
index 10c94ca..41dce1d 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/example/SizeTestEntity.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.example;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
import java.util.Collection;
import java.util.Map;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java b/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java
index 52cdb35..6f7e9ed 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/ExampleMethodService.java
@@ -20,10 +20,10 @@ package org.apache.bval.jsr.extensions;
import org.apache.bval.constraints.NotEmpty;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
/**
* Description: class with annotated methods to demonstrate
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java
index 8fdc858..8175767 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/extensions/MethodValidatorImplTest.java
@@ -25,12 +25,12 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.util.List;
-import javax.validation.Valid;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
-import javax.validation.executable.ExecutableValidator;
+import jakarta.validation.Valid;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import jakarta.validation.executable.ExecutableValidator;
import org.apache.bval.jsr.ApacheValidationProvider;
import org.apache.bval.jsr.ValidatorImpl;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java
index da72f78..c6e6c33 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/BillableUser.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr.groups;
-import javax.validation.constraints.NotNull;
-import javax.validation.groups.Default;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.groups.Default;
/**
* User representation
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CollectionValidationTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CollectionValidationTest.java
index ac17a81..e9d02c9 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CollectionValidationTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CollectionValidationTest.java
@@ -26,10 +26,10 @@ import java.util.ArrayList;
import java.util.Locale;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
import org.apache.bval.jsr.DefaultMessageInterpolator;
import org.apache.bval.jsr.example.Address;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence.java
index 2b1fa7b..44887f2 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.groups;
-import javax.validation.GroupSequence;
+import jakarta.validation.GroupSequence;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence1.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence1.java
index adca059..5e361ae 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence1.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence1.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.groups;
-import javax.validation.GroupSequence;
+import jakarta.validation.GroupSequence;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java
index bb9940d..badc53d 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/CyclicGroupSequence2.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.groups;
-import javax.validation.GroupSequence;
+import jakarta.validation.GroupSequence;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java
index aa74949..eb8ab22 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/DefaultGroupSequenceTest.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-import javax.validation.GroupDefinitionException;
-import javax.validation.groups.Default;
+import jakarta.validation.GroupDefinitionException;
+import jakarta.validation.groups.Default;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java
index 5a19023..5eeea07 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass2.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.groups;
-import javax.validation.GroupSequence;
+import jakarta.validation.GroupSequence;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java
index bf25101..bcc824c 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GClass3.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.groups;
-import javax.validation.GroupSequence;
+import jakarta.validation.GroupSequence;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GInterface1.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GInterface1.java
index a636cfb..1257d40 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GInterface1.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GInterface1.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.groups;
-import javax.validation.GroupSequence;
+import jakarta.validation.GroupSequence;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java
index 17d6dba..c1fe611 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceIsolationTest.java
@@ -26,10 +26,10 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.GroupSequence;
-import javax.validation.constraints.NotNull;
-import javax.validation.groups.Default;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.groups.Default;
import org.apache.bval.jsr.ValidationTestBase;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java
index 0570c53..2e0e6da 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupSequenceTest.java
@@ -27,10 +27,10 @@ import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
-import javax.validation.ConstraintViolation;
-import javax.validation.GroupDefinitionException;
-import javax.validation.GroupSequence;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.GroupDefinitionException;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.constraints.NotNull;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.ValidationTestBase;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupValidationTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupValidationTest.java
index 2dbe01f..0b5a267 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupValidationTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupValidationTest.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertNotNull;
import java.util.Set;
-import javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
import org.apache.bval.jsr.ValidationTestBase;
import org.apache.bval.jsr.util.TestUtils;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java
index 62fb18a..0bdb1db 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/GroupsComputerTest.java
@@ -25,9 +25,9 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import javax.validation.GroupDefinitionException;
-import javax.validation.ValidationException;
-import javax.validation.groups.Default;
+import jakarta.validation.GroupDefinitionException;
+import jakarta.validation.ValidationException;
+import jakarta.validation.groups.Default;
import org.apache.bval.jsr.example.Address;
import org.apache.bval.jsr.example.First;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java
index 5a50893..99c061c 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Auditable.java
@@ -18,7 +18,7 @@
*/
package org.apache.bval.jsr.groups.implicit;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
/**
* Auditable object contract.
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/ImplicitGroupingTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/ImplicitGroupingTest.java
index e05a996..a979450 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/ImplicitGroupingTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/ImplicitGroupingTest.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertNotNull;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.util.TestUtils;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java
index 50e79e9..d692f32 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/implicit/Order.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr.groups.implicit;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
/**
* Represents an order in the system
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java
index 88b14c3..437547a 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BillableUser.java
@@ -21,8 +21,8 @@ package org.apache.bval.jsr.groups.inheritance;
import org.apache.bval.jsr.groups.Billable;
import org.apache.bval.jsr.groups.BillableCreditCard;
-import javax.validation.constraints.NotNull;
-import javax.validation.groups.Default;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.groups.Default;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java
index ea9aaf3..23bb82a 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/BuyInOneClick.java
@@ -20,7 +20,7 @@ package org.apache.bval.jsr.groups.inheritance;
import org.apache.bval.jsr.groups.Billable;
-import javax.validation.groups.Default;
+import jakarta.validation.groups.Default;
/**
* Customer can buy without harrassing checking process.
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java
index e696df8..8bd8d7e 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/inheritance/GroupInheritanceTest.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertNotNull;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
import org.apache.bval.jsr.ApacheValidatorFactory;
import org.apache.bval.jsr.util.TestUtils;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java
index 15943f7..d7ee589 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/Address.java
@@ -21,9 +21,9 @@ package org.apache.bval.jsr.groups.redefining;
import org.apache.bval.constraints.ZipCodeCityCoherence;
import org.apache.bval.jsr.example.ZipCodeCityCarrier;
-import javax.validation.GroupSequence;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
/**
* Example 3.6. Redefining Default group for Address:
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java
index a4e1306..1729716 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/InvalidRedefinedDefaultGroupAddress.java
@@ -18,8 +18,8 @@
*/
package org.apache.bval.jsr.groups.redefining;
-import javax.validation.GroupSequence;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.GroupSequence;
+import jakarta.validation.constraints.NotNull;
/**
* If a @GroupSequence redefining the Default group for a class A does not
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java
index 371ae89..b2b5af1 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/groups/redefining/RedefiningDefaultGroupTest.java
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertTrue;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.GroupDefinitionException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.GroupDefinitionException;
import org.apache.bval.jsr.ValidationTestBase;
import org.apache.bval.jsr.util.TestUtils;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/issues/BVAL174.java b/bval-jsr/src/test/java/org/apache/bval/jsr/issues/BVAL174.java
index b55ce04..3b19211 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/issues/BVAL174.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/issues/BVAL174.java
@@ -25,9 +25,9 @@ import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
import java.util.Set;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Payload;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.Payload;
public class BVAL174 {
@@ -42,7 +42,7 @@ public class BVAL174 {
}
@Documented
- @javax.validation.Constraint(validatedBy = {Audience.Constraint.class})
+ @jakarta.validation.Constraint(validatedBy = {Audience.Constraint.class})
@Target({METHOD, ANNOTATION_TYPE})
@Retention(RUNTIME)
public @interface Audience {
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/issues/BVAL174Test.java b/bval-jsr/src/test/java/org/apache/bval/jsr/issues/BVAL174Test.java
index 92ebead..fa12884 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/issues/BVAL174Test.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/issues/BVAL174Test.java
@@ -19,10 +19,10 @@
package org.apache.bval.jsr.issues;
import java.lang.reflect.Method;
-import javax.validation.UnexpectedTypeException;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.metadata.MethodDescriptor;
+import jakarta.validation.UnexpectedTypeException;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.metadata.MethodDescriptor;
import org.apache.bval.jsr.ApacheValidationProvider;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/util/PathImplTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/util/PathImplTest.java
index 85137b5..e0f3d6f 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/util/PathImplTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/util/PathImplTest.java
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertTrue;
import java.util.Iterator;
-import javax.validation.Path;
-import javax.validation.ValidationException;
+import jakarta.validation.Path;
+import jakarta.validation.ValidationException;
import org.junit.Test;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java b/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java
index a121b54..e6fe925 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/util/TestUtils.java
@@ -26,9 +26,9 @@ import java.lang.annotation.Annotation;
import java.util.Collection;
import java.util.Set;
-import javax.validation.ConstraintViolation;
-import javax.validation.metadata.ConstraintDescriptor;
-import javax.validation.metadata.ElementDescriptor.ConstraintFinder;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.metadata.ElementDescriptor.ConstraintFinder;
/**
* Description: <br/>
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/xml/Demo.java b/bval-jsr/src/test/java/org/apache/bval/jsr/xml/Demo.java
index 793fa5f..ceef830 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/xml/Demo.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/xml/Demo.java
@@ -16,10 +16,10 @@
*/
package org.apache.bval.jsr.xml;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.UnmarshallerHandler;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.UnmarshallerHandler;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java
index ae05400..6f03070 100644
--- a/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java
+++ b/bval-jsr/src/test/java/org/apache/bval/jsr/xml/ValidationParserTest.java
@@ -31,12 +31,12 @@ import java.net.URL;
import java.util.Enumeration;
import java.util.Set;
-import javax.validation.BootstrapConfiguration;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.ValidationException;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.BootstrapConfiguration;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidationException;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
import org.apache.bval.jsr.ApacheValidationProvider;
import org.apache.bval.jsr.ApacheValidatorConfiguration;
diff --git a/bval-jsr/src/test/resources/ValidationMessages.properties b/bval-jsr/src/test/resources/ValidationMessages.properties
index c7f2bda..cd51348 100644
--- a/bval-jsr/src/test/resources/ValidationMessages.properties
+++ b/bval-jsr/src/test/resources/ValidationMessages.properties
@@ -16,7 +16,7 @@
# under the License.
# standard messages
-javax.validation.constraints.Pattern.message=must match "{regexp}"
+jakarta.validation.constraints.Pattern.message=must match "{regexp}"
# custom messages (examples) for validation-api-1.0.Beta4
test.validator.creditcard=credit card is not valid
@@ -25,4 +25,4 @@ test.validator.creditcard=credit card is not valid
validator.creditcard=credit card is not valid
recursive.interpolation.1={recursive.interpolation.2}
-recursive.interpolation.2={javax.validation.constraints.Pattern.message}
+recursive.interpolation.2={jakarta.validation.constraints.Pattern.message}
diff --git a/bval-jsr/src/test/resources/sample-constraints.xml b/bval-jsr/src/test/resources/sample-constraints.xml
index 3c78a4e..8012eb6 100644
--- a/bval-jsr/src/test/resources/sample-constraints.xml
+++ b/bval-jsr/src/test/resources/sample-constraints.xml
@@ -51,11 +51,11 @@
max=10
)
-->
- <constraint annotation="javax.validation.constraints.Size">
+ <constraint annotation="jakarta.validation.constraints.Size">
<message>Size is limited</message>
<groups>
<value>org.apache.bval.jsr.example.First</value>
- <value>javax.validation.groups.Default</value>
+ <value>jakarta.validation.groups.Default</value>
</groups>
<element name="max">10</element>
</constraint>
@@ -64,7 +64,7 @@
</bean>
- <constraint-definition annotation="javax.validation.constraints.Size">
+ <constraint-definition annotation="jakarta.validation.constraints.Size">
<validated-by include-existing-validators="false">
<value>org.apache.bval.constraints.SizeValidator$ForCharSequence</value>
</validated-by>
diff --git a/bval-perf/src/test/java/org/apache/bval/jsr/Jsr303Benchmark.java b/bval-perf/src/test/java/org/apache/bval/jsr/Jsr303Benchmark.java
index d4acb4b..bc7969d 100644
--- a/bval-perf/src/test/java/org/apache/bval/jsr/Jsr303Benchmark.java
+++ b/bval-perf/src/test/java/org/apache/bval/jsr/Jsr303Benchmark.java
@@ -33,13 +33,13 @@ import org.openjdk.jmh.runner.options.Options;
import org.openjdk.jmh.runner.options.OptionsBuilder;
import org.openjdk.jmh.runner.options.TimeValue;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import java.util.Set;
import static org.junit.Assert.assertFalse;
diff --git a/bval-tck-jakarta/pom.xml b/bval-tck-jakarta/pom.xml
deleted file mode 100644
index d626c9e..0000000
--- a/bval-tck-jakarta/pom.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-parent</artifactId>
- <version>2.0.7-SNAPSHOT</version>
- </parent>
-
- <artifactId>bval-tck-jakarta-runner</artifactId>
- <name>Apache BVal :: bval-tck-jakarta (Jakarta TCK Runner)</name>
- <description>Aggregates dependencies and runs the JSR-380 TCK with Jakarta Bean Validation 3.0</description>
-
- <properties>
- <suite>${project.basedir}/src/test/beanvalidation-tck-tests-suite.xml</suite>
- <tck.version>3.0.0</tck.version>
- <owb.version>2.0.27</owb.version>
- <arquillian.version>1.7.0.Alpha10</arquillian.version>
- <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
- <tomcat-jakarta.version>10.0.21</tomcat-jakarta.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.inject</groupId>
- <artifactId>jakarta.inject-api</artifactId>
- <version>2.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>3.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.interceptor</groupId>
- <artifactId>jakarta.interceptor-api</artifactId>
- <version>2.1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.ejb</groupId>
- <artifactId>jakarta.ejb-api</artifactId>
- <version>4.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>${tomcat-jakarta.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr</artifactId>
- <version>${project.version}</version>
- <classifier>jakarta</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-test-spi</artifactId>
- <version>${arquillian.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans.arquillian</groupId>
- <artifactId>owb-arquillian-standalone</artifactId>
- <version>${owb.version}</version>
- <classifier>jakarta</classifier>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- <exclusion> <!-- use jakarta one which uses the same package -->
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-cdi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.testenricher</groupId>
- <artifactId>arquillian-testenricher-cdi-jakarta</artifactId>
- <version>1.7.0.Alpha10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>${owb.version}</version>
- <classifier>jakarta</classifier>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>${owb.version}</version>
- <classifier>jakarta</classifier>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat-jakarta.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>beanvalidation-tck-tests</artifactId>
- <version>${tck.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.testng</groupId>
- <artifactId>arquillian-testng-container</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.protocol</groupId>
- <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
- <version>${arquillian.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8.21</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>4.0.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>4.0.0-M4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.openjfx</groupId>
- <artifactId>javafx-base</artifactId>
- <version>11</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>tck</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- <property>
- <name>tck</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Duser.language=en</argLine>
- <suiteXmlFiles>
- <suiteXmlFile>${suite}</suiteXmlFile>
- </suiteXmlFiles>
- <systemProperties>
- <property>
- <name>validation.provider</name>
- <value>${validation.provider}</value>
- </property>
- <property>
- <name>includeJavaFXTests</name>
- <value>true</value>
- </property>
- <property>
- <name>java.util.logging.config.file</name>
- <value>${project.basedir}/src/test/resources/logging.properties</value>
- </property>
- </systemProperties>
- <parallel>methods</parallel>
- <threadCount>4</threadCount>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-test-report</id>
- <phase>test</phase>
- <goals>
- <goal>report-only</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
- <outputName>test-report</outputName>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>sigtest</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>extract-sigsfile</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>jakarta.validation</groupId>
- <artifactId>beanvalidation-tck-tests</artifactId>
- <version>${tck.version}</version>
- </artifactItem>
- </artifactItems>
- <includes>**/*.sig</includes>
- <outputDirectory>${project.build.directory}/api-signature</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.netbeans.tools</groupId>
- <artifactId>sigtest-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>sigtest</id>
- <phase>test</phase>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <packages>jakarta.validation,jakarta.validation.bootstrap,jakarta.validation.constraints,
- jakarta.validation.constraintvalidation,jakarta.validation.executable,jakarta.validation.groups,
- jakarta.validation.metadata,jakarta.validation.spi,jakarta.validation.valueextraction
- </packages>
- <sigfile>${project.build.directory}/api-signature/validation-api-java8.sig</sigfile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git a/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java b/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java
deleted file mode 100644
index 9ac445f..0000000
--- a/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/BValArquillianExtension.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.bval.arquillian;
-
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Logger;
-
-import org.jboss.arquillian.core.api.annotation.Observes;
-import org.jboss.arquillian.core.spi.LoadableExtension;
-import org.jboss.arquillian.test.spi.TestClass;
-import org.jboss.arquillian.test.spi.TestEnricher;
-import org.jboss.arquillian.test.spi.event.suite.AfterClass;
-import org.jboss.arquillian.test.spi.event.suite.BeforeClass;
-
-public class BValArquillianExtension implements LoadableExtension {
- public void register(final ExtensionBuilder builder) {
- builder.service(TestEnricher.class, EJBEnricher.class).observer(TestLogger.class);
- }
-
- public static class TestLogger {
-
- private static final Logger LOGGER = Logger.getLogger(TestLogger.class.getName());
- private static final AtomicInteger COUNTER = new AtomicInteger(1);
-
- public void before(@Observes final BeforeClass beforeClass) {
- LOGGER.info(() -> COUNTER.getAndIncrement() + "/Launching " + toName(beforeClass.getTestClass()));
- }
-
- public void after(@Observes final AfterClass beforeClass) {
- LOGGER.info(() -> "Executed " + toName(beforeClass.getTestClass()));
- }
-
- private String toName(final TestClass testClass) {
- return testClass.getJavaClass()
- .getName()
- .replace("org.hibernate.beanvalidation.tck.tests.", "o.h.b.t.t.");
- }
- }
-}
diff --git a/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/EJBEnricher.java b/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/EJBEnricher.java
deleted file mode 100644
index 85a4d32..0000000
--- a/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/EJBEnricher.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.bval.arquillian;
-
-import org.jboss.arquillian.test.spi.TestEnricher;
-
-import jakarta.annotation.Resource;
-import jakarta.ejb.EJB;
-import jakarta.validation.Validation;
-import jakarta.validation.Validator;
-import jakarta.validation.ValidatorFactory;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-// mock a very very simple EJB container (in fact only local bean @Resource Validator* injections)
-public class EJBEnricher implements TestEnricher {
- public void enrich(final Object testCase) {
- for (final Field field : testCase.getClass().getDeclaredFields()) {
- if (field.getAnnotation(EJB.class) != null) {
- try {
- final Object instance = field.getType().getConstructor().newInstance();
- for (final Field f : field.getType().getDeclaredFields()) {
- if (f.getAnnotation(Resource.class) != null) {
- if (f.getType().equals(Validator.class)) {
- f.set(instance,
- Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator());
- } else if (f.getType().equals(ValidatorFactory.class)) {
- f.set(instance, Validation.byDefaultProvider().configure().buildValidatorFactory());
- }
- }
- }
- field.setAccessible(true);
- field.set(testCase, instance);
- } catch (final Exception e) {
- // no-op
- }
- }
- }
- }
-
- public Object[] resolve(Method method) {
- return new Object[0];
- }
-}
diff --git a/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/LogTckFormatter.java b/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/LogTckFormatter.java
deleted file mode 100644
index f722773..0000000
--- a/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/LogTckFormatter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.bval.arquillian;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.logging.LogRecord;
-import java.util.logging.SimpleFormatter;
-
-public class LogTckFormatter extends SimpleFormatter {
- @Override
- public String format(final LogRecord record) {
- final String message = formatMessage(record);
- String throwable = "";
- if (record.getThrown() != null) {
- final StringWriter sw = new StringWriter();
- final PrintWriter pw = new PrintWriter(sw);
- pw.println();
- record.getThrown().printStackTrace(pw);
- pw.close();
- throwable = sw.toString();
- }
- return String.format("[%s] %s%n%s", record.getLevel(), message, throwable);
- }
-}
diff --git a/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java b/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java
deleted file mode 100644
index 7428bcd..0000000
--- a/bval-tck-jakarta/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.bval.arquillian.jndi;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-import jakarta.validation.Validation;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.Hashtable;
-import java.util.Locale;
-
-// mock a context to satisfy lookups
-public class BValJndiFactory implements InitialContextFactory {
- public BValJndiFactory() {
- // this is an ugly hack, but the TCK expects us to get english validation messages :(
- Locale.setDefault(Locale.ENGLISH);
- }
-
- public Context getInitialContext(final Hashtable<?, ?> environment) throws NamingException {
- return Context.class.cast(Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { Context.class }, new InvocationHandler() {
- public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
- if (method.getName().equals("lookup") && args != null && args.length == 1
- && String.class.isInstance(args[0])) {
- if ("java:comp/ValidatorFactory".equals(args[0])) {
- return Validation.byDefaultProvider().configure().buildValidatorFactory();
- }
- if ("java:comp/Validator".equals(args[0])) {
- return Validation.byDefaultProvider().configure().buildValidatorFactory().getValidator();
- }
- }
- return null;
- }
- }));
- }
-}
diff --git a/bval-tck-jakarta/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/bval-tck-jakarta/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
deleted file mode 100644
index 7e1dc48..0000000
--- a/bval-tck-jakarta/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.bval.arquillian.BValArquillianExtension
diff --git a/bval-tck-jakarta/src/main/resources/jndi.properties b/bval-tck-jakarta/src/main/resources/jndi.properties
deleted file mode 100644
index 8a42146..0000000
--- a/bval-tck-jakarta/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-java.naming.factory.initial = org.apache.bval.arquillian.jndi.BValJndiFactory
diff --git a/bval-tck-jakarta/src/test/beanvalidation-tck-tests-suite.xml b/bval-tck-jakarta/src/test/beanvalidation-tck-tests-suite.xml
deleted file mode 100644
index ce508a0..0000000
--- a/bval-tck-jakarta/src/test/beanvalidation-tck-tests-suite.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<suite name="JSR-380-TCK" verbose="2" configfailurepolicy="continue">
- <test name="JSR-380-TCK">
-
- <method-selectors>
- <method-selector>
- <selector-class name="org.hibernate.beanvalidation.tck.util.IntegrationTestsMethodSelector"/>
- </method-selector>
- <method-selector>
- <selector-class name="org.hibernate.beanvalidation.tck.util.JavaFXTestsMethodSelector"/>
- </method-selector>
- </method-selectors>
-
- <packages>
- <package name="org.hibernate.beanvalidation.tck.tests"/>
- </packages>
- </test>
-</suite>
diff --git a/bval-tck-jakarta/src/test/resources/arquillian.xml b/bval-tck-jakarta/src/test/resources/arquillian.xml
deleted file mode 100644
index 1944b7f..0000000
--- a/bval-tck-jakarta/src/test/resources/arquillian.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/schema/arquillian
- http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
- <container qualifier="owb" default="true">
- <configuration>
- <property name="useOnlyArchiveResources">true</property>
- <property name="useOnlyArchiveResourcesExcludes">META-INF/services/jakarta.validation.spi.ValidationProvider</property>
- </configuration>
- </container>
-</arquillian>
diff --git a/bval-tck-jakarta/src/test/resources/logging.properties b/bval-tck-jakarta/src/test/resources/logging.properties
deleted file mode 100644
index 339a08c..0000000
--- a/bval-tck-jakarta/src/test/resources/logging.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-.level= INFO
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter =org.apache.bval.arquillian.LogTckFormatter
-org.apache.webbeans.arquillian.standalone.OwbArquillianScannerService.level = WARNING
diff --git a/bval-tck-jakarta/work-tests-suite.xml b/bval-tck-jakarta/work-tests-suite.xml
deleted file mode 100644
index d665347..0000000
--- a/bval-tck-jakarta/work-tests-suite.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to you under the Apache License, Version
- 2.0 (the "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0 Unless required by
- applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the
- License.
--->
-<!--
-JUST HERE TO BE ABLE TO RUN TCK ONE BY ONE WHEN DEVELOPING
-think to add -Dvalidation.provider=org.apache.bval.jsr.ApacheValidationProvider to your runner config
--->
-<suite name="tmp" verbose="1">
- <test name="tmp">
- <classes>
- <class name="org.hibernate.beanvalidation.tck.tests.constraints.crossparameter.GenericAndCrossParameterConstraintTest">
- <methods>
- <include name="testOneValidatorSupportsBothValidationTargets" />
- </methods>
- </class>
- </classes>
- </test>
-</suite>
diff --git a/bval-tck/src/main/java/org/apache/bval/arquillian/EJBEnricher.java b/bval-tck/src/main/java/org/apache/bval/arquillian/EJBEnricher.java
index 61254a7..85a4d32 100644
--- a/bval-tck/src/main/java/org/apache/bval/arquillian/EJBEnricher.java
+++ b/bval-tck/src/main/java/org/apache/bval/arquillian/EJBEnricher.java
@@ -20,11 +20,11 @@ package org.apache.bval.arquillian;
import org.jboss.arquillian.test.spi.TestEnricher;
-import javax.annotation.Resource;
-import javax.ejb.EJB;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.annotation.Resource;
+import jakarta.ejb.EJB;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/bval-tck/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java b/bval-tck/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java
index 13cc1fe..7428bcd 100644
--- a/bval-tck/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java
+++ b/bval-tck/src/main/java/org/apache/bval/arquillian/jndi/BValJndiFactory.java
@@ -21,7 +21,7 @@ package org.apache.bval.arquillian.jndi;
import javax.naming.Context;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import javax.validation.Validation;
+import jakarta.validation.Validation;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
diff --git a/bval-tck/src/test/resources/arquillian.xml b/bval-tck/src/test/resources/arquillian.xml
index 20bb121..1944b7f 100644
--- a/bval-tck/src/test/resources/arquillian.xml
+++ b/bval-tck/src/test/resources/arquillian.xml
@@ -22,7 +22,7 @@
<container qualifier="owb" default="true">
<configuration>
<property name="useOnlyArchiveResources">true</property>
- <property name="useOnlyArchiveResourcesExcludes">META-INF/services/javax.validation.spi.ValidationProvider</property>
+ <property name="useOnlyArchiveResourcesExcludes">META-INF/services/jakarta.validation.spi.ValidationProvider</property>
</configuration>
</container>
</arquillian>
diff --git a/src/site/resources/images/bval-bean-small.png b/src/site/resources/images/bval-bean-small.png
index f9986df..f9326a5 100644
Binary files a/src/site/resources/images/bval-bean-small.png and b/src/site/resources/images/bval-bean-small.png differ