HV-2001 Move all integration tests into a subdirectory

hibernate · Jul 16, 2024 · ce7ab19 · ce7ab19
1 parent c2c194a
commit ce7ab19
Show file tree

Hide file tree

Showing 97 changed files with 15 additions and 15 deletions.
diff --git a/java/cdi/pom.xml → integrationtest/java/modules/cdi/pom.xml b/java/cdi/pom.xml → integrationtest/java/modules/cdi/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-internal-parent</artifactId>
         <version>9.0.0-SNAPSHOT</version>
-        <relativePath>../../parents/internal/pom.xml</relativePath>
+        <relativePath>../../../../parents/internal/pom.xml</relativePath>
     </parent>
 
     <artifactId>hibernate-validator-integrationtest-java-modules-cdi</artifactId>
@@ -27,7 +27,7 @@
             --add-reads=org.hibernate.validator=ALL-UNNAMED
         </surefire.jvm.args.add-opens>
 
-        <hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
+        <hibernate-validator-parent.path>../../../..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/java/cdi/src/main/java/module-info.java → ...odules/cdi/src/main/java/module-info.java b/java/cdi/src/main/java/module-info.java → ...odules/cdi/src/main/java/module-info.java
diff --git a/.../module/cdi/constraint/CarConstraint.java → .../module/cdi/constraint/CarConstraint.java b/.../module/cdi/constraint/CarConstraint.java → .../module/cdi/constraint/CarConstraint.java
diff --git a/.../cdi/constraint/CarServiceConstraint.java → .../cdi/constraint/CarServiceConstraint.java b/.../cdi/constraint/CarServiceConstraint.java → .../cdi/constraint/CarServiceConstraint.java
diff --git a/...rationtest/java/module/cdi/model/Car.java → ...rationtest/java/module/cdi/model/Car.java b/...rationtest/java/module/cdi/model/Car.java → ...rationtest/java/module/cdi/model/Car.java
diff --git a/...est/java/module/cdi/model/TestEntity.java → ...est/java/module/cdi/model/TestEntity.java b/...est/java/module/cdi/model/TestEntity.java → ...est/java/module/cdi/model/TestEntity.java
diff --git a/...es/jakarta.validation.ConstraintValidator → ...es/jakarta.validation.ConstraintValidator b/...es/jakarta.validation.ConstraintValidator → ...es/jakarta.validation.ConstraintValidator
diff --git a/.../module/cdi/constraint/InjectionTest.java → .../module/cdi/constraint/InjectionTest.java b/.../module/cdi/constraint/InjectionTest.java → .../module/cdi/constraint/InjectionTest.java
diff --git a/...dule/cdi/constraint/JavaModulePathIT.java → ...dule/cdi/constraint/JavaModulePathIT.java b/...dule/cdi/constraint/JavaModulePathIT.java → ...dule/cdi/constraint/JavaModulePathIT.java
diff --git a/java/cdi/src/test/resources/beans.xml → .../modules/cdi/src/test/resources/beans.xml b/java/cdi/src/test/resources/beans.xml → .../modules/cdi/src/test/resources/beans.xml
diff --git a/java/no-el/pom.xml → integrationtest/java/modules/no-el/pom.xml b/java/no-el/pom.xml → integrationtest/java/modules/no-el/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-internal-parent</artifactId>
         <version>9.0.0-SNAPSHOT</version>
-        <relativePath>../../parents/internal/pom.xml</relativePath>
+        <relativePath>../../../../parents/internal/pom.xml</relativePath>
     </parent>
 
     <artifactId>hibernate-validator-integrationtest-java-modules-no-el</artifactId>
@@ -24,7 +24,7 @@
     <properties>
         <surefire.jvm.args.additional>-Duser.language=en -Duser.country=US</surefire.jvm.args.additional>
 
