diff --git a/annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties b/annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties index cec98220cd..0b7ef2a458 100644 --- a/annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties +++ b/annotation-processor/src/main/resources/org/hibernate/validator/ap/ValidationProcessorMessages.properties @@ -32,7 +32,7 @@ CROSS_PARAMETER_CONSTRAINT_VALIDATOR_HAS_INVALID_TYPE=Validator for cross-parame CROSS_PARAMETER_CONSTRAINT_MULTIPLE_VALIDATORS=The constraint @{0} defines multiple cross-parameter validators. Only one is allowed. CROSS_PARAMETER_VALIDATION_APPLIES_TO_REQUIRED=Constraints with generic as well as cross-parameter validators must define an attribute validationAppliesTo(), but constraint @{0} does not. CROSS_PARAMETER_VALIDATION_APPLIES_TO_MUST_HAVE_IMPLICIT_DEFAULT_VALUE=Default value of the attribute validationAppliesTo() of the constraint @{0} must be ConstraintTarget\u0023IMPLICIT. -CROSS_PARAMETER_VALIDATION_APPLIES_TO_MUST_HAVE_CONSTRAINT_TARGET_RETURN_TYPE=Return type of the attribute validationAppliesTo() of the constraint @{0} must be javax.validation.ConstraintTarget. +CROSS_PARAMETER_VALIDATION_APPLIES_TO_MUST_HAVE_CONSTRAINT_TARGET_RETURN_TYPE=Return type of the attribute validationAppliesTo() of the constraint @{0} must be jakarta.validation.ConstraintTarget. CROSS_PARAMETER_VALIDATION_ON_PARAMETERLESS_METHOD=Cross-parameter constraint @{0} is illegally placed on a parameterless method or constructor. INVALID_SIZE_LENGTH_ANNOTATION_PARAMETERS=Invalid annotation parameters. Both min and max should be greater than or equal to 0 and max should be greater than or equal to min ( min >= 0, max >= 0 and min <= max ). INVALID_PATTERN_ANNOTATION_PARAMETERS=Invalid annotation parameters. Regular expression given as parameter is invalid. diff --git a/cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidatorBean.java b/cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidatorBean.java index 9a7c92c82f..0d52090c01 100644 --- a/cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidatorBean.java +++ b/cdi/src/main/java/org/hibernate/validator/cdi/internal/ValidatorBean.java @@ -115,6 +115,6 @@ public String getId() { @Override public String toString() { - return "ValidatorBean [id=" + getId() + "]"; + return "ValidatorBean [id=" + getId() + ", qualifiers=" + getQualifiers() + "]"; } } diff --git a/distribution/pom.xml b/distribution/pom.xml index f2ba392020..d8a607284a 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -94,7 +94,7 @@ ${project.groupId} hibernate-validator-modules - wildfly-preview-${version.wildfly}-patch + wildfly-${version.wildfly}-patch zip org.wildfly - wildfly-preview-dist + wildfly-dist ${version.wildfly} tar.gz false @@ -247,7 +247,7 @@ ${project.groupId} hibernate-validator-modules ${project.version} - wildfly-preview-${version.wildfly}-patch + wildfly-${version.wildfly}-patch zip ${project.build.directory} @@ -315,10 +315,10 @@ true - ${project.build.directory}/wildfly-preview-${version.wildfly}/ + ${project.build.directory}/wildfly-${version.wildfly}/ false - patch apply ${project.build.directory}/hibernate-validator-modules-${project.version}-wildfly-preview-${version.wildfly}-patch.zip + patch apply ${project.build.directory}/hibernate-validator-modules-${project.version}-wildfly-${version.wildfly}-patch.zip diff --git a/integration/src/test/java/org/hibernate/validator/integration/AbstractArquillianIT.java b/integration/src/test/java/org/hibernate/validator/integration/AbstractArquillianIT.java index 2655bd3af4..72a7e3ad9f 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/AbstractArquillianIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/AbstractArquillianIT.java @@ -8,6 +8,7 @@ import org.jboss.arquillian.testng.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage; @@ -19,6 +20,11 @@ */ public abstract class AbstractArquillianIT extends Arquillian { + protected static StringAsset BEANS_XML = new StringAsset( "" ); + public static WebArchive buildTestArchive(String warFileName) { PomEquippedResolveStage pom = Maven.resolver().loadPomFromFile( "pom.xml" ); return ShrinkWrap diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/ConstraintValidatorInjectionUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/ConstraintValidatorInjectionUnitIT.java index 2654cf85b9..692a4d5cec 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/ConstraintValidatorInjectionUnitIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/ConstraintValidatorInjectionUnitIT.java @@ -8,10 +8,6 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import jakarta.validation.ConstraintValidatorFactory; -import jakarta.validation.ValidatorFactory; - import org.hibernate.validator.cdi.HibernateValidator; import org.hibernate.validator.integration.AbstractArquillianIT; import org.hibernate.validator.integration.cdi.constraint.Pingable; @@ -19,10 +15,13 @@ import org.hibernate.validator.integration.cdi.service.PingService; import org.hibernate.validator.integration.cdi.service.PingServiceImpl; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.testng.annotations.Test; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintValidatorFactory; +import jakarta.validation.ValidatorFactory; + /** * @author Hardy Ferentschik */ @@ -42,7 +41,7 @@ public static WebArchive createTestArchive() throws Exception { PingServiceImpl.class, PingableValidator.class ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } @Test diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/DefaultInjectionUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/DefaultInjectionUnitIT.java index e289c1a039..a7b1f1db0a 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/DefaultInjectionUnitIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/DefaultInjectionUnitIT.java @@ -8,16 +8,15 @@ import static org.assertj.core.api.Assertions.assertThat; -import jakarta.enterprise.inject.spi.BeanManager; -import javax.inject.Inject; -import jakarta.validation.ValidatorFactory; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.testng.annotations.Test; +import jakarta.enterprise.inject.spi.BeanManager; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; + /** * @author Hardy Ferentschik */ @@ -33,7 +32,7 @@ public class DefaultInjectionUnitIT extends AbstractArquillianIT { @Deployment public static WebArchive createTestArchive() throws Exception { return buildTestArchive( WAR_FILE_NAME ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } @Test diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/QualifiedInjectionUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/QualifiedInjectionUnitIT.java index 124745687d..d25acb9f5f 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/QualifiedInjectionUnitIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/QualifiedInjectionUnitIT.java @@ -10,19 +10,18 @@ import java.io.Serializable; -import jakarta.enterprise.context.SessionScoped; -import javax.inject.Inject; -import jakarta.validation.Validator; -import jakarta.validation.ValidatorFactory; - import org.hibernate.validator.cdi.HibernateValidator; import org.hibernate.validator.integration.AbstractArquillianIT; import org.hibernate.validator.testutil.TestForIssue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.testng.annotations.Test; +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; + /** * @author Hardy Ferentschik */ @@ -43,7 +42,7 @@ public class QualifiedInjectionUnitIT extends AbstractArquillianIT { @Deployment public static WebArchive createTestArchive() throws Exception { return buildTestArchive( WAR_FILE_NAME ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } @Test diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ClockProviderWithInjection.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ClockProviderWithInjection.java index bfd36f8d51..da886be645 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ClockProviderWithInjection.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ClockProviderWithInjection.java @@ -8,7 +8,7 @@ import java.time.Clock; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.validation.ClockProvider; import org.hibernate.validator.integration.cdi.service.PingService; diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ConfigurationInjectionUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ConfigurationInjectionUnitIT.java index 5fd649a8e4..e7babd5cd1 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ConfigurationInjectionUnitIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ConfigurationInjectionUnitIT.java @@ -8,18 +8,17 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import jakarta.validation.ValidatorFactory; - import org.hibernate.validator.cdi.HibernateValidator; import org.hibernate.validator.integration.AbstractArquillianIT; import org.hibernate.validator.integration.cdi.service.PingService; import org.hibernate.validator.integration.cdi.service.PingServiceImpl; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.testng.annotations.Test; +import jakarta.inject.Inject; +import jakarta.validation.ValidatorFactory; + /** * @author Hardy Ferentschik */ @@ -43,7 +42,7 @@ public static WebArchive createTestArchive() throws Exception { ClockProviderWithInjection.class ) .addAsResource( "validation-custom-config.xml", "META-INF/validation.xml" ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } @Test diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ConstraintValidatorFactoryWithInjection.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ConstraintValidatorFactoryWithInjection.java index 1bd7f32cc3..94520720ed 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ConstraintValidatorFactoryWithInjection.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ConstraintValidatorFactoryWithInjection.java @@ -6,7 +6,7 @@ */ package org.hibernate.validator.integration.cdi.configuration; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorFactory; diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/MessageInterpolatorWithInjection.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/MessageInterpolatorWithInjection.java index d12e4ba90d..90b441dfb3 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/MessageInterpolatorWithInjection.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/MessageInterpolatorWithInjection.java @@ -7,7 +7,7 @@ package org.hibernate.validator.integration.cdi.configuration; import java.util.Locale; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.validation.MessageInterpolator; import org.hibernate.validator.integration.cdi.service.PingService; diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ParameterNameProviderWithInjection.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ParameterNameProviderWithInjection.java index 3d24b3106a..19a2fc013c 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ParameterNameProviderWithInjection.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/ParameterNameProviderWithInjection.java @@ -10,7 +10,7 @@ import java.lang.reflect.Method; import java.util.Collections; import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.validation.ParameterNameProvider; import org.hibernate.validator.integration.cdi.service.PingService; diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/TraversableResolverWithInjection.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/TraversableResolverWithInjection.java index c57a29b40c..32a76277a1 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/TraversableResolverWithInjection.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/configuration/TraversableResolverWithInjection.java @@ -7,7 +7,7 @@ package org.hibernate.validator.integration.cdi.configuration; import java.lang.annotation.ElementType; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.validation.Path; import jakarta.validation.TraversableResolver; diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/constraint/PingableValidator.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/constraint/PingableValidator.java index d801b02bb1..4fa871f40b 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/cdi/constraint/PingableValidator.java +++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/constraint/PingableValidator.java @@ -6,7 +6,7 @@ */ package org.hibernate.validator.integration.cdi.constraint; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ConstraintDefinitionContributorIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ConstraintDefinitionContributorIT.java index a2b7a8c2b4..2a4126bc03 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ConstraintDefinitionContributorIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ConstraintDefinitionContributorIT.java @@ -11,19 +11,18 @@ import java.util.HashSet; import java.util.Set; -import javax.inject.Inject; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validator; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.hibernate.validator.integration.util.IntegrationTestUtil; import org.hibernate.validator.testutil.TestForIssue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.testng.annotations.Test; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; + /** * @author Hardy Ferentschik */ @@ -46,7 +45,7 @@ public static WebArchive createTestArchive() throws Exception { IntegrationTestUtil.createOxBerryConstraintDefinitionContributorJar() .as( JavaArchive.class ) ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ConstraintMappingContributorIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ConstraintMappingContributorIT.java index 86e8c6e729..ee7e220d2a 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ConstraintMappingContributorIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ConstraintMappingContributorIT.java @@ -10,17 +10,16 @@ import java.util.Set; -import javax.inject.Inject; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validator; -import jakarta.validation.constraints.NotNull; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.testng.annotations.Test; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; +import jakarta.validation.constraints.NotNull; + /** * Asserts constraints mappings contributed via {@code validation.xml} are applied. * @@ -36,7 +35,7 @@ public static Archive createTestArchive() { return buildTestArchive( WAR_FILE_NAME ) .addClasses( Broomstick.class, MyConstraintMappingContributor.class ) .addAsResource( "constraint-mapping-contributor-validation.xml", "META-INF/validation.xml" ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } @Inject diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/CustomValidationProviderInDeploymentUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/CustomValidationProviderInDeploymentUnitIT.java index 4b60af1782..121645e6fc 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/CustomValidationProviderInDeploymentUnitIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/CustomValidationProviderInDeploymentUnitIT.java @@ -8,17 +8,15 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.hibernate.validator.integration.util.IntegrationTestUtil; import org.hibernate.validator.integration.util.MyValidator; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.testng.annotations.Test; +import jakarta.inject.Inject; import jakarta.validation.Validator; import jakarta.validation.ValidatorFactory; @@ -37,10 +35,10 @@ public static Archive createTestArchive() { return buildTestArchive( WAR_FILE_NAME ) .addAsLibrary( IntegrationTestUtil.createCustomBeanValidationProviderJar() .as( JavaArchive.class ) - .addAsManifestResource( EmptyAsset.INSTANCE, "beans.xml" ) ) + .addAsManifestResource( BEANS_XML, "beans.xml" ) ) .addAsResource( "log4j.properties" ) .addAsResource( "validation-custom-provider.xml", "META-INF/validation.xml" ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } @Inject diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/MethodValidationWithCustomValidatorIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/MethodValidationWithCustomValidatorIT.java index 15bfd6aa4c..8aff2a11bf 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/MethodValidationWithCustomValidatorIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/MethodValidationWithCustomValidatorIT.java @@ -8,15 +8,14 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.inject.Inject; -import jakarta.validation.constraints.NotNull; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.testng.annotations.Test; +import jakarta.inject.Inject; +import jakarta.validation.constraints.NotNull; + /** * Asserts that the validation interceptor picks up a {@code Validator} provided by the application and uses it for * validation. @@ -38,7 +37,7 @@ public void doSomething(@NotNull String param) { public static Archive createTestArchive() { return buildTestArchive( WAR_FILE_NAME ) .addClasses( MyValidator.class ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } @Inject diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/OptionalConstraintsIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/OptionalConstraintsIT.java index f22e618ad3..d6a80d6047 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/OptionalConstraintsIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/OptionalConstraintsIT.java @@ -10,7 +10,6 @@ import java.util.Set; -import javax.inject.Inject; import javax.money.MonetaryAmount; import org.hibernate.validator.constraints.Currency; @@ -18,10 +17,10 @@ import org.javamoney.moneta.Money; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.joda.time.DateTime; import org.testng.annotations.Test; +import jakarta.inject.Inject; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validator; import jakarta.validation.constraints.DecimalMax; @@ -42,7 +41,7 @@ public class OptionalConstraintsIT extends AbstractArquillianIT { public static Archive createTestArchive() { return buildTestArchive( WAR_FILE_NAME ) .addAsWebInfResource( "jboss-deployment-structure-optional-constraints.xml", "jboss-deployment-structure.xml" ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } @Inject diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/EjbIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/EjbIT.java index da4fef6bb3..897861a9af 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/EjbIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/EjbIT.java @@ -11,17 +11,15 @@ import static org.hamcrest.Matchers.equalTo; import org.hibernate.validator.integration.AbstractArquillianIT; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptors; +import org.testng.annotations.Test; import io.restassured.filter.log.ErrorLoggingFilter; import io.restassured.http.ContentType; -import org.testng.annotations.Test; /** * This is a reproducer for WFL-11566, but fixing the problem requires changes in WildFly. @@ -37,7 +35,7 @@ public static WebArchive createTestArchive() throws Exception { return buildTestArchive( WAR_FILE_NAME ) .addClass( EjbJaxRsResource.class ) .addClass( JaxRsApplication.class ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ) + .addAsWebInfResource( BEANS_XML, "beans.xml" ) .addAsWebInfResource( new StringAsset( Descriptors.create( org.jboss.shrinkwrap.descriptor.api.webapp31.WebAppDescriptor.class ) diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/EjbJaxRsResource.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/EjbJaxRsResource.java index 83a91c8acc..46de8d9a05 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/EjbJaxRsResource.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/EjbJaxRsResource.java @@ -10,10 +10,10 @@ import java.util.stream.Collectors; import jakarta.ejb.Stateless; import jakarta.validation.constraints.NotEmpty; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; @Stateless @Path("/") diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/JaxRsApplication.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/JaxRsApplication.java index 9f1d7e830c..11b6a1243d 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/JaxRsApplication.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/ejb/JaxRsApplication.java @@ -8,8 +8,8 @@ import java.util.Collections; import java.util.Set; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("") public class JaxRsApplication extends Application { diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/generictype/GenericParameterTypeValidationUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/generictype/GenericParameterTypeValidationUnitIT.java index 3ffd2f7c5b..e36e68950f 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/generictype/GenericParameterTypeValidationUnitIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/generictype/GenericParameterTypeValidationUnitIT.java @@ -11,19 +11,18 @@ import java.util.Set; -import javax.inject.Inject; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.hibernate.validator.testutil.TestForIssue; import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.testng.annotations.Test; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + @TestForIssue(jiraKey = "HV-978") public class GenericParameterTypeValidationUnitIT extends AbstractArquillianIT { private static final String WAR_FILE_NAME = GenericParameterTypeValidationUnitIT.class.getSimpleName() + ".war"; @@ -31,7 +30,7 @@ public class GenericParameterTypeValidationUnitIT extends AbstractArquillianIT { @Deployment public static WebArchive deployment() { return buildTestArchive( WAR_FILE_NAME ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ) + .addAsWebInfResource( BEANS_XML, "beans.xml" ) .addPackage( GenericParameterTypeValidationUnitIT.class.getPackage() ); } diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/CustomValidatorFactoryInPersistenceUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/CustomValidatorFactoryInPersistenceUnitIT.java index 2c3f7a9d41..1047245cf1 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/CustomValidatorFactoryInPersistenceUnitIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/CustomValidatorFactoryInPersistenceUnitIT.java @@ -9,18 +9,16 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.fail; -import javax.inject.Inject; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.asset.Asset; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor; import org.testng.annotations.Test; +import jakarta.inject.Inject; import jakarta.validation.ConstraintViolationException; /** @@ -40,7 +38,7 @@ public static Archive createTestArchive() { .addAsResource( persistenceXml(), "META-INF/persistence.xml" ) .addAsResource( "validation.xml", "META-INF/validation.xml" ) .addAsResource( "constraints-magician.xml", "META-INF/validation/constraints-magician.xml" ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } private static Asset persistenceXml() { diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/JPATraversableResolverIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/JPATraversableResolverIT.java index 909ea8e37f..f82c40a445 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/JPATraversableResolverIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/JPATraversableResolverIT.java @@ -8,20 +8,19 @@ import static org.assertj.core.api.Assertions.assertThat; -import jakarta.validation.TraversableResolver; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.hibernate.validator.internal.engine.resolver.JPATraversableResolver; import org.hibernate.validator.internal.engine.resolver.TraversableResolvers; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.asset.Asset; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor; import org.testng.annotations.Test; +import jakarta.validation.TraversableResolver; + /** * Tests that the default {@link TraversableResolver} for a JPA environment is {@code JPATraversableResolver}. * @@ -35,7 +34,7 @@ public class JPATraversableResolverIT extends AbstractArquillianIT { public static Archive createTestArchive() { return buildTestArchive( WAR_FILE_NAME ) .addAsResource( persistenceXml(), "META-INF/persistence.xml" ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } private static Asset persistenceXml() { diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/ValidMagicianName.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/ValidMagicianName.java index 641cdae9fb..da228b9541 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/ValidMagicianName.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/jpa/ValidMagicianName.java @@ -11,7 +11,7 @@ import java.lang.annotation.Target; import jakarta.enterprise.context.ApplicationScoped; -import javax.inject.Inject; +import jakarta.inject.Inject; import jakarta.validation.Constraint; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/integration/src/test/java/org/hibernate/validator/integration/wildfly/xml/JaxpContainedInDeploymentIT.java b/integration/src/test/java/org/hibernate/validator/integration/wildfly/xml/JaxpContainedInDeploymentIT.java index 9813abefd6..4022def942 100644 --- a/integration/src/test/java/org/hibernate/validator/integration/wildfly/xml/JaxpContainedInDeploymentIT.java +++ b/integration/src/test/java/org/hibernate/validator/integration/wildfly/xml/JaxpContainedInDeploymentIT.java @@ -10,11 +10,6 @@ import java.util.Set; -import javax.inject.Inject; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.Validator; -import jakarta.validation.constraints.NotNull; - import org.hibernate.validator.integration.AbstractArquillianIT; import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; @@ -22,7 +17,6 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.asset.Asset; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.descriptor.api.Descriptors; import org.jboss.shrinkwrap.descriptor.api.validationConfiguration11.ValidationConfigurationDescriptor; @@ -30,6 +24,11 @@ import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.testng.annotations.Test; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validator; +import jakarta.validation.constraints.NotNull; + /** * Test for https://hibernate.atlassian.net/browse/HV-1280. To reproduce the issue, the deployment must be done twice * (it will only show up during the 2nd deploy), which is why the test is managing the deployment itself via client-side @@ -54,7 +53,7 @@ public static Archive createTestArchive() { .addAsResource( validationXml(), "META-INF/validation.xml" ) .addAsResource( mappingXml(), "META-INF/my-mapping.xml" ) .addAsLibrary( Maven.resolver().resolve( "xerces:xercesImpl:2.9.1" ).withoutTransitivity().asSingleFile() ) - .addAsWebInfResource( EmptyAsset.INSTANCE, "beans.xml" ); + .addAsWebInfResource( BEANS_XML, "beans.xml" ); } private static Asset validationXml() { diff --git a/integration/src/test/modules/org/javamoney/moneta/main/module.xml b/integration/src/test/modules/org/javamoney/moneta/main/module.xml index 710be343b0..dbeb7172a4 100644 --- a/integration/src/test/modules/org/javamoney/moneta/main/module.xml +++ b/integration/src/test/modules/org/javamoney/moneta/main/module.xml @@ -12,6 +12,6 @@ - + diff --git a/modules/pom.xml b/modules/pom.xml index ca55e1122d..9d93ea18d5 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -25,9 +25,9 @@ ${project.build.directory}/modules - ${project.build.directory}/wildfly-original/wildfly-preview-${version.wildfly} - ${project.build.directory}/wildfly-patched/wildfly-preview-${version.wildfly} - ${project.build.directory}/wildfly-preview-current-hv-patch.zip + ${project.build.directory}/wildfly-original/wildfly-${version.wildfly} + ${project.build.directory}/wildfly-patched/wildfly-${version.wildfly} + ${project.build.directory}/wildfly-current-hv-patch.zip org.wildfly - wildfly-preview-dist + wildfly-dist ${version.wildfly} tar.gz false @@ -181,7 +181,7 @@ org.wildfly - wildfly-preview-dist + wildfly-dist ${version.wildfly} tar.gz false diff --git a/osgi/karaf-features/src/main/features/features.xml b/osgi/karaf-features/src/main/features/features.xml index fee7694b53..ece1dc5284 100644 --- a/osgi/karaf-features/src/main/features/features.xml +++ b/osgi/karaf-features/src/main/features/features.xml @@ -17,7 +17,7 @@ mvn:org.jboss.logging/jboss-logging/${version.org.jboss.logging.jboss-logging} mvn:com.fasterxml/classmate/${version.com.fasterxml.classmate} mvn:jakarta.el/jakarta.el-api/${version.jakarta.el-api} - mvn:org.glassfish/jakarta.el/${version.org.glassfish.jakarta.el} + mvn:org.glassfish.expressly/expressly/${version.org.glassfish.expressly} hibernate-validator @@ -27,7 +27,6 @@ hibernate-validator mvn:javax.money/money-api/${version.javax.money} mvn:org.javamoney/moneta/${version.org.javamoney.moneta} - mvn:javax.annotation/javax.annotation-api/${version.javax.annotation-api} hibernate-validator diff --git a/pom.xml b/pom.xml index 7abb496808..996d1741b9 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ 2.2.1.Final - 26.0.1.Final + 27.0.0.Alpha4 @@ -154,8 +154,7 @@ 2.1.1 2.0.1 3.1.0 - - 2.1.6 + 3.1.0 1.0.1 @@ -356,7 +355,7 @@ ${project.groupId} hibernate-validator-modules ${project.version} - wildfly-preview-${version.wildfly}-patch + wildfly-${version.wildfly}-patch zip