Updated Branches: refs/heads/master f2d18ff53 -> 4a7dd5c94
DELTASPIKE-388 Finished the creation of the factory, setup tests to be able to run in SE mode. Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/4a7dd5c9 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/4a7dd5c9 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/4a7dd5c9 Branch: refs/heads/master Commit: 4a7dd5c941493ace8260c2d162daed4a737ea4b2 Parents: f2d18ff Author: John D. Ament <[email protected]> Authored: Fri Jul 5 20:06:06 2013 -0400 Committer: John D. Ament <[email protected]> Committed: Fri Jul 5 20:06:06 2013 -0400 ---------------------------------------------------------------------- deltaspike/modules/bean-validation/impl/pom.xml | 2 -- .../test/InjectedValidationTest.java | 5 +++-- deltaspike/parent/code/pom.xml | 12 +++++++++++- deltaspike/parent/pom.xml | 19 +++++++++++++++++++ 4 files changed, 33 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4a7dd5c9/deltaspike/modules/bean-validation/impl/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/modules/bean-validation/impl/pom.xml b/deltaspike/modules/bean-validation/impl/pom.xml index bfd6795..c9c2d37 100644 --- a/deltaspike/modules/bean-validation/impl/pom.xml +++ b/deltaspike/modules/bean-validation/impl/pom.xml @@ -42,6 +42,4 @@ </dependency> </dependencies> - - </project> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4a7dd5c9/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanValidation/test/InjectedValidationTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanValidation/test/InjectedValidationTest.java b/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanValidation/test/InjectedValidationTest.java index d2f9196..58ee7f9 100644 --- a/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanValidation/test/InjectedValidationTest.java +++ b/deltaspike/modules/bean-validation/impl/src/test/java/org/apache/deltaspike/beanValidation/test/InjectedValidationTest.java @@ -38,7 +38,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @RunWith(Arquillian.class) -@Category(WebProfileCategory.class) public class InjectedValidationTest { @Deployment @@ -58,7 +57,9 @@ public class InjectedValidationTest @Before public void initValidator() { - this.validator = Validation.buildDefaultValidatorFactory().getValidator(); + this.validator = Validation.byDefaultProvider().configure() + .constraintValidatorFactory(new CDIAwareConstraintValidatorFactory()) + .buildValidatorFactory().getValidator(); } @Test http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4a7dd5c9/deltaspike/parent/code/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/parent/code/pom.xml b/deltaspike/parent/code/pom.xml index c2f448e..e6a3245 100644 --- a/deltaspike/parent/code/pom.xml +++ b/deltaspike/parent/code/pom.xml @@ -189,6 +189,12 @@ <version>1.2.0</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.bval</groupId> + <artifactId>bval-jsr303</artifactId> + <scope>test</scope> + </dependency> </dependencies> </profile> @@ -281,7 +287,11 @@ <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> - + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>org.jboss.arquillian.container</groupId> <artifactId>arquillian-weld-ee-embedded-1.1</artifactId> http://git-wip-us.apache.org/repos/asf/deltaspike/blob/4a7dd5c9/deltaspike/parent/pom.xml ---------------------------------------------------------------------- diff --git a/deltaspike/parent/pom.xml b/deltaspike/parent/pom.xml index 23d1d62..5ffcfc4 100644 --- a/deltaspike/parent/pom.xml +++ b/deltaspike/parent/pom.xml @@ -121,6 +121,9 @@ <deltaspike.osgi.provide.capability /> <deltaspike.osgi.require.capability /> <cdi.osgi.beans-managed /> + <!-- validator related --> + <hibernate.validator.version>4.3.1.Final</hibernate.validator.version> + <bval.version>0.5</bval.version> </properties> @@ -604,6 +607,22 @@ <version>3.12.0.GA</version> <scope>provided</scope> </dependency> + + <!-- validators, only needed in SE mode --> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${hibernate.validator.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.bval</groupId> + <artifactId>bval-jsr303</artifactId> + <version>${bval.version}</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement>
