Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Donald Woods 2010-02-23 17:27:27 +00:00
parent fa4b72d7f5
commit cda835d50b
4 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
openjpa-persistence-jdbc/pom.xml
View File

@ -21,35 +21,22 @@
Maven release plugin requires the project tag to be on a single line. 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"> <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> <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> <parent>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId> <artifactId>openjpa-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </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 for testing with test-dynamic-enhancer -->
<profile> <profile>
<id>test-dynamic-enhancer</id> <id>test-dynamic-enhancer</id>
@ -63,7 +50,7 @@
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
@ -95,8 +82,8 @@
</systemProperties> </systemProperties>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
<!-- Profile for testing with HSQL DB --> <!-- Profile for testing with HSQL DB -->
@ -141,11 +128,13 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<mysql.version>5.1.6</mysql.version>
<connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name> <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
<connection.url>${openjpa.mysql.url}</connection.url> <connection.url>${openjpa.mysql.url}</connection.url>
<connection.username>${openjpa.mysql.username}</connection.username> <connection.username>${openjpa.mysql.username}</connection.username>
<connection.password>${openjpa.mysql.password}</connection.password> <connection.password>${openjpa.mysql.password}</connection.password>
<!-- DBCP overrides for MySQL testing -->
<dbcp.maxIdle>0</dbcp.maxIdle>
<dbcp.minIdle>0</dbcp.minIdle>
</properties> </properties>
</profile> </profile>

18
openjpa-persistence-locking/pom.xml
View File

@ -21,6 +21,7 @@
Maven release plugin requires the project tag to be on a single line. 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
@ -36,25 +37,14 @@
<description>OpenJPA Persistence Locking Tests</description> <description>OpenJPA Persistence Locking Tests</description>
<properties> <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 --> <!-- have to use a larger waitTimeout to avoid lockmgr test failures -->
<derby.locks.waitTimeout>60</derby.locks.waitTimeout> <derby.locks.waitTimeout>60</derby.locks.waitTimeout>
<derby.locks.deadlockTimeout>5</derby.locks.deadlockTimeout> <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 --> <!-- set this =** on cmdline to skip all tests -->
<surefire.excludes.locking /> <surefire.excludes.locking />
</properties> </properties>
<profiles>
<profiles>
<!-- Profile for testing with test-dynamic-enhancer --> <!-- Profile for testing with test-dynamic-enhancer -->
<profile> <profile>
<id>test-dynamic-enhancer</id> <id>test-dynamic-enhancer</id>
@ -148,11 +138,13 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<mysql.version>5.1.6</mysql.version>
<connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name> <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
<connection.url>${openjpa.mysql.url}</connection.url> <connection.url>${openjpa.mysql.url}</connection.url>
<connection.username>${openjpa.mysql.username}</connection.username> <connection.username>${openjpa.mysql.username}</connection.username>
<connection.password>${openjpa.mysql.password}</connection.password> <connection.password>${openjpa.mysql.password}</connection.password>
<!-- DBCP overrides for MySQL testing -->
<dbcp.maxIdle>0</dbcp.maxIdle>
<dbcp.minIdle>0</dbcp.minIdle>
</properties> </properties>
</profile> </profile>

10
openjpa-slice/pom.xml
View File

@ -21,17 +21,21 @@
Maven release plugin requires the project tag to be on a single line. 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"> <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> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-parent</artifactId> <artifactId>openjpa-parent</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-slice</artifactId> <artifactId>openjpa-slice</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OpenJPA Slice</name> <name>OpenJPA Slice</name>
<description>OpenJPA Slice</description> <description>OpenJPA Slice</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.openjpa</groupId> <groupId>org.apache.openjpa</groupId>
@ -62,6 +66,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<profiles> <profiles>
<!-- Default is to test with Embedded Derby, which is setup in <!-- Default is to test with Embedded Derby, which is setup in
persistence.xml to create the required slices --> persistence.xml to create the required slices -->
@ -85,14 +90,17 @@
</dependency> </dependency>
</dependencies> </dependencies>
<properties> <properties>
<mysql.version>5.1.6</mysql.version>
<connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name> <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
<connection.url>${openjpa.mysql.url}</connection.url> <connection.url>${openjpa.mysql.url}</connection.url>
<connection.username>${openjpa.mysql.username}</connection.username> <connection.username>${openjpa.mysql.username}</connection.username>
<connection.password>${openjpa.mysql.password}</connection.password> <connection.password>${openjpa.mysql.password}</connection.password>
<!-- DBCP overrides for MySQL testing -->
<dbcp.maxIdle>0</dbcp.maxIdle>
<dbcp.minIdle>0</dbcp.minIdle>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

20
pom.xml
View File

@ -43,15 +43,29 @@
<properties> <properties>
<openjpa.version>${pom.version}</openjpa.version> <openjpa.version>${pom.version}</openjpa.version>
<openjpa.loglevel>INFO</openjpa.loglevel> <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.maxpermsize>512m</test.jvm.maxpermsize>
<test.jvm.maxheapsize>1024m</test.jvm.maxheapsize> <test.jvm.maxheapsize>1024m</test.jvm.maxheapsize>
<test.jvm.arguments>-Xmx${test.jvm.maxheapsize} -XX:MaxPermSize=${test.jvm.maxpermsize}</test.jvm.arguments> <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> <surefire.jvm.args>${test.jvm.arguments}</surefire.jvm.args>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <dbcp.maxActive>10</dbcp.maxActive>
<checkstyle.config.location>../openjpa-project/checkstyle.xml</checkstyle.config.location> <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> <derby.version>10.5.3.0_1</derby.version>
<hsqldb.version>1.8.0.10</hsqldb.version> <hsqldb.version>1.8.0.10</hsqldb.version>
<mysql.version>5.1.12</mysql.version>
</properties> </properties>
<licenses> <licenses>