From cda835d50bd2236de5c17551bcdadc77a7d37b4b Mon Sep 17 00:00:00 2001
From: Donald Woods <dwoods@apache.org>
Date: Tue, 23 Feb 2010 17:27:27 +0000
Subject: [PATCH] OPENJPA-1528 Upgrade to MySQL 5.1.12 driver.  Include dbcp
 overrides needed for MySQL.  Moved common dbcp and junit properties to parent
 pom to simplify maintenance.  Add some blank lines in a couple poms to
 improve readability.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@915448 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-persistence-jdbc/pom.xml    | 41 +++++++++++------------------
 openjpa-persistence-locking/pom.xml | 18 ++++---------
 openjpa-slice/pom.xml               | 10 ++++++-
 pom.xml                             | 20 +++++++++++---
 4 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index a8960413d..fff22d934 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -21,35 +21,22 @@
     Maven release plugin requires the project tag to be on a single line. 
 -->
 <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>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-persistence-jdbc</artifactId>
-    <packaging>jar</packaging>
-    <name>OpenJPA Persistence JDBC</name>
-    <description>OpenJPA Persistence JDBC</description>
-    <url>http://openjpa.apache.org</url>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <properties>
-        <openjpa.loglevel>INFO</openjpa.loglevel>
-        <dbcp.maxActive>10</dbcp.maxActive>
-        <dbcp.maxIdle>5</dbcp.maxIdle>
-        <dbcp.minIdle>2</dbcp.minIdle>
-        <dbcp.maxWait>10000</dbcp.maxWait>
-        <dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
-        <derby.locks.waitTimeout>10</derby.locks.waitTimeout>        
-        <derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
-        <!-- @AllowFailure options:  ignore = silently skip test,
-             log = execute test and log results but don't fail the test,
-             anything else allows the test to execute normally
-        -->
-        <tests.openjpa.allowfailure>ignore</tests.openjpa.allowfailure>
-    </properties>
-    <profiles>
 
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-persistence-jdbc</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenJPA Persistence JDBC</name>
+    <description>OpenJPA Persistence JDBC</description>
+
+    <profiles>
         <!-- Profile for testing with test-dynamic-enhancer -->
         <profile>
             <id>test-dynamic-enhancer</id>
@@ -63,7 +50,7 @@
             </properties>
             <build>
             <plugins>
-               <plugin>
+              <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
@@ -95,8 +82,8 @@
                     </systemProperties>
                 </configuration>
             </plugin>
-        </plugins>
-        </build>
+          </plugins>
+          </build>
         </profile>
 
         <!-- Profile for testing with HSQL DB -->
@@ -141,11 +128,13 @@
                 </dependency>
             </dependencies>
             <properties>
-                <mysql.version>5.1.6</mysql.version>
                 <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.mysql.url}</connection.url>
                 <connection.username>${openjpa.mysql.username}</connection.username>
                 <connection.password>${openjpa.mysql.password}</connection.password>
+                <!-- DBCP overrides for MySQL testing -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
             </properties>
         </profile>
 
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index 42d51f7a2..f95151bd7 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -21,6 +21,7 @@
     Maven release plugin requires the project tag to be on a single line.
 -->
 <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>
 
     <parent>
@@ -36,25 +37,14 @@
     <description>OpenJPA Persistence Locking Tests</description>
 
     <properties>
-        <openjpa.loglevel>INFO</openjpa.loglevel>
-        <dbcp.maxActive>10</dbcp.maxActive>
-        <dbcp.maxIdle>5</dbcp.maxIdle>
-        <dbcp.minIdle>2</dbcp.minIdle>
-        <dbcp.maxWait>10000</dbcp.maxWait>
-        <dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
         <!-- have to use a larger waitTimeout to avoid lockmgr test failures -->
         <derby.locks.waitTimeout>60</derby.locks.waitTimeout>
         <derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