-        <hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
+        <hibernate-validator-parent.path>../../../..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/java/no-el/src/main/java/module-info.java → ...ules/no-el/src/main/java/module-info.java b/java/no-el/src/main/java/module-info.java → ...ules/no-el/src/main/java/module-info.java
diff --git a/...odule/no/el/constraint/CarConstraint.java → ...odule/no/el/constraint/CarConstraint.java b/...odule/no/el/constraint/CarConstraint.java → ...odule/no/el/constraint/CarConstraint.java
diff --git a/...o/el/constraint/CarServiceConstraint.java → ...o/el/constraint/CarServiceConstraint.java b/...o/el/constraint/CarServiceConstraint.java → ...o/el/constraint/CarServiceConstraint.java
diff --git a/...tiontest/java/module/no/el/model/Car.java → ...tiontest/java/module/no/el/model/Car.java b/...tiontest/java/module/no/el/model/Car.java → ...tiontest/java/module/no/el/model/Car.java
diff --git a/...es/jakarta.validation.ConstraintValidator → ...es/jakarta.validation.ConstraintValidator b/...es/jakarta.validation.ConstraintValidator → ...es/jakarta.validation.ConstraintValidator
diff --git a/...le/no/el/constraint/JavaModulePathIT.java → ...le/no/el/constraint/JavaModulePathIT.java b/...le/no/el/constraint/JavaModulePathIT.java → ...le/no/el/constraint/JavaModulePathIT.java
diff --git a/java/simple/pom.xml → integrationtest/java/modules/simple/pom.xml b/java/simple/pom.xml → integrationtest/java/modules/simple/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-internal-parent</artifactId>
         <version>9.0.0-SNAPSHOT</version>
-        <relativePath>../../parents/internal/pom.xml</relativePath>
+        <relativePath>../../../../parents/internal/pom.xml</relativePath>
     </parent>
 
     <artifactId>hibernate-validator-integrationtest-java-modules-simple</artifactId>
@@ -24,7 +24,7 @@
     <properties>
         <surefire.jvm.args.additional>-Duser.language=en -Duser.country=US</surefire.jvm.args.additional>
 
-        <hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
+        <hibernate-validator-parent.path>../../../..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/java/simple/src/main/java/module-info.java → ...les/simple/src/main/java/module-info.java b/java/simple/src/main/java/module-info.java → ...les/simple/src/main/java/module-info.java
diff --git a/...dule/simple/constraint/CarConstraint.java → ...dule/simple/constraint/CarConstraint.java b/...dule/simple/constraint/CarConstraint.java → ...dule/simple/constraint/CarConstraint.java
diff --git a/...mple/constraint/CarServiceConstraint.java → ...mple/constraint/CarServiceConstraint.java b/...mple/constraint/CarServiceConstraint.java → ...mple/constraint/CarServiceConstraint.java
diff --git a/...iontest/java/module/simple/model/Car.java → ...iontest/java/module/simple/model/Car.java b/...iontest/java/module/simple/model/Car.java → ...iontest/java/module/simple/model/Car.java
diff --git a/...es/jakarta.validation.ConstraintValidator → ...es/jakarta.validation.ConstraintValidator b/...es/jakarta.validation.ConstraintValidator → ...es/jakarta.validation.ConstraintValidator
diff --git a/...e/simple/constraint/JavaModulePathIT.java → ...e/simple/constraint/JavaModulePathIT.java b/...e/simple/constraint/JavaModulePathIT.java → ...e/simple/constraint/JavaModulePathIT.java
diff --git a/java/test-utils/pom.xml → ...ationtest/java/modules/test-utils/pom.xml b/java/test-utils/pom.xml → ...ationtest/java/modules/test-utils/pom.xml
@@ -13,7 +13,7 @@
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-internal-parent</artifactId>
         <version>9.0.0-SNAPSHOT</version>
-        <relativePath>../../parents/internal/pom.xml</relativePath>
+        <relativePath>../../../../parents/internal/pom.xml</relativePath>
     </parent>
 
     <artifactId>hibernate-validator-integrationtest-java-modules-test-utils</artifactId>
@@ -24,7 +24,7 @@
     <properties>
         <surefire.jvm.args.additional>-Duser.language=en -Duser.country=US</surefire.jvm.args.additional>
 
-        <hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
+        <hibernate-validator-parent.path>../../../..</hibernate-validator-parent.path>
     </properties>
 
     <dependencies>

diff --git a/...test-utils/src/main/java/module-info.java → ...test-utils/src/main/java/module-info.java b/...test-utils/src/main/java/module-info.java → ...test-utils/src/main/java/module-info.java
diff --git a/...ationtest/java/module/test/utils/Car.java → ...ationtest/java/module/test/utils/Car.java b/...ationtest/java/module/test/utils/Car.java → ...ationtest/java/module/test/utils/Car.java
diff --git a/...a/module/test/utils/JavaModulePathIT.java → ...a/module/test/utils/JavaModulePathIT.java b/...a/module/test/utils/JavaModulePathIT.java → ...a/module/test/utils/JavaModulePathIT.java
diff --git a/integration/pom.xml → integrationtest/wildfly/pom.xml b/integration/pom.xml → integrationtest/wildfly/pom.xml
@@ -12,7 +12,7 @@
         <groupId>org.hibernate.validator</groupId>
         <artifactId>hibernate-validator-internal-parent</artifactId>
         <version>9.0.0-SNAPSHOT</version>
