OPENJPA-1712 switch validation providers from Hibernate to Apache BVAL to match trunk and to fix Java SE 5 testing

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@983972 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald Woods 2010-08-10 12:48:15 +00:00
parent df61400a8c
commit 0a7765ecaf
2 changed files with 13 additions and 5 deletions

View File

@ -37,11 +37,12 @@
<description>OpenJPA Integration Tests - Bean Validation</description> <description>OpenJPA Integration Tests - Bean Validation</description>
<profiles> <profiles>
<!-- Profile for testing with Apache BVAL provider --> <!-- Default profile for testing with Apache BVAL provider -->
<!-- See http://incubator.apache.org/projects/beanvalidation.html --> <!-- See http://incubator.apache.org/projects/beanvalidation.html -->
<profile> <profile>
<id>bval</id> <id>bval</id>
<activation> <activation>
<activeByDefault>true</activeByDefault>
<property> <property>
<name>bval</name> <name>bval</name>
</property> </property>
@ -55,7 +56,6 @@
<dependency> <dependency>
<groupId>org.apache.bval</groupId> <groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId> <artifactId>org.apache.bval.bundle</artifactId>
<version>0.1-incubating</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<!-- force usage of the geronimo-validation_1.0_spec --> <!-- force usage of the geronimo-validation_1.0_spec -->
@ -74,7 +74,6 @@
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
<version>2.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -100,11 +99,10 @@
</dependencies> </dependencies>
</profile> </profile>
<!-- Default profile for testing with Hibernate Bean Validation RI --> <!-- Profile for testing with Hibernate Bean Validation RI -->
<profile> <profile>
<id>hibernate</id> <id>hibernate</id>
<activation> <activation>
<activeByDefault>true</activeByDefault>
<property> <property>
<name>hibernate</name> <name>hibernate</name>
</property> </property>

10
pom.xml
View File

@ -656,6 +656,16 @@
<artifactId>geronimo-validation_1.0_spec</artifactId> <artifactId>geronimo-validation_1.0_spec</artifactId>
<version>1.1</version> <version>1.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>org.apache.bval.bundle</artifactId>
<version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.8.3</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>