-        <!-- @AllowFailure options:  ignore = silently skip test,
-             log = execute test and log results but don't fail the test,
-             anything else allows the test to execute normally
-        -->
-        <tests.openjpa.allowfailure>ignore</tests.openjpa.allowfailure>
         <!-- set this =** on cmdline to skip all tests -->
         <surefire.excludes.locking />
     </properties>
-    <profiles>
 
+    <profiles>
         <!-- Profile for testing with test-dynamic-enhancer -->
         <profile>
             <id>test-dynamic-enhancer</id>
@@ -148,11 +138,13 @@
                 </dependency>
             </dependencies>
             <properties>
-                <mysql.version>5.1.6</mysql.version>
                 <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.mysql.url}</connection.url>
                 <connection.username>${openjpa.mysql.username}</connection.username>
                 <connection.password>${openjpa.mysql.password}</connection.password>
+                <!-- DBCP overrides for MySQL testing -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
             </properties>
         </profile>
 
diff --git a/openjpa-slice/pom.xml b/openjpa-slice/pom.xml
index cdd394260..df22a2e91 100644
--- a/openjpa-slice/pom.xml
+++ b/openjpa-slice/pom.xml
@@ -21,17 +21,21 @@
     Maven release plugin requires the project tag to be on a single line.
 -->
 <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>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
+
     <groupId>org.apache.openjpa</groupId>
     <artifactId>openjpa-slice</artifactId>
     <packaging>jar</packaging>
     <name>OpenJPA Slice</name>
     <description>OpenJPA Slice</description>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
@@ -62,6 +66,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <profiles>
         <!-- Default is to test with Embedded Derby, which is setup in
              persistence.xml to create the required slices -->
@@ -85,14 +90,17 @@
                 </dependency>
             </dependencies>
             <properties>
-                <mysql.version>5.1.6</mysql.version>
                 <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
                 <connection.url>${openjpa.mysql.url}</connection.url>
                 <connection.username>${openjpa.mysql.username}</connection.username>
                 <connection.password>${openjpa.mysql.password}</connection.password>
+                <!-- DBCP overrides for MySQL testing -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
             </properties>
         </profile>
     </profiles>
+
     <build>
         <plugins>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 0aa0f3f62..62929f12d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,15 +43,29 @@
     <properties>
         <openjpa.version>${pom.version}</openjpa.version>
         <openjpa.loglevel>INFO</openjpa.loglevel>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
+        <!-- the test settings can be overridden my specific profiles -->
         <test.jvm.maxpermsize>512m</test.jvm.maxpermsize>
         <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
         <test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -XX:MaxPermSize=${test.jvm.maxpermsize}</test.jvm.arguments>
-        <!-- the sufire.jvm.args can be overridden my specific profiles -->
         <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location>
+        <dbcp.maxActive>10</dbcp.maxActive>
+        <dbcp.maxIdle>5</dbcp.maxIdle>
+        <dbcp.minIdle>2</dbcp.minIdle>
+        <dbcp.maxWait>10000</dbcp.maxWait>
+        <dbcp.args>MaxActive=${dbcp.maxActive},MaxIdle=${dbcp.maxIdle},MinIdle=${dbcp.minIdle},MaxWait=${dbcp.maxWait}</dbcp.args>
+        <derby.locks.waitTimeout>10</derby.locks.waitTimeout>
+        <derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout>
+        <!-- Testcase @AllowFailure options:  ignore = silently skip test,
+             log = execute test and log results but don't fail the test,
+             anything else allows the test to execute normally
+        -->
+        <tests.openjpa.allowfailure>ignore</tests.openjpa.allowfailure>
+        <!-- common JDBC driver versions -->
         <derby.version>10.5.3.0_1</derby.version>
         <hsqldb.version>1.8.0.10</hsqldb.version>
+        <mysql.version>5.1.12</mysql.version>
     </properties>
 
     <licenses>