OPENJPA-1730 Include commons-dbcp-1.2.2 in openjpa-all and binary distro

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@980907 13f79535-47bb-0310-9956-ffa450edef68

openjpa-all/pom.xml

@@ -22,16 +22,19 @@
     the release plugin.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>openjpa-all</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Aggregate Jar with Dependencies</name>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.1.0-SNAPSHOT</version>
     </parent>
 
+    <artifactId>openjpa-all</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Aggregate Jar with Dependencies</name>
+
     <build>
         <plugins>
             <!--
@@ -106,10 +109,14 @@
             <artifactId>openjpa</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <!-- include commons-logging -->
+        <!-- other includes -->
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+        </dependency>
     </dependencies>
 </project>

openjpa-project/assembly.xml

@@ -121,6 +121,7 @@
                 <include>commons-collections:commons-collections</include>
                 <include>commons-pool:commons-pool</include>
                 <include>commons-logging:commons-logging</include>
+                <include>commons-dbcp:commons-dbcp</include>
 
                 <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jpa_2.0_spec</include>

openjpa-project/pom.xml

@@ -425,6 +425,10 @@
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+        </dependency>
 
         <!-- excluded optional dependency that user should provide with BV impl
         <dependency>