You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/02/23 18:27:28 UTC
svn commit: r915448 - in /openjpa/trunk: openjpa-persistence-jdbc/pom.xml
openjpa-persistence-locking/pom.xml openjpa-slice/pom.xml pom.xml
Author: dwoods
Date: Tue Feb 23 17:27:27 2010
New Revision: 915448
URL: http://svn.apache.org/viewvc?rev=915448&view=rev
Log:
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.
Modified:
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-persistence-locking/pom.xml
openjpa/trunk/openjpa-slice/pom.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=915448&r1=915447&r2=915448&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Tue Feb 23 17:27:27 2010
@@ -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>
Modified: openjpa/trunk/openjpa-persistence-locking/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-locking/pom.xml?rev=915448&r1=915447&r2=915448&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-locking/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-locking/pom.xml Tue Feb 23 17:27:27 2010
@@ -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>
Modified: openjpa/trunk/openjpa-slice/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-slice/pom.xml?rev=915448&r1=915447&r2=915448&view=diff
==============================================================================
--- openjpa/trunk/openjpa-slice/pom.xml (original)
+++ openjpa/trunk/openjpa-slice/pom.xml Tue Feb 23 17:27:27 2010
@@ -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>
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=915448&r1=915447&r2=915448&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Tue Feb 23 17:27:27 2010
@@ -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>