openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r980907 - in /openjpa/trunk: openjpa-all/pom.xml openjpa-project/assembly.xml openjpa-project/pom.xml
Date Fri, 30 Jul 2010 18:17:58 GMT
Author: dwoods
Date: Fri Jul 30 18:17:58 2010
New Revision: 980907

URL: http://svn.apache.org/viewvc?rev=980907&view=rev
Log:
OPENJPA-1730 Include commons-dbcp-1.2.2 in openjpa-all and binary distro

Modified:
    openjpa/trunk/openjpa-all/pom.xml
    openjpa/trunk/openjpa-project/assembly.xml
    openjpa/trunk/openjpa-project/pom.xml

Modified: openjpa/trunk/openjpa-all/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-all/pom.xml?rev=980907&r1=980906&r2=980907&view=diff
==============================================================================
--- openjpa/trunk/openjpa-all/pom.xml (original)
+++ openjpa/trunk/openjpa-all/pom.xml Fri Jul 30 18:17:58 2010
@@ -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>

Modified: openjpa/trunk/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/assembly.xml?rev=980907&r1=980906&r2=980907&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/assembly.xml Fri Jul 30 18:17:58 2010
@@ -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>

Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=980907&r1=980906&r2=980907&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Fri Jul 30 18:17:58 2010
@@ -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>



Mime
View raw message