-        <relativePath>../parents/internal/pom.xml</relativePath>
+        <relativePath>../../parents/internal/pom.xml</relativePath>
     </parent>
 
     <artifactId>hibernate-validator-integrationtest-wildfly</artifactId>
@@ -28,7 +28,7 @@
         <wildfly.actual.target-dir>${project.build.directory}/wildfly-patched/wildfly-${version.wildfly}</wildfly.actual.target-dir>
         <surefire.jvm.args.additional>-Duser.language=en -Duser.country=US</surefire.jvm.args.additional>
 
-        <hibernate-validator-parent.path>..</hibernate-validator-parent.path>
+        <hibernate-validator-parent.path>../..</hibernate-validator-parent.path>
         <skip.wildfly.patch.hibernate.validator>false</skip.wildfly.patch.hibernate.validator>
     </properties>
 

diff --git a/integration/src/main/java/.dontdelete → ...iontest/wildfly/src/main/java/.dontdelete b/integration/src/main/java/.dontdelete → ...iontest/wildfly/src/main/java/.dontdelete
diff --git a/...tor/integration/AbstractArquillianIT.java → ...tor/integration/AbstractArquillianIT.java b/...tor/integration/AbstractArquillianIT.java → ...tor/integration/AbstractArquillianIT.java
diff --git a/...i/ConstraintValidatorInjectionUnitIT.java → ...i/ConstraintValidatorInjectionUnitIT.java b/...i/ConstraintValidatorInjectionUnitIT.java → ...i/ConstraintValidatorInjectionUnitIT.java
diff --git a/...tegration/cdi/DefaultInjectionUnitIT.java → ...tegration/cdi/DefaultInjectionUnitIT.java b/...tegration/cdi/DefaultInjectionUnitIT.java → ...tegration/cdi/DefaultInjectionUnitIT.java
diff --git a/...gration/cdi/QualifiedInjectionUnitIT.java → ...gration/cdi/QualifiedInjectionUnitIT.java b/...gration/cdi/QualifiedInjectionUnitIT.java → ...gration/cdi/QualifiedInjectionUnitIT.java
diff --git a/...iguration/ClockProviderWithInjection.java → ...iguration/ClockProviderWithInjection.java b/...iguration/ClockProviderWithInjection.java → ...iguration/ClockProviderWithInjection.java
diff --git a/...uration/ConfigurationInjectionUnitIT.java → ...uration/ConfigurationInjectionUnitIT.java b/...uration/ConfigurationInjectionUnitIT.java → ...uration/ConfigurationInjectionUnitIT.java
diff --git a/...straintValidatorFactoryWithInjection.java → ...straintValidatorFactoryWithInjection.java b/...straintValidatorFactoryWithInjection.java → ...straintValidatorFactoryWithInjection.java
diff --git a/...ion/MessageInterpolatorWithInjection.java → ...ion/MessageInterpolatorWithInjection.java b/...ion/MessageInterpolatorWithInjection.java → ...ion/MessageInterpolatorWithInjection.java
diff --git a/...n/ParameterNameProviderWithInjection.java → ...n/ParameterNameProviderWithInjection.java b/...n/ParameterNameProviderWithInjection.java → ...n/ParameterNameProviderWithInjection.java
diff --git a/...ion/TraversableResolverWithInjection.java → ...ion/TraversableResolverWithInjection.java b/...ion/TraversableResolverWithInjection.java → ...ion/TraversableResolverWithInjection.java
diff --git a/.../integration/cdi/constraint/Pingable.java → .../integration/cdi/constraint/Pingable.java b/.../integration/cdi/constraint/Pingable.java → .../integration/cdi/constraint/Pingable.java
diff --git a/...ion/cdi/constraint/PingableValidator.java → ...ion/cdi/constraint/PingableValidator.java b/...ion/cdi/constraint/PingableValidator.java → ...ion/cdi/constraint/PingableValidator.java
diff --git a/.../integration/cdi/service/PingService.java → .../integration/cdi/service/PingService.java b/.../integration/cdi/service/PingService.java → .../integration/cdi/service/PingService.java
diff --git a/...egration/cdi/service/PingServiceImpl.java → ...egration/cdi/service/PingServiceImpl.java b/...egration/cdi/service/PingServiceImpl.java → ...egration/cdi/service/PingServiceImpl.java
diff --git a/...ator/integration/util/AcmeConstraint.java → ...ator/integration/util/AcmeConstraint.java b/...ator/integration/util/AcmeConstraint.java → ...ator/integration/util/AcmeConstraint.java
diff --git a/...gration/util/AcmeConstraintValidator.java → ...gration/util/AcmeConstraintValidator.java b/...gration/util/AcmeConstraintValidator.java → ...gration/util/AcmeConstraintValidator.java
diff --git a/...integration/util/IntegrationTestUtil.java → ...integration/util/IntegrationTestUtil.java b/...integration/util/IntegrationTestUtil.java → ...integration/util/IntegrationTestUtil.java
diff --git a/...ntegration/util/MyValidationProvider.java → ...ntegration/util/MyValidationProvider.java b/...ntegration/util/MyValidationProvider.java → ...ntegration/util/MyValidationProvider.java
diff --git a/...lidator/integration/util/MyValidator.java → ...lidator/integration/util/MyValidator.java b/...lidator/integration/util/MyValidator.java → ...lidator/integration/util/MyValidator.java
diff --git a/...ration/util/MyValidatorConfiguration.java → ...ration/util/MyValidatorConfiguration.java b/...ration/util/MyValidatorConfiguration.java → ...ration/util/MyValidatorConfiguration.java
diff --git a/...r/integration/util/OxBerryConstraint.java → ...r/integration/util/OxBerryConstraint.java b/...r/integration/util/OxBerryConstraint.java → ...r/integration/util/OxBerryConstraint.java
diff --git a/...tion/util/OxBerryConstraintValidator.java → ...tion/util/OxBerryConstraintValidator.java b/...tion/util/OxBerryConstraintValidator.java → ...tion/util/OxBerryConstraintValidator.java
diff --git a/...dator/integration/wildfly/Broomstick.java → ...dator/integration/wildfly/Broomstick.java b/...dator/integration/wildfly/Broomstick.java → ...dator/integration/wildfly/Broomstick.java
diff --git a/...ly/ConstraintDefinitionContributorIT.java → ...ly/ConstraintDefinitionContributorIT.java b/...ly/ConstraintDefinitionContributorIT.java → ...ly/ConstraintDefinitionContributorIT.java
diff --git a/...ldfly/ConstraintMappingContributorIT.java → ...ldfly/ConstraintMappingContributorIT.java b/...ldfly/ConstraintMappingContributorIT.java → ...ldfly/ConstraintMappingContributorIT.java
diff --git a/...ValidationProviderInDeploymentUnitIT.java → ...ValidationProviderInDeploymentUnitIT.java b/...ValidationProviderInDeploymentUnitIT.java → ...ValidationProviderInDeploymentUnitIT.java
diff --git a/...ldfly/JndiLookupOfValidatorFactoryIT.java → ...ldfly/JndiLookupOfValidatorFactoryIT.java b/...ldfly/JndiLookupOfValidatorFactoryIT.java → ...ldfly/JndiLookupOfValidatorFactoryIT.java
diff --git a/...ethodValidationWithCustomValidatorIT.java → ...ethodValidationWithCustomValidatorIT.java b/...ethodValidationWithCustomValidatorIT.java → ...ethodValidationWithCustomValidatorIT.java
diff --git a/...ldfly/MyConstraintMappingContributor.java → ...ldfly/MyConstraintMappingContributor.java b/...ldfly/MyConstraintMappingContributor.java → ...ldfly/MyConstraintMappingContributor.java
diff --git a/...ator/integration/wildfly/MyValidator.java → ...ator/integration/wildfly/MyValidator.java b/...ator/integration/wildfly/MyValidator.java → ...ator/integration/wildfly/MyValidator.java
diff --git a/...ration/wildfly/OptionalConstraintsIT.java → ...ration/wildfly/OptionalConstraintsIT.java b/...ration/wildfly/OptionalConstraintsIT.java → ...ration/wildfly/OptionalConstraintsIT.java
diff --git a/...dator/integration/wildfly/TestEntity.java → ...dator/integration/wildfly/TestEntity.java b/...dator/integration/wildfly/TestEntity.java → ...dator/integration/wildfly/TestEntity.java
diff --git a/...idator/integration/wildfly/VersionIT.java → ...idator/integration/wildfly/VersionIT.java b/...idator/integration/wildfly/VersionIT.java → ...idator/integration/wildfly/VersionIT.java
diff --git a/...idator/integration/wildfly/ejb/EjbIT.java → ...idator/integration/wildfly/ejb/EjbIT.java b/...idator/integration/wildfly/ejb/EjbIT.java → ...idator/integration/wildfly/ejb/EjbIT.java
diff --git a/...gration/wildfly/ejb/EjbJaxRsResource.java → ...gration/wildfly/ejb/EjbJaxRsResource.java b/...gration/wildfly/ejb/EjbJaxRsResource.java → ...gration/wildfly/ejb/EjbJaxRsResource.java
diff --git a/...gration/wildfly/ejb/JaxRsApplication.java → ...gration/wildfly/ejb/JaxRsApplication.java b/...gration/wildfly/ejb/JaxRsApplication.java → ...gration/wildfly/ejb/JaxRsApplication.java
diff --git a/...n/wildfly/generictype/BillingService.java → ...n/wildfly/generictype/BillingService.java b/...n/wildfly/generictype/BillingService.java → ...n/wildfly/generictype/BillingService.java
diff --git a/...wildfly/generictype/GenericInterface.java → ...wildfly/generictype/GenericInterface.java b/...wildfly/generictype/GenericInterface.java → ...wildfly/generictype/GenericInterface.java
diff --git a/...GenericParameterTypeValidationUnitIT.java → ...GenericParameterTypeValidationUnitIT.java b/...GenericParameterTypeValidationUnitIT.java → ...GenericParameterTypeValidationUnitIT.java
diff --git a/...fly/generictype/RetailBillingService.java → ...fly/generictype/RetailBillingService.java b/...fly/generictype/RetailBillingService.java → ...fly/generictype/RetailBillingService.java
diff --git a/...ation/wildfly/generictype/StringImpl.java → ...ation/wildfly/generictype/StringImpl.java b/...ation/wildfly/generictype/StringImpl.java → ...ation/wildfly/generictype/StringImpl.java
diff --git a/.../wildfly/generictype/StringInterface.java → .../wildfly/generictype/StringInterface.java b/.../wildfly/generictype/StringInterface.java → .../wildfly/generictype/StringInterface.java
diff --git a/...mValidatorFactoryInPersistenceUnitIT.java → ...mValidatorFactoryInPersistenceUnitIT.java b/...mValidatorFactoryInPersistenceUnitIT.java → ...mValidatorFactoryInPersistenceUnitIT.java
diff --git a/...wildfly/jpa/JPATraversableResolverIT.java → ...wildfly/jpa/JPATraversableResolverIT.java b/...wildfly/jpa/JPATraversableResolverIT.java → ...wildfly/jpa/JPATraversableResolverIT.java
diff --git a/...tor/integration/wildfly/jpa/Magician.java → ...tor/integration/wildfly/jpa/Magician.java b/...tor/integration/wildfly/jpa/Magician.java → ...tor/integration/wildfly/jpa/Magician.java
diff --git a/...egration/wildfly/jpa/MagicianService.java → ...egration/wildfly/jpa/MagicianService.java b/...egration/wildfly/jpa/MagicianService.java → ...egration/wildfly/jpa/MagicianService.java
diff --git a/...ration/wildfly/jpa/ValidMagicianName.java → ...ration/wildfly/jpa/ValidMagicianName.java b/...ration/wildfly/jpa/ValidMagicianName.java → ...ration/wildfly/jpa/ValidMagicianName.java
diff --git a/...lidator/integration/wildfly/jpa/Wand.java → ...lidator/integration/wildfly/jpa/Wand.java b/...lidator/integration/wildfly/jpa/Wand.java → ...lidator/integration/wildfly/jpa/Wand.java
diff --git a/...jpa/WandConstraintMappingContributor.java → ...jpa/WandConstraintMappingContributor.java b/...jpa/WandConstraintMappingContributor.java → ...jpa/WandConstraintMappingContributor.java
diff --git a/...dator/integration/wildfly/xml/Camera.java → ...dator/integration/wildfly/xml/Camera.java b/...dator/integration/wildfly/xml/Camera.java → ...dator/integration/wildfly/xml/Camera.java
diff --git a/...dfly/xml/JaxpContainedInDeploymentIT.java → ...dfly/xml/JaxpContainedInDeploymentIT.java b/...dfly/xml/JaxpContainedInDeploymentIT.java → ...dfly/xml/JaxpContainedInDeploymentIT.java
diff --git a/...t/modules/javax/money/api/main/module.xml → ...t/modules/javax/money/api/main/module.xml b/...t/modules/javax/money/api/main/module.xml → ...t/modules/javax/money/api/main/module.xml
diff --git a/...ules/org/javamoney/moneta/main/module.xml → ...ules/org/javamoney/moneta/main/module.xml b/...ules/org/javamoney/moneta/main/module.xml → ...ules/org/javamoney/moneta/main/module.xml
diff --git a/...ributorValidationMessages.properties-Acme → ...ributorValidationMessages.properties-Acme b/...ributorValidationMessages.properties-Acme → ...ributorValidationMessages.properties-Acme
diff --git a/...utorValidationMessages.properties-OxBerry → ...utorValidationMessages.properties-OxBerry b/...utorValidationMessages.properties-OxBerry → ...utorValidationMessages.properties-OxBerry
diff --git a/...gration/src/test/resources/arquillian.xml → ...wildfly/src/test/resources/arquillian.xml b/...gration/src/test/resources/arquillian.xml → ...wildfly/src/test/resources/arquillian.xml
diff --git a/...traint-mapping-contributor-validation.xml → ...traint-mapping-contributor-validation.xml b/...traint-mapping-contributor-validation.xml → ...traint-mapping-contributor-validation.xml
diff --git a/...c/test/resources/constraints-magician.xml → ...c/test/resources/constraints-magician.xml b/...c/test/resources/constraints-magician.xml → ...c/test/resources/constraints-magician.xml
diff --git a/...karta.validation.ConstraintValidator-Acme → ...karta.validation.ConstraintValidator-Acme b/...karta.validation.ConstraintValidator-Acme → ...karta.validation.ConstraintValidator-Acme
diff --git a/...ta.validation.ConstraintValidator-OxBerry → ...ta.validation.ConstraintValidator-OxBerry b/...ta.validation.ConstraintValidator-OxBerry → ...ta.validation.ConstraintValidator-OxBerry
diff --git a/...jakarta.validation.spi.ValidationProvider → ...jakarta.validation.spi.ValidationProvider b/...jakarta.validation.spi.ValidationProvider → ...jakarta.validation.spi.ValidationProvider
diff --git a/...oyment-structure-optional-constraints.xml → ...oyment-structure-optional-constraints.xml b/...oyment-structure-optional-constraints.xml → ...oyment-structure-optional-constraints.xml
diff --git a/...ation/src/test/resources/log4j.properties → ...ldfly/src/test/resources/log4j.properties b/...ation/src/test/resources/log4j.properties → ...ldfly/src/test/resources/log4j.properties
diff --git a/...st/resources/validation-custom-config.xml → ...st/resources/validation-custom-config.xml b/...st/resources/validation-custom-config.xml → ...st/resources/validation-custom-config.xml
diff --git a/.../resources/validation-custom-provider.xml → .../resources/validation-custom-provider.xml b/.../resources/validation-custom-provider.xml → .../resources/validation-custom-provider.xml
diff --git a/...gration/src/test/resources/validation.xml → ...wildfly/src/test/resources/validation.xml b/...gration/src/test/resources/validation.xml → ...wildfly/src/test/resources/validation.xml
diff --git a/pom.xml b/pom.xml
@@ -91,12 +91,12 @@
         <module>annotation-processor</module>
         <module>performance</module>
         <module>cdi</module>
-        <module>integration</module>
-        <module>java/simple</module>
-        <module>java/no-el</module>
-        <module>java/test-utils</module>
+        <module>integrationtest/wildfly</module>
+        <module>integrationtest/java/modules/simple</module>
+        <module>integrationtest/java/modules/no-el</module>
+        <module>integrationtest/java/modules/test-utils</module>
         <!-- CDI module test has problems with Weld and JBoss Logging version mismatch. Disabled for now. -->
-        <!-- <module>java/cdi</module> -->
+        <!-- <module>integrationtest/java/modules/cdi</module> -->
     </modules>
 
     <properties>