From 0a7765ecaf7616ec26438dfc56fd83c0d47d154f Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Tue, 10 Aug 2010 12:48:15 +0000
Subject: [PATCH] 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
---
 openjpa-integration/validation/pom.xml |  8 +++-----
 pom.xml                                | 10 ++++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/openjpa-integration/validation/pom.xml b/openjpa-integration/validation/pom.xml
index a18a57c96..b1465e105 100644
--- a/openjpa-integration/validation/pom.xml
+++ b/openjpa-integration/validation/pom.xml
@@ -37,11 +37,12 @@
     <description>OpenJPA Integration Tests - Bean Validation</description>
 
     <profiles>
-        <!-- Profile for testing with Apache BVAL provider -->
+        <!-- Default profile for testing with Apache BVAL provider -->
         <!-- See http://incubator.apache.org/projects/beanvalidation.html -->
         <profile>
             <id>bval</id>
             <activation>
+                <activeByDefault>true</activeByDefault>
                 <property>
                     <name>bval</name>
                 </property>
@@ -55,7 +56,6 @@
                 <dependency>
                     <groupId>org.apache.bval</groupId>
                     <artifactId>org.apache.bval.bundle</artifactId>
-                    <version>0.1-incubating</version>
                     <scope>test</scope>
                     <exclusions>
                         <!-- force usage of the geronimo-validation_1.0_spec -->
@@ -74,7 +74,6 @@
                 <dependency>
                     <groupId>commons-lang</groupId>
                     <artifactId>commons-lang</artifactId>
-                    <version>2.4</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
@@ -100,11 +99,10 @@
             </dependencies>
         </profile>
 
-        <!-- Default profile for testing with Hibernate Bean Validation RI -->
+        <!-- Profile for testing with Hibernate Bean Validation RI -->
         <profile>
             <id>hibernate</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
                 <property>
                     <name>hibernate</name>
                 </property>
diff --git a/pom.xml b/pom.xml
index 74ec01624..a8e8f60a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -656,6 +656,16 @@
                 <artifactId>geronimo-validation_1.0_spec</artifactId>
                 <version>1.1</version>
             </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>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>