From 6b8d4b9bcdc8b6b4fcbcf6c2adcea2924322fcda Mon Sep 17 00:00:00 2001
From: Mark Struberg <struberg@apache.org>
Date: Thu, 27 Oct 2016 13:15:29 +0000
Subject: [PATCH] OPENJPA-2677 prepare upgrade to BVal-1.1.2

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1766814 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-all/pom.xml              | 12 +-----------
 openjpa-project/NOTICE           |  1 -
 openjpa-project/assembly.xml     |  1 -
 openjpa-project/bin-assembly.xml |  1 -
 openjpa-project/pom.xml          |  4 ----
 pom.xml                          | 11 ++++-------
 6 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/openjpa-all/pom.xml b/openjpa-all/pom.xml
index 5d4a8ea45..1a1d18a6f 100644
--- a/openjpa-all/pom.xml
+++ b/openjpa-all/pom.xml
@@ -137,6 +137,7 @@
             <groupId>commons-dbcp</groupId>
             <artifactId>commons-dbcp</artifactId>
         </dependency>
+
         <!-- bean validation includes -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -146,16 +147,5 @@
             <groupId>org.apache.bval</groupId>
             <artifactId>org.apache.bval.bundle</artifactId>
         </dependency>
-        <dependency>
-            <!-- TODO This is actually a transitive dependency from bval and should get removed once bval gets rid of it-->
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/openjpa-project/NOTICE b/openjpa-project/NOTICE
index 84c2f67ae..85dae47b2 100644
--- a/openjpa-project/NOTICE
+++ b/openjpa-project/NOTICE
@@ -6,7 +6,6 @@ This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 The OpenJPA binary assembly and openjpa-all includes software developed by the:
-    Apache Commons Beanutils project
     Apache Commons Collections project
     Apache Commons DBCP project
     Apache Commons Lang project
diff --git a/openjpa-project/assembly.xml b/openjpa-project/assembly.xml
index fa2f9c428..f8e0acd6a 100644
--- a/openjpa-project/assembly.xml
+++ b/openjpa-project/assembly.xml
@@ -144,7 +144,6 @@
                 <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
                 <include>org.apache.bval:org.apache.bval.bundle</include>
-                <include>commons-beanutils:commons-beanutils</include>
                 <include>org.apache.xbean:xbean-asm5-shaded</include>
             </includes>
         </dependencySet>
diff --git a/openjpa-project/bin-assembly.xml b/openjpa-project/bin-assembly.xml
index 6e0dd1410..b138d187a 100644
--- a/openjpa-project/bin-assembly.xml
+++ b/openjpa-project/bin-assembly.xml
@@ -83,7 +83,6 @@
                 <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-validation_1.0_spec</include>
                 <include>org.apache.bval:org.apache.bval.bundle</include>
-                <include>commons-beanutils:commons-beanutils</include>
                 <include>org.apache.xbean:xbean-asm5-shaded</include>
             </includes>
         </dependencySet>
diff --git a/openjpa-project/pom.xml b/openjpa-project/pom.xml
index d54c088b3..9c68059e0 100644
--- a/openjpa-project/pom.xml
+++ b/openjpa-project/pom.xml
@@ -424,9 +424,5 @@
             <groupId>org.apache.bval</groupId>
             <artifactId>org.apache.bval.bundle</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 7efcf35ce..0fafa516b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,8 @@
 
         <maven.javadoc.version>2.10.3</maven.javadoc.version>
         <maven.surefire.version>2.19.1</maven.surefire.version>
+
+        <bval.version>1.1.2-SNAPSHOT</bval.version>
     </properties>
 
     <licenses>
@@ -532,17 +534,12 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-validation_1.1_spec</artifactId>
-                <version>1.0-alpha-1</version>
+                <version>1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.bval</groupId>
                 <artifactId>org.apache.bval.bundle</artifactId>
-                <version>1.1.1</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>1.9.2</version>
+                <version>${bval.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>