diff --git a/openjpa-persistence-jdbc/pom.xml b/openjpa-persistence-jdbc/pom.xml
index acd3a1421..2d5e72a29 100644
--- a/openjpa-persistence-jdbc/pom.xml
+++ b/openjpa-persistence-jdbc/pom.xml
@@ -63,834 +63,8 @@
             </build>
         </profile>
 
-        <!-- Profile for testing with HSQL DB -->
-        <profile>
-            <id>test-hsqldb</id>
-            <activation>
-                <property>
-                    <name>test-hsqldb</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.hsqldb</groupId>
-                    <artifactId>hsqldb</artifactId>
-                    <version>${hsqldb.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
-                <!--<connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>-->
-                <connection.url>jdbc:hsqldb:mem:openjpa20-hsqldb-database</connection.url>
-                <connection.username>sa</connection.username>
-                <connection.password />
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with MySQL DB -->
-        <profile>
-            <id>test-mysql</id>
-            <activation>
-                <property>
-                    <name>test-mysql</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <version>${mysql.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.mysql.url}</connection.url>
-                <connection.username>${openjpa.mysql.username}</connection.username>
-                <connection.password>${openjpa.mysql.password}</connection.password>
-                <jdbc.DBDictionary />
-                <!-- DBCP overrides for MySQL testing -->
-                <dbcp.maxIdle>0</dbcp.maxIdle>
-                <dbcp.minIdle>0</dbcp.minIdle>
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with MySQL DB -->
-        <profile>
-            <id>test-mysql-docker</id>
-            <activation>
-                <property>
-                    <name>test-mysql-docker</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>mysql</groupId>
-                    <artifactId>mysql-connector-java</artifactId>
-                    <version>${mysql.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.mysql.url}</connection.url>
-                <connection.username>${openjpa.mysql.username}</connection.username>
-                <connection.password>${openjpa.mysql.password}</connection.password>
-                <jdbc.DBDictionary />
-                <!-- DBCP overrides for MySQL testing -->
-                <dbcp.maxIdle>0</dbcp.maxIdle>
-                <dbcp.minIdle>0</dbcp.minIdle>
-            </properties>
-
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <configuration>
-                            <images>
-                                <image>
-                                    <name>mysql/mysql-server:5.7</name>
-                                    <run>
-                                        <env>
-                                            <MYSQL_DATABASE>openjpatst</MYSQL_DATABASE>
-                                            <MYSQL_USER>openjpatst</MYSQL_USER>
-                                            <MYSQL_PASSWORD>openjpatst</MYSQL_PASSWORD>
-                                        </env>
-                                        <ports>
-                                            <port>3306:3306</port>
-                                        </ports>
-                                    </run>
-                                </image>
-                            </images>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-
-        <!-- Profile for testing with MariaDB DB -->
-        <profile>
-            <id>test-mariadb</id>
-            <activation>
-                <property>
-                    <name>test-mariadb</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>mariadb</groupId>
-                    <artifactId>mariadb-connector-java</artifactId>
-                    <version>${mariadb.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>org.mariadb.jdbc.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.mariadb.url}</connection.url>
-                <connection.username>${openjpa.mariadb.username}</connection.username>
-                <connection.password>${openjpa.mariadb.password}</connection.password>
-                <jdbc.DBDictionary />
-                <!-- DBCP overrides for MariaDB testing -->
-                <dbcp.maxIdle>0</dbcp.maxIdle>
-                <dbcp.minIdle>0</dbcp.minIdle>
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with PostgreSQL DB -->
-        <profile>
-            <id>test-postgresql</id>
-            <activation>
-                <property>
-                    <name>test-postgresql</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <version>${postgresql.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>org.postgresql.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:postgresql://localhost/openjpa</connection.url>-->
-                <connection.url>${openjpa.postgresql.url}</connection.url>
-                <connection.username>${openjpa.postgresql.username}</connection.username>
-                <connection.password>${openjpa.postgresql.password}</connection.password>
-                <jdbc.DBDictionary />
-                <!-- DBCP overrides -->
-                <dbcp.maxIdle>0</dbcp.maxIdle>
-                <dbcp.minIdle>0</dbcp.minIdle>
-                <dbcp.maxActive>20</dbcp.maxActive>
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with SQLServer DB using MS JDBC driver -->
-        <profile>
-            <!--
-                Example MS SQL profile. You can use this profile if you:
-                1) have the MS SQL artifacts installed in a local repo and
-                supply the URL:
-                    -Dmssql.maven.repo=http://my.local.repo
-                2) have a copy of the MS SQL JDBC driver from:
-                    http://msdn.microsoft.com/en-us/data/aa937724.aspx
-                and run the following commands :
-                    mvn install:install-file -Dfile=${path to sqljdbc.jar} \
-                                             -DgroupId=com.microsoft.sqlserver \
-                                             -DartifactId=sqljdbc \
-                                             -Dversion=2.0 \
-                                             -Dpackaging=jar
-
-                You must also set the following properties:
-                    -Dopenjpa.mssql.url=jdbc:sqlserver://<HOST>:<PORT>;\
-                    	DataBaseName=<DBNAME>
-                    -Dopenjpa.mssql.username=<mssql_uid>
-                    -Dopenjpa.mssql.password=<mssql_pwd>
-
-                Optionally, you can override the default groupId and version
-                by also supplying the following properties:
-                    -Dmssql.groupid=com.microsoft.sqlserver
-                    -Dmssql.version=2.0
-                If you are using Java SE 6 or later, you will need to use:
-                    -Dmssql.artifactid=sqljdbc4
-            -->
-            <id>test-mssql</id>
-            <activation>
-                <property>
-                    <name>test-mssql</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${mssql.groupid}</groupId>
-                    <artifactId>${mssql.artifactid}</artifactId>
-                    <version>${mssql.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <mssql.maven.repo>http://not.real.repository</mssql.maven.repo>
-                <mssql.groupid>com.microsoft.sqlserver</mssql.groupid>
-                <mssql.artifactid>sqljdbc</mssql.artifactid>
-                <mssql.version>2.0</mssql.version>
-                <connection.driver.name>com.microsoft.sqlserver.jdbc.SQLServerDriver</connection.driver.name>
-                <!--<connection.url>jdbc:sqlserver://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.mssql.url}</connection.url>
-                <connection.username>${openjpa.mssql.username}</connection.username>
-                <connection.password>${openjpa.mssql.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>mssql.repository</id>
-                    <name>MSSQL Repository</name>
-                    <url>${mssql.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing with SQLServer DB using the jTDS driver -->
-        <profile>
-            <id>test-sqlserver</id>
-            <activation>
-                <property>
-                    <name>test-sqlserver</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>net.sourceforge.jtds</groupId>
-                    <artifactId>jtds</artifactId>
-                    <version>${jtds.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <jtds.version>1.2</jtds.version>
-                <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:jtds:sqlserver://localhost:1433/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.sqlserver.url}</connection.url>
-                <connection.username>${openjpa.sqlserver.username}</connection.username>
-                <connection.password>${openjpa.sqlserver.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with Sybase DB using the jTDS driver -->
-        <profile>
-            <id>test-sybase</id>
-            <activation>
-                <property>
-                    <name>test-sybase</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>net.sourceforge.jtds</groupId>
-                    <artifactId>jtds</artifactId>
-                    <version>${jtds.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <jtds.version>1.2</jtds.version>
-                <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:jtds:sybase://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.sybase.url}</connection.url>
-                <connection.username>${openjpa.sybase.username}</connection.username>
-                <connection.password>${openjpa.sybase.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with Sybase DB using the jConnect driver -->
-        <profile>
-            <id>test-sybase-jconnect</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${jconnect.groupId}</groupId>
-                    <artifactId>${jconnect.artifactId}</artifactId>
-                    <version>${jconnect.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>com.sybase.jdbc3.jdbc.SybDriver</connection.driver.name>
-                <!--<connection.url>jdbc:sybase:Tds:localhost:7100/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.sybase.url}</connection.url>
-                <connection.username>${openjpa.sybase.username}</connection.username>
-                <connection.password>${openjpa.sybase.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with Ingres DB -->
-        <profile>
-            <id>test-ingres</id>
-            <activation>
-                <property>
-                    <name>test-ingres</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ingres.jdbc</groupId>
-                    <artifactId>iijdbc</artifactId>
-                    <version>${ingres.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <ingres.version>9.2-3.4.8</ingres.version>
-                <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name>
-                <!--<connection.url>jdbc:ingres://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.ingres.url}</connection.url>
-                <connection.username>${openjpa.ingres.username}</connection.username>
-                <connection.password>${openjpa.ingres.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with a custom DB using a system jar -->
-        <!--
-            For example, to test with Oracle, you might run:
-        mvn test -Dtest=TestPersistence -Ptest-custom \
-          -Dopenjpa.custom.driverjar=$(pwd)/drivers/jdbc-oracle-10_2_0_1_0.jar \
-          -Dopenjpa.custom.driverclass=oracle.jdbc.driver.OracleDriver \
-          -Dopenjpa.custom.url=jdbc:oracle:thin:@HOST:PORT:DBNAME \
-          -Dopenjpa.custom.username=USERNAME \
-          -Dopenjpa.custom.password=PASSWORD
-        -->
-        <profile>
-            <id>test-custom</id>
-            <activation>
-                <property>
-                    <name>test-custom</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>openjpa.customdriver</groupId>
-                    <artifactId>openjpa.customdriver</artifactId>
-                    <version>1.0</version>
-                    <scope>system</scope>
-                    <systemPath>${openjpa.custom.driverjar}</systemPath>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>${openjpa.custom.driverclass}</connection.driver.name>
-                <connection.url>${openjpa.custom.url}</connection.url>
-                <connection.username>${openjpa.custom.username}</connection.username>
-                <connection.password>${openjpa.custom.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
 
 
-        <!-- Profile for testing with a custom DB using two system jars.
-             Some databases (DB2) use more than one jar for their JDBC provider.
-             Functionally this is identical to the previous profile, with a
-             second system dependency added.
-          -->
-        <!--
-            For example, to test with DB2, you might run:
-        mvn test -Dtest=TestPersistence -Ptest-custom2 \
-          -Dopenjpa.custom.driverjar1=$(pwd)/drivers/db2jcc.jar \
-          -Dopenjpa.custom.driverjar2=$(pwd)/drviers/db2jcc_license_cu.jar \
-          -Dopenjpa.custom.driverclass=com.ibm.db2.jcc.DB2Driver \
-          -Dopenjpa.custom.url=jdbc:db2://HOST:PORT/DBNAME \
-          -Dopenjpa.custom.username=USERNAME \
-          -Dopenjpa.custom.password=PASSWORD
-        -->
-        <profile>
-            <id>test-custom2</id>
-            <activation>
-                <property>
-                    <name>test-custom2</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>openjpa.customdriver1</groupId>
-                    <artifactId>openjpa.customdriver1</artifactId>
-                    <version>1.0</version>
-                    <scope>system</scope>
-                    <systemPath>${openjpa.custom.driverjar1}</systemPath>
-                </dependency>
-                <dependency>
-                    <groupId>openjpa.customdriver2</groupId>
-                    <artifactId>openjpa.customdriver2</artifactId>
-                    <version>1.0</version>
-                    <scope>system</scope>
-                    <systemPath>${openjpa.custom.driverjar2}</systemPath>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>${openjpa.custom.driverclass}</connection.driver.name>
-                <connection.url>${openjpa.custom.url}</connection.url>
-                <connection.username>${openjpa.custom.username}</connection.username>
-                <connection.password>${openjpa.custom.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!--
-            The test-custom2 profile does not work very well when used with a
-            continuous build system. As a convenience I've added profiles for
-            some of the proprietary databases to make testing easier.
-          -->
-        <profile>
-            <!--
-                Example db2 profile. You can use this profile if you:
-                1) have the DB2 artifacts installed in a local repo and supply
-                the URL:
-	            -Ddb2.maven.repo=http://my.local.repo
-                2) have a copy of the DB2 JCC driver and run the following
-                commands :
-                    mvn install:install-file -Dfile=${path to db2jcc.jar} \
-                                             -DgroupId=com.ibm.db2 \
-                                             -DartifactId=jcc-driver \
-                                             -Dversion=9.5 \
-                                             -Dpackaging=jar
-
-                    mvn install:install-file -Dfile=${path to db2jcc_license.jar} \
-                                             -DgroupId=com.ibm.db2 \
-                                             -DartifactId=jcc-license \
-                                             -Dversion=9.5 \
-                                             -Dpackaging=jar
-
-                You must also set the following properties:
-                    -Dopenjpa.db2.url=jdbc:db2://<HOST>:<PORT>/<DBNAME>
-                    -Dopenjpa.db2.username=<db2_uid>
-                    -Dopenjpa.db2.password=<db2_pwd>
-
-                Optionally, you can override the default DB2 groupId,
-                artifactIds and version by also supplying the following
-                properties:
-                    -Ddb2.groupid=com.ibm.db2
-                    -Dids.driver.artifactid=jcc-driver
-                    -Dids.license.artifactid=jcc-license
-                    -Ddb2.version=9.5
-            -->
-            <id>test-db2-jcc</id>
-            <activation>
-                <property>
-                    <name>test-db2-jcc</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${db2.groupid}</groupId>
-                    <artifactId>${db2.driver.artifactid}</artifactId>
-                    <version>${db2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${db2.groupid}</groupId>
-                    <artifactId>${db2.license.artifactid}</artifactId>
-                    <version>${db2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
-                <db2.groupid>com.ibm.db2</db2.groupid>
-                <db2.driver.artifactid>jcc-driver</db2.driver.artifactid>
-                <db2.license.artifactid>jcc-license</db2.license.artifactid>
-                <db2.version>9.5</db2.version>
-                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
-                <!--<connection.url>jdbc:db2://localhost/openjpa</connection.url>-->
-                <connection.url>${openjpa.db2.url}</connection.url>
-                <connection.username>${openjpa.db2.username}</connection.username>
-                <connection.password>${openjpa.db2.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>db2.repository</id>
-                    <name>DB2 Repository</name>
-                    <url>${db2.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing Apache Derby with the DB2 JCC driver -->
-        <profile>
-            <id>test-derbyjcc</id>
-            <activation>
-                <property>
-                    <name>test-derbyjcc</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${db2.groupid}</groupId>
-                    <artifactId>${db2.driver.artifactid}</artifactId>
-                    <version>${db2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${db2.groupid}</groupId>
-                    <artifactId>${db2.license.artifactid}</artifactId>
-                    <version>${db2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
-                <db2.groupid>com.ibm.db2</db2.groupid>
-                <db2.driver.artifactid>jcc-driver</db2.driver.artifactid>
-                <db2.license.artifactid>jcc-license</db2.license.artifactid>
-                <db2.version>9.5</db2.version>
-                <!--
-                    Note: DB must be created before using this profile,
-                    which can be done by running:
-                        mvn test -Dtest=<testcase> -Ptest-derbynet
-                -->
-                <openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url>
-                <!-- Note: commons-dbcp2 requires dummy values for uid/pwd -->
-                <openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username>
-                <openjpa.derbyjcc.password>pwd</openjpa.derbyjcc.password>
-                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
-                <connection.url>${openjpa.derbyjcc.url}</connection.url>
-                <connection.username>${openjpa.derbyjcc.username}</connection.username>
-                <connection.password>${openjpa.derbyjcc.password}</connection.password>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>db2.repository</id>
-                    <name>DB2 Repository</name>
-                    <url>${db2.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing Informix with the DB2 JCC driver -->
-        <profile>
-            <!--
-                Example Informix JCC profile. You can use this profile if you:
-                1a) have the DB2 JCC artifacts installed in a local repo and
-                supply the URL:
-	            -Dids.maven.repo=http://my.local.repo
-                1b) or have a copy of the DB2 JCC driver and run the commands
-                listed above in the test-db2-jcc profile.
-		2) have the DRDA service enabled on the IDS server, which
-                is usually port 9089
-
-                You must also set the following properties:
-                    -Dopenjpa.ids.url=jdbc:ids://<HOST>:<PORT>/<DBNAME>
-                    -Dopenjpa.ids.username=<ids_uid>
-                    -Dopenjpa.ids.password=<ids_pwd>
-
-                Optionally, you can override the default DB2 JCC groupId,
-                artifactIds and version by also supplying the following
-                properties:
-                    -Dids.groupid=com.ibm.db2
-                    -Dids.driver.artifactid=jcc-driver
-                    -Dids.license.artifactid=jcc-license
-                    -Dids.version=9.5
-            -->
-            <id>test-ids-jcc</id>
-            <activation>
-                <property>
-                    <name>test-ids-jcc</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${ids.groupid}</groupId>
-                    <artifactId>${ids.driver.artifactid}</artifactId>
-                    <version>${ids.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${ids.groupid}</groupId>
-                    <artifactId>${ids.license.artifactid}</artifactId>
-                    <version>${ids.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <ids.maven.repo>http://not.a.real.repository</ids.maven.repo>
-                <ids.groupid>com.ibm.db2</ids.groupid>
-                <ids.driver.artifactid>jcc-driver</ids.driver.artifactid>
-                <ids.license.artifactid>jcc-license</ids.license.artifactid>
-                <ids.version>9.5</ids.version>
-                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
-                <connection.url>${openjpa.ids.url}</connection.url>
-                <connection.username>${openjpa.ids.username}</connection.username>
-                <connection.password>${openjpa.ids.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>ids.repository</id>
-                    <name>Informix Repository</name>
-                    <url>${ids.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing Informix with the Informix JDBC Driver -->
-        <profile>
-            <!--
-                Example Informix profile. You can use this profile if you:
-                1) have the Informix JDBC artifacts installed in a local repo and
-                supply the URL:
-                  -Dids.maven.repo=http://my.local.repo
-                2) have a copy of the Informix driver and run the following
-                commands :
-                    mvn install:install-file -Dfile=${path to ifxjdbc.jar} \
-                                             -DgroupId=com.informix \
-                                             -DartifactId=informix-driver \
-                                             -Dversion=3.70 \
-                                             -Dpackaging=jar
-
-                You must also set the following properties:
-                    -Dopenjpa.ids.url=jdbc:informix-sqli://<HOST>:<PORT>:informixserver=<INFORMIXSERVER>;database=<DBNAME>
-                    -Dopenjpa.ids.username=<ids_uid>
-                    -Dopenjpa.ids.password=<ids_pwd>
-
-                Optionally, you can override the default Informix groupId,
-                artifactIds and version by also supplying the following
-                properties:
-                    -Dids.groupid=com.informix
-                    -Dids.driver.artifactid=informix-driver
-                    -Dids.version=3.70
-            -->
-            <id>test-ids-informix</id>
-            <activation>
-                <property>
-                    <name>test-ids-informix</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${ids.groupid}</groupId>
-                    <artifactId>${ids.driver.artifactid}</artifactId>
-                    <version>${ids.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <ids.maven.repo>http://not.a.real.repository</ids.maven.repo>
-                <ids.groupid>com.informix</ids.groupid>
-                <ids.driver.artifactid>informix-driver</ids.driver.artifactid>
-                <ids.version>3.70</ids.version>
-                <connection.driver.name>com.informix.jdbc.IfxDriver</connection.driver.name>
-                <connection.url>${openjpa.ids.url}</connection.url>
-                <connection.username>${openjpa.ids.username}</connection.username>
-                <connection.password>${openjpa.ids.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>ids.repository</id>
-                    <name>Informix Repository</name>
-                    <url>${ids.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing with Oracle DB -->
-        <profile>
-            <!--
-                Example oracle profile. You can use this profile if you:
-                1) have the Oracle artifacts installed in a local repo and
-                supply the URL:
-	            -Doracle.maven.repo=http://my.local.repo
-                2) have a copy of the Oracle driver and run the following
-                command:
-                    mvn install:install-file -Dfile=${path to ojdbc.jar} \
-                                             -DgroupId=com.oracle \
-                                             -DartifactId=jdbc-driver \
-                                             -Dversion=10g \
-                                             -Dpackaging=jar
-
-                You must also set the following properties:
-                    -Dopenjpa.oracle.url
-                    -Dopenjpa.oracle.username
-                    -Dopenjpa.oracle.password
-
-                Optionally, you can override the default Oracle groupId and
-                version by also supplying the following properties:
-                    -Doracle.groupid=com.oracle
-                    -Doracle.version=10g
-            -->
-            <id>test-oracle</id>
-            <activation>
-                <property>
-                    <name>test-oracle</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${oracle.groupid}</groupId>
-                    <artifactId>${oracle.artifactid}</artifactId>
-                    <version>${oracle.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <oracle.maven.repo>http://not.a.real.repository</oracle.maven.repo>
-                <oracle.groupid>com.oracle</oracle.groupid>
-                <oracle.artifactid>jdbc-driver</oracle.artifactid>
-                <oracle.version>11.2.0.1-jdbc6</oracle.version>
-                <connection.driver.name>oracle.jdbc.driver.OracleDriver</connection.driver.name>
-                <!--<connection.url>jdbc:oracle:thin:@localhost:1521:OPENJPA</connection.url>-->
-                <connection.url>${openjpa.oracle.url}</connection.url>
-                <connection.username>${openjpa.oracle.username}</connection.username>
-                <connection.password>${openjpa.oracle.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>oracle.repository</id>
-                    <name>Oracle Repository</name>
-                    <url>${oracle.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing IBM SolidDB -->
-        <profile>
-            <id>test-soliddb</id>
-            <activation>
-                <property>
-                    <name>test-soliddb</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${soliddb.groupid}</groupId>
-                    <artifactId>${soliddb.driver.artifactid}</artifactId>
-                    <version>${soliddb.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <soliddb.maven.repo>http://not.a.real.repository</soliddb.maven.repo>
-                <soliddb.groupid>com.ibm.soliddb</soliddb.groupid>
-                <soliddb.driver.artifactid>soliddb</soliddb.driver.artifactid>
-                <soliddb.version>6.5</soliddb.version>
-                <connection.driver.name>solid.jdbc.SolidDriver</connection.driver.name>
-                <!--<connection.url>jdbc:solid://localhost:2315</connection.url>-->
-                <connection.url>${openjpa.soliddb.url}</connection.url>
-                <connection.username>${openjpa.soliddb.username}</connection.username>
-                <connection.password>${openjpa.soliddb.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>soliddb.repository</id>
-                    <name>SolidDB Repository</name>
-                    <url>${soliddb.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
 
     </profiles>
 
diff --git a/openjpa-persistence-locking/pom.xml b/openjpa-persistence-locking/pom.xml
index 731aecf86..0804a33a5 100644
--- a/openjpa-persistence-locking/pom.xml
+++ b/openjpa-persistence-locking/pom.xml
@@ -74,726 +74,6 @@
         </profile>
 
 
-        <!-- Profile for testing with MariaDB DB -->
-        <profile>
-            <id>test-mariadb</id>
-            <activation>
-                <property>
-                    <name>test-mariadb</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>mariadb</groupId>
-                    <artifactId>mariadb-connector-java</artifactId>
-                    <version>${mariadb.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>org.mariadb.jdbc.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.mariadb.url}</connection.url>
-                <connection.username>${openjpa.mariadb.username}</connection.username>
-                <connection.password>${openjpa.mariadb.password}</connection.password>
-                <jdbc.DBDictionary />
-                <!-- DBCP overrides for MariaDB testing -->
-                <dbcp.maxIdle>0</dbcp.maxIdle>
-                <dbcp.minIdle>0</dbcp.minIdle>
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with PostgreSQL DB -->
-        <profile>
-            <id>test-postgresql</id>
-            <activation>
-                <property>
-                    <name>test-postgresql</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>postgresql</groupId>
-                    <artifactId>postgresql</artifactId>
-                    <version>${postgresql.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>org.postgresql.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:postgresql://localhost/openjpa</connection.url>-->
-                <connection.url>${openjpa.postgresql.url}</connection.url>
-                <connection.username>${openjpa.postgresql.username}</connection.username>
-                <connection.password>${openjpa.postgresql.password}</connection.password>
-                <jdbc.DBDictionary />
-                <!-- DBCP overrides -->
-                <dbcp.maxIdle>0</dbcp.maxIdle>
-                <dbcp.minIdle>0</dbcp.minIdle>
-                <dbcp.maxActive>20</dbcp.maxActive>
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with SQLServer DB using MS JDBC driver -->
-        <profile>
-            <!--
-                Example MS SQL profile. You can use this profile if you:
-                1) have the MS SQL artifacts installed in a local repo and
-                supply the URL:
-                    -Dmssql.maven.repo=http://my.local.repo
-                2) have a copy of the MS SQL JDBC driver from:
-                    http://msdn.microsoft.com/en-us/data/aa937724.aspx
-                and run the following commands :
-                    mvn install:install-file -Dfile=${path to sqljdbc.jar} \
-                                             -DgroupId=com.microsoft.sqlserver \
-                                             -DartifactId=sqljdbc \
-                                             -Dversion=2.0 \
-                                             -Dpackaging=jar
-
-                You must also set the following properties:
-                    -Dopenjpa.mssql.url=jdbc:sqlserver://<HOST>:<PORT>;\
-                    	DataBaseName=<DBNAME>
-                    -Dopenjpa.mssql.username=<mssql_uid>
-                    -Dopenjpa.mssql.password=<mssql_pwd>
-
-                Optionally, you can override the default groupId and version
-                by also supplying the following properties:
-                    -Dmssql.groupid=com.microsoft.sqlserver
-                    -Dmssql.version=2.0
-                If you are using Java SE 6 or later, you will need to use:
-                    -Dmssql.artifactid=sqljdbc4
-            -->
-            <id>test-mssql</id>
-            <activation>
-                <property>
-                    <name>test-mssql</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${mssql.groupid}</groupId>
-                    <artifactId>${mssql.artifactid}</artifactId>
-                    <version>${mssql.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <mssql.maven.repo>http://not.real.repository</mssql.maven.repo>
-                <mssql.groupid>com.microsoft.sqlserver</mssql.groupid>
-                <mssql.artifactid>sqljdbc</mssql.artifactid>
-                <mssql.version>2.0</mssql.version>
-                <connection.driver.name>com.microsoft.sqlserver.jdbc.SQLServerDriver</connection.driver.name>
-                <!--<connection.url>jdbc:sqlserver://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.mssql.url}</connection.url>
-                <connection.username>${openjpa.mssql.username}</connection.username>
-                <connection.password>${openjpa.mssql.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>mssql.repository</id>
-                    <name>MSSQL Repository</name>
-                    <url>${mssql.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing with SQLServer DB using the jTDS driver -->
-        <profile>
-            <id>test-sqlserver</id>
-            <activation>
-                <property>
-                    <name>test-sqlserver</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>net.sourceforge.jtds</groupId>
-                    <artifactId>jtds</artifactId>
-                    <version>${jtds.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <jtds.version>1.2</jtds.version>
-                <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:jtds:sqlserver://localhost:1433/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.sqlserver.url}</connection.url>
-                <connection.username>${openjpa.sqlserver.username}</connection.username>
-                <connection.password>${openjpa.sqlserver.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with Sybase DB using the jTDS driver -->
-        <profile>
-            <id>test-sybase</id>
-            <activation>
-                <property>
-                    <name>test-sybase</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>net.sourceforge.jtds</groupId>
-                    <artifactId>jtds</artifactId>
-                    <version>${jtds.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <jtds.version>1.2</jtds.version>
-                <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
-                <!--<connection.url>jdbc:jtds:sybase://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.sybase.url}</connection.url>
-                <connection.username>${openjpa.sybase.username}</connection.username>
-                <connection.password>${openjpa.sybase.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with Sybase DB using the jConnect driver -->
-        <profile>
-            <id>test-sybase-jconnect</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${jconnect.groupId}</groupId>
-                    <artifactId>${jconnect.artifactId}</artifactId>
-                    <version>${jconnect.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>com.sybase.jdbc3.jdbc.SybDriver</connection.driver.name>
-                <!--<connection.url>jdbc:sybase:Tds:localhost:7100/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.sybase.url}</connection.url>
-                <connection.username>${openjpa.sybase.username}</connection.username>
-                <connection.password>${openjpa.sybase.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with Ingres DB -->
-        <profile>
-            <id>test-ingres</id>
-            <activation>
-                <property>
-                    <name>test-ingres</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.ingres.jdbc</groupId>
-                    <artifactId>iijdbc</artifactId>
-                    <version>${ingres.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <ingres.version>9.2-3.4.8</ingres.version>
-                <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name>
-                <!--<connection.url>jdbc:ingres://localhost/OPENJPA</connection.url>-->
-                <connection.url>${openjpa.ingres.url}</connection.url>
-                <connection.username>${openjpa.ingres.username}</connection.username>
-                <connection.password>${openjpa.ingres.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!-- Profile for testing with a custom DB using a system jar -->
-        <!--
-            For example, to test with Oracle, you might run:
-        mvn test -Dtest=TestPersistence -Ptest-custom \
-          -Dopenjpa.custom.driverjar=$(pwd)/drivers/jdbc-oracle-10_2_0_1_0.jar \
-          -Dopenjpa.custom.driverclass=oracle.jdbc.driver.OracleDriver \
-          -Dopenjpa.custom.url=jdbc:oracle:thin:@HOST:PORT:DBNAME \
-          -Dopenjpa.custom.username=USERNAME \
-          -Dopenjpa.custom.password=PASSWORD
-        -->
-        <profile>
-            <id>test-custom</id>
-            <activation>
-                <property>
-                    <name>test-custom</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>openjpa.customdriver</groupId>
-                    <artifactId>openjpa.customdriver</artifactId>
-                    <version>1.0</version>
-                    <scope>system</scope>
-                    <systemPath>${openjpa.custom.driverjar}</systemPath>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>${openjpa.custom.driverclass}</connection.driver.name>
-                <connection.url>${openjpa.custom.url}</connection.url>
-                <connection.username>${openjpa.custom.username}</connection.username>
-                <connection.password>${openjpa.custom.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-
-        <!-- Profile for testing with a custom DB using two system jars.
-             Some databases (DB2) use more than one jar for their JDBC provider.
-             Functionally this is identical to the previous profile, with a
-             second system dependency added.
-        -->
-        <!--
-            For example, to test with DB2, you might run:
-            mvn test -Dtest=TestPersistence -Ptest-custom2 \
-            -Dopenjpa.custom.driverjar1=$(pwd)/drivers/db2jcc.jar \
-            -Dopenjpa.custom.driverjar2=$(pwd)/drviers/db2jcc_license_cu.jar \
-            -Dopenjpa.custom.driverclass=com.ibm.db2.jcc.DB2Driver \
-            -Dopenjpa.custom.url=jdbc:db2://HOST:PORT/DBNAME \
-            -Dopenjpa.custom.username=USERNAME \
-            -Dopenjpa.custom.password=PASSWORD
-        -->
-        <profile>
-            <id>test-custom2</id>
-            <activation>
-                <property>
-                    <name>test-custom2</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>openjpa.customdriver1</groupId>
-                    <artifactId>openjpa.customdriver1</artifactId>
-                    <version>1.0</version>
-                    <scope>system</scope>
-                    <systemPath>${openjpa.custom.driverjar1}</systemPath>
-                </dependency>
-                <dependency>
-                    <groupId>openjpa.customdriver2</groupId>
-                    <artifactId>openjpa.customdriver2</artifactId>
-                    <version>1.0</version>
-                    <scope>system</scope>
-                    <systemPath>${openjpa.custom.driverjar2}</systemPath>
-                </dependency>
-            </dependencies>
-            <properties>
-                <connection.driver.name>${openjpa.custom.driverclass}</connection.driver.name>
-                <connection.url>${openjpa.custom.url}</connection.url>
-                <connection.username>${openjpa.custom.username}</connection.username>
-                <connection.password>${openjpa.custom.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-        </profile>
-
-        <!--
-            The test-custom2 profile does not work very well when used with a
-            continuous build system. As a convenience I've added profiles for
-            some of the proprietary databases to make testing easier.
-        -->
-        <profile>
-            <!--
-                Example db2 profile. You can use this profile if you:
-                1) have the DB2 artifacts installed in a local repo and supply
-                the URL:
-	            -Ddb2.maven.repo=http://my.local.repo
-                2) have a copy of the DB2 JCC driver and run the following
-                commands :
-                    mvn install:install-file -Dfile=${path to db2jcc.jar} \
-                                             -DgroupId=com.ibm.db2 \
-                                             -DartifactId=jcc-driver \
-                                             -Dversion=9.5 \
-                                             -Dpackaging=jar
-
-                    mvn install:install-file -Dfile=${path to db2jcc_license.jar} \
-                                             -DgroupId=com.ibm.db2 \
-                                             -DartifactId=jcc-license \
-                                             -Dversion=9.5 \
-                                             -Dpackaging=jar
-
-                You must also set the following properties:
-                    -Dopenjpa.db2.url=jdbc:db2://<HOST>:<PORT>/<DBNAME>
-                    -Dopenjpa.db2.username=<db2_uid>
-                    -Dopenjpa.db2.password=<db2_pwd>
-
-                Optionally, you can override the default DB2 groupId,
-                artifactIds and version by also supplying the following
-                properties:
-                    -Ddb2.groupid=com.ibm.db2
-                    -Dids.driver.artifactid=jcc-driver
-                    -Dids.license.artifactid=jcc-license
-                    -Ddb2.version=9.5
-            -->
-            <id>test-db2-jcc</id>
-            <activation>
-                <property>
-                    <name>test-db2-jcc</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${db2.groupid}</groupId>
-                    <artifactId>${db2.driver.artifactid}</artifactId>
-                    <version>${db2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${db2.groupid}</groupId>
-                    <artifactId>${db2.license.artifactid}</artifactId>
-                    <version>${db2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
-                <db2.groupid>com.ibm.db2</db2.groupid>
-                <db2.driver.artifactid>jcc-driver</db2.driver.artifactid>
-                <db2.license.artifactid>jcc-license</db2.license.artifactid>
-                <db2.version>9.5</db2.version>
-                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
-                <!--<connection.url>jdbc:db2://localhost/openjpa</connection.url>-->
-                <connection.url>${openjpa.db2.url}</connection.url>
-                <connection.username>${openjpa.db2.username}</connection.username>
-                <connection.password>${openjpa.db2.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>db2.repository</id>
-                    <name>DB2 Repository</name>
-                    <url>${db2.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing Apache Derby with the DB2 JCC driver -->
-        <profile>
-            <id>test-derbyjcc</id>
-            <activation>
-                <property>
-                    <name>test-derbyjcc</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${db2.groupid}</groupId>
-                    <artifactId>${db2.driver.artifactid}</artifactId>
-                    <version>${db2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${db2.groupid}</groupId>
-                    <artifactId>${db2.license.artifactid}</artifactId>
-                    <version>${db2.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
-                <db2.groupid>com.ibm.db2</db2.groupid>
-                <db2.driver.artifactid>jcc-driver</db2.driver.artifactid>
-                <db2.license.artifactid>jcc-license</db2.license.artifactid>
-                <db2.version>9.5</db2.version>
-                <!--
-                    Note: DB must be created before using this profile,
-                    which can be done by running:
-                        mvn test -Dtest=<testcase> -Ptest-derbynet
-                -->
-                <openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url>
-                <!-- Note: commons-dbcp2 requires dummy values for uid/pwd -->
-                <openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username>
-                <openjpa.derbyjcc.password>pwd</openjpa.derbyjcc.password>
-                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
-                <connection.url>${openjpa.derbyjcc.url}</connection.url>
-                <connection.username>${openjpa.derbyjcc.username}</connection.username>
-                <connection.password>${openjpa.derbyjcc.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>db2.repository</id>
-                    <name>DB2 Repository</name>
-                    <url>${db2.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing Informix with the DB2 JCC driver -->
-        <profile>
-            <!--
-                Example Informix JCC profile. You can use this profile if you:
-                1a) have the DB2 JCC artifacts installed in a local repo and
-                supply the URL:
-	            -Dids.maven.repo=http://my.local.repo
-                1b) or have a copy of the DB2 JCC driver and run the commands
-                listed above in the test-db2-jcc profile.
-		2) have the DRDA service enabled on the IDS server, which
-                is usually port 9089
-
-                You must also set the following properties:
-                    -Dopenjpa.ids.url=jdbc:ids://<HOST>:<PORT>/<DBNAME>
-                    -Dopenjpa.ids.username=<ids_uid>
-                    -Dopenjpa.ids.password=<ids_pwd>
-
-                Optionally, you can override the default DB2 JCC groupId,
-                artifactIds and version by also supplying the following
-                properties:
-                    -Dids.groupid=com.ibm.db2
-                    -Dids.driver.artifactid=jcc-driver
-                    -Dids.license.artifactid=jcc-license
-                    -Dids.version=9.5
-            -->
-            <id>test-ids-jcc</id>
-            <activation>
-                <property>
-                    <name>test-ids-jcc</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${ids.groupid}</groupId>
-                    <artifactId>${ids.driver.artifactid}</artifactId>
-                    <version>${ids.version}</version>
-                    <scope>test</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${ids.groupid}</groupId>
-                    <artifactId>${ids.license.artifactid}</artifactId>
-                    <version>${ids.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <ids.maven.repo>http://not.a.real.repository</ids.maven.repo>
-                <ids.groupid>com.ibm.db2</ids.groupid>
-                <ids.driver.artifactid>jcc-driver</ids.driver.artifactid>
-                <ids.license.artifactid>jcc-license</ids.license.artifactid>
-                <ids.version>9.5</ids.version>
-                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
-                <connection.url>${openjpa.ids.url}</connection.url>
-                <connection.username>${openjpa.ids.username}</connection.username>
-                <connection.password>${openjpa.ids.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>ids.repository</id>
-                    <name>Informix Repository</name>
-                    <url>${ids.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing Informix with the Informix JDBC Driver -->
-        <profile>
-            <!--
-                Example Informix profile. You can use this profile if you:
-                1) have the Informix JDBC artifacts installed in a local repo and
-                supply the URL:
-                  -Dids.maven.repo=http://my.local.repo
-                2) have a copy of the Informix driver and run the following
-                commands :
-                    mvn install:install-file -Dfile=${path to ifxjdbc.jar} \
-                                             -DgroupId=com.informix \
-                                             -DartifactId=informix-driver \
-                                             -Dversion=3.70 \
-                                             -Dpackaging=jar
-
-                You must also set the following properties:
-                    -Dopenjpa.ids.url=jdbc:informix-sqli://<HOST>:<PORT>:informixserver=<INFORMIXSERVER>;database=<DBNAME>
-                    -Dopenjpa.ids.username=<ids_uid>
-                    -Dopenjpa.ids.password=<ids_pwd>
-
-                Optionally, you can override the default Informix groupId,
-                artifactIds and version by also supplying the following
-                properties:
-                    -Dids.groupid=com.informix
-                    -Dids.driver.artifactid=informix-driver
-                    -Dids.version=3.70
-            -->
-            <id>test-ids-informix</id>
-            <activation>
-                <property>
-                    <name>test-ids-informix</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${ids.groupid}</groupId>
-                    <artifactId>${ids.driver.artifactid}</artifactId>
-                    <version>${ids.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <ids.maven.repo>http://not.a.real.repository</ids.maven.repo>
-                <ids.groupid>com.informix</ids.groupid>
-                <ids.driver.artifactid>informix-driver</ids.driver.artifactid>
-                <ids.version>3.70</ids.version>
-                <connection.driver.name>com.informix.jdbc.IfxDriver</connection.driver.name>
-                <connection.url>${openjpa.ids.url}</connection.url>
-                <connection.username>${openjpa.ids.username}</connection.username>
-                <connection.password>${openjpa.ids.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>ids.repository</id>
-                    <name>Informix Repository</name>
-                    <url>${ids.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing with Oracle DB -->
-        <profile>
-            <!--
-                Example oracle profile. You can use this profile if you:
-                1) have the Oracle artifacts installed in a local repo and
-                supply the URL:
-	            -Doracle.maven.repo=http://my.local.repo
-                2) have a copy of the Oracle driver and run the following
-                command:
-                    mvn install:install-file -Dfile=${path to ojdbc.jar} \
-                                             -DgroupId=com.oracle \
-                                             -DartifactId=jdbc-driver \
-                                             -Dversion=10g \
-                                             -Dpackaging=jar
-
-                You must also set the following properties:
-                    -Dopenjpa.oracle.url
-                    -Dopenjpa.oracle.username
-                    -Dopenjpa.oracle.password
-
-                Optionally, you can override the default Oracle groupId and
-                version by also supplying the following properties:
-                    -Doracle.groupid=com.oracle
-                    -Doracle.version=10g
-            -->
-            <id>test-oracle</id>
-            <activation>
-                <property>
-                    <name>test-oracle</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${oracle.groupid}</groupId>
-                    <artifactId>${oracle.artifactid}</artifactId>
-                    <version>${oracle.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <oracle.maven.repo>http://not.a.real.repository</oracle.maven.repo>
-                <oracle.groupid>com.oracle</oracle.groupid>
-                <oracle.artifactid>jdbc-driver</oracle.artifactid>
-                <oracle.version>11.2.0.1-jdbc6</oracle.version>
-                <connection.driver.name>oracle.jdbc.driver.OracleDriver</connection.driver.name>
-                <!--<connection.url>jdbc:oracle:thin:@localhost:1521:OPENJPA</connection.url>-->
-                <connection.url>${openjpa.oracle.url}</connection.url>
-                <connection.username>${openjpa.oracle.username}</connection.username>
-                <connection.password>${openjpa.oracle.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>oracle.repository</id>
-                    <name>Oracle Repository</name>
-                    <url>${oracle.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
-        <!-- Profile for testing IBM SolidDB -->
-        <profile>
-            <id>test-soliddb</id>
-            <activation>
-                <property>
-                    <name>test-soliddb</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${soliddb.groupid}</groupId>
-                    <artifactId>${soliddb.driver.artifactid}</artifactId>
-                    <version>${soliddb.version}</version>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-            <properties>
-                <soliddb.maven.repo>http://not.a.real.repository</soliddb.maven.repo>
-                <soliddb.groupid>com.ibm.soliddb</soliddb.groupid>
-                <soliddb.driver.artifactid>soliddb</soliddb.driver.artifactid>
-                <soliddb.version>6.5</soliddb.version>
-                <connection.driver.name>solid.jdbc.SolidDriver</connection.driver.name>
-                <!--<connection.url>jdbc:solid://localhost:2315</connection.url>-->
-                <connection.url>${openjpa.soliddb.url}</connection.url>
-                <connection.username>${openjpa.soliddb.username}</connection.username>
-                <connection.password>${openjpa.soliddb.password}</connection.password>
-                <jdbc.DBDictionary />
-            </properties>
-            <repositories>
-                <repository>
-                    <id>soliddb.repository</id>
-                    <name>SolidDB Repository</name>
-                    <url>${soliddb.maven.repo}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-
     </profiles>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index cc8f7985c..79916d74f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -386,6 +386,10 @@
             </build>
         </profile>
 
+        <!-- =================== -->
+        <!--  Database Profiles  -->
+        <!-- =================== -->
+
         <!-- Default profile for testing with an embedded Apache Derby DB -->
         <profile>
             <!--
@@ -489,6 +493,845 @@
                 <jdbc.DBDictionary />
             </properties>
         </profile>
+
+        <!-- Profile for testing with HSQL DB -->
+        <profile>
+            <id>test-hsqldb</id>
+            <activation>
+                <property>
+                    <name>test-hsqldb</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.hsqldb</groupId>
+                    <artifactId>hsqldb</artifactId>
+                    <version>${hsqldb.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>org.hsqldb.jdbcDriver</connection.driver.name>
+                <!--<connection.url>jdbc:hsqldb:target/database/openjpa-hsqldb-database;create=true</connection.url>-->
+                <connection.url>jdbc:hsqldb:mem:openjpa20-hsqldb-database</connection.url>
+                <connection.username>sa</connection.username>
+                <connection.password />
+                <jdbc.DBDictionary />
+            </properties>
+        </profile>
+
+        <!-- Profile for testing with MySQL DB -->
+        <profile>
+            <id>test-mysql</id>
+            <activation>
+                <property>
+                    <name>test-mysql</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                    <version>${mysql.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
+                <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>-->
+                <connection.url>${openjpa.mysql.url}</connection.url>
+                <connection.username>${openjpa.mysql.username}</connection.username>
+                <connection.password>${openjpa.mysql.password}</connection.password>
+                <jdbc.DBDictionary />
+                <!-- DBCP overrides for MySQL testing -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
+            </properties>
+        </profile>
+
+        <!-- Profile for testing with MySQL DB -->
+        <profile>
+            <id>test-mysql-docker</id>
+            <activation>
+                <property>
+                    <name>test-mysql-docker</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                    <version>${mysql.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name>
+
+                <!-- default settings for local docker -->
+                <docker.external.mysql.port>3306</docker.external.mysql.port>
+                <openjpa.mysql.dbname>openjpatst</openjpa.mysql.dbname>
+                <openjpa.mysql.url>jdbc:mysql://localhost:${docker.external.mysql.port}/${openjpa.mysql.dbname}</openjpa.mysql.url>
+                <openjpa.mysql.username>openjpatst</openjpa.mysql.username>
+                <openjpa.mysql.password>openjpatst</openjpa.mysql.password>
+
+                <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>-->
+                <connection.url>${openjpa.mysql.url}</connection.url>
+                <connection.username>${openjpa.mysql.username}</connection.username>
+                <connection.password>${openjpa.mysql.password}</connection.password>
+                <jdbc.DBDictionary />
+
+                <!-- DBCP overrides for MySQL testing -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
+            </properties>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>mysql/mysql-server:5.7</name>
+                                    <run>
+                                        <env>
+                                            <MYSQL_DATABASE>${openjpa.mysql.dbname}</MYSQL_DATABASE>
+                                            <MYSQL_USER>${connection.username}</MYSQL_USER>
+                                            <MYSQL_PASSWORD>${connection.password}</MYSQL_PASSWORD>
+                                        </env>
+                                        <ports>
+                                            <port>${docker.external.mysql.port}:3306</port>
+                                        </ports>
+                                    </run>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Profile for testing with MariaDB DB -->
+        <profile>
+            <id>test-mariadb</id>
+            <activation>
+                <property>
+                    <name>test-mariadb</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>mariadb</groupId>
+                    <artifactId>mariadb-connector-java</artifactId>
+                    <version>${mariadb.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>org.mariadb.jdbc.Driver</connection.driver.name>
+                <!--<connection.url>jdbc:mysql://localhost/OPENJPA</connection.url>-->
+                <connection.url>${openjpa.mariadb.url}</connection.url>
+                <connection.username>${openjpa.mariadb.username}</connection.username>
+                <connection.password>${openjpa.mariadb.password}</connection.password>
+                <jdbc.DBDictionary />
+                <!-- DBCP overrides for MariaDB testing -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
+            </properties>
+        </profile>
+
+        <!-- Profile for testing with PostgreSQL DB -->
+        <profile>
+            <id>test-postgresql</id>
+            <activation>
+                <property>
+                    <name>test-postgresql</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>postgresql</groupId>
+                    <artifactId>postgresql</artifactId>
+                    <version>${postgresql.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>org.postgresql.Driver</connection.driver.name>
+                <!--<connection.url>jdbc:postgresql://localhost/openjpa</connection.url>-->
+                <connection.url>${openjpa.postgresql.url}</connection.url>
+                <connection.username>${openjpa.postgresql.username}</connection.username>
+                <connection.password>${openjpa.postgresql.password}</connection.password>
+                <jdbc.DBDictionary />
+                <!-- DBCP overrides -->
+                <dbcp.maxIdle>0</dbcp.maxIdle>
+                <dbcp.minIdle>0</dbcp.minIdle>
+                <dbcp.maxActive>20</dbcp.maxActive>
+            </properties>
+        </profile>
+
+        <!-- Profile for testing with SQLServer DB using MS JDBC driver -->
+        <profile>
+            <!--
+                Example MS SQL profile. You can use this profile if you:
+                1) have the MS SQL artifacts installed in a local repo and
+                supply the URL:
+                    -Dmssql.maven.repo=http://my.local.repo
+                2) have a copy of the MS SQL JDBC driver from:
+                    http://msdn.microsoft.com/en-us/data/aa937724.aspx
+                and run the following commands :
+                    mvn install:install-file -Dfile=${path to sqljdbc.jar} \
+                                             -DgroupId=com.microsoft.sqlserver \
+                                             -DartifactId=sqljdbc \
+                                             -Dversion=2.0 \
+                                             -Dpackaging=jar
+
+                You must also set the following properties:
+                    -Dopenjpa.mssql.url=jdbc:sqlserver://<HOST>:<PORT>;\
+                    	DataBaseName=<DBNAME>
+                    -Dopenjpa.mssql.username=<mssql_uid>
+                    -Dopenjpa.mssql.password=<mssql_pwd>
+
+                Optionally, you can override the default groupId and version
+                by also supplying the following properties:
+                    -Dmssql.groupid=com.microsoft.sqlserver
+                    -Dmssql.version=2.0
+                If you are using Java SE 6 or later, you will need to use:
+                    -Dmssql.artifactid=sqljdbc4
+            -->
+            <id>test-mssql</id>
+            <activation>
+                <property>
+                    <name>test-mssql</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${mssql.groupid}</groupId>
+                    <artifactId>${mssql.artifactid}</artifactId>
+                    <version>${mssql.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <mssql.maven.repo>http://not.real.repository</mssql.maven.repo>
+                <mssql.groupid>com.microsoft.sqlserver</mssql.groupid>
+                <mssql.artifactid>sqljdbc</mssql.artifactid>
+                <mssql.version>2.0</mssql.version>
+                <connection.driver.name>com.microsoft.sqlserver.jdbc.SQLServerDriver</connection.driver.name>
+                <!--<connection.url>jdbc:sqlserver://localhost/OPENJPA</connection.url>-->
+                <connection.url>${openjpa.mssql.url}</connection.url>
+                <connection.username>${openjpa.mssql.username}</connection.username>
+                <connection.password>${openjpa.mssql.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+            <repositories>
+                <repository>
+                    <id>mssql.repository</id>
+                    <name>MSSQL Repository</name>
+                    <url>${mssql.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+
+        <!-- Profile for testing with SQLServer DB using the jTDS driver -->
+        <profile>
+            <id>test-sqlserver</id>
+            <activation>
+                <property>
+                    <name>test-sqlserver</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>net.sourceforge.jtds</groupId>
+                    <artifactId>jtds</artifactId>
+                    <version>${jtds.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <jtds.version>1.2</jtds.version>
+                <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
+                <!--<connection.url>jdbc:jtds:sqlserver://localhost:1433/OPENJPA</connection.url>-->
+                <connection.url>${openjpa.sqlserver.url}</connection.url>
+                <connection.username>${openjpa.sqlserver.username}</connection.username>
+                <connection.password>${openjpa.sqlserver.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+        </profile>
+
+        <!-- Profile for testing with Sybase DB using the jTDS driver -->
+        <profile>
+            <id>test-sybase</id>
+            <activation>
+                <property>
+                    <name>test-sybase</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>net.sourceforge.jtds</groupId>
+                    <artifactId>jtds</artifactId>
+                    <version>${jtds.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <jtds.version>1.2</jtds.version>
+                <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name>
+                <!--<connection.url>jdbc:jtds:sybase://localhost/OPENJPA</connection.url>-->
+                <connection.url>${openjpa.sybase.url}</connection.url>
+                <connection.username>${openjpa.sybase.username}</connection.username>
+                <connection.password>${openjpa.sybase.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+        </profile>
+
+        <!-- Profile for testing with Sybase DB using the jConnect driver -->
+        <profile>
+            <id>test-sybase-jconnect</id>
+            <dependencies>
+                <dependency>
+                    <groupId>${jconnect.groupId}</groupId>
+                    <artifactId>${jconnect.artifactId}</artifactId>
+                    <version>${jconnect.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>com.sybase.jdbc3.jdbc.SybDriver</connection.driver.name>
+                <!--<connection.url>jdbc:sybase:Tds:localhost:7100/OPENJPA</connection.url>-->
+                <connection.url>${openjpa.sybase.url}</connection.url>
+                <connection.username>${openjpa.sybase.username}</connection.username>
+                <connection.password>${openjpa.sybase.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+        </profile>
+
+        <!-- Profile for testing with Ingres DB -->
+        <profile>
+            <id>test-ingres</id>
+            <activation>
+                <property>
+                    <name>test-ingres</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.ingres.jdbc</groupId>
+                    <artifactId>iijdbc</artifactId>
+                    <version>${ingres.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <ingres.version>9.2-3.4.8</ingres.version>
+                <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name>
+                <!--<connection.url>jdbc:ingres://localhost/OPENJPA</connection.url>-->
+                <connection.url>${openjpa.ingres.url}</connection.url>
+                <connection.username>${openjpa.ingres.username}</connection.username>
+                <connection.password>${openjpa.ingres.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+        </profile>
+
+        <!-- Profile for testing with a custom DB using a system jar -->
+        <!--
+            For example, to test with Oracle, you might run:
+        mvn test -Dtest=TestPersistence -Ptest-custom \
+          -Dopenjpa.custom.driverjar=$(pwd)/drivers/jdbc-oracle-10_2_0_1_0.jar \
+          -Dopenjpa.custom.driverclass=oracle.jdbc.driver.OracleDriver \
+          -Dopenjpa.custom.url=jdbc:oracle:thin:@HOST:PORT:DBNAME \
+          -Dopenjpa.custom.username=USERNAME \
+          -Dopenjpa.custom.password=PASSWORD
+        -->
+        <profile>
+            <id>test-custom</id>
+            <activation>
+                <property>
+                    <name>test-custom</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>openjpa.customdriver</groupId>
+                    <artifactId>openjpa.customdriver</artifactId>
+                    <version>1.0</version>
+                    <scope>system</scope>
+                    <systemPath>${openjpa.custom.driverjar}</systemPath>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>${openjpa.custom.driverclass}</connection.driver.name>
+                <connection.url>${openjpa.custom.url}</connection.url>
+                <connection.username>${openjpa.custom.username}</connection.username>
+                <connection.password>${openjpa.custom.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+        </profile>
+
+
+        <!-- Profile for testing with a custom DB using two system jars.
+             Some databases (DB2) use more than one jar for their JDBC provider.
+             Functionally this is identical to the previous profile, with a
+             second system dependency added.
+          -->
+        <!--
+            For example, to test with DB2, you might run:
+        mvn test -Dtest=TestPersistence -Ptest-custom2 \
+          -Dopenjpa.custom.driverjar1=$(pwd)/drivers/db2jcc.jar \
+          -Dopenjpa.custom.driverjar2=$(pwd)/drviers/db2jcc_license_cu.jar \
+          -Dopenjpa.custom.driverclass=com.ibm.db2.jcc.DB2Driver \
+          -Dopenjpa.custom.url=jdbc:db2://HOST:PORT/DBNAME \
+          -Dopenjpa.custom.username=USERNAME \
+          -Dopenjpa.custom.password=PASSWORD
+        -->
+        <profile>
+            <id>test-custom2</id>
+            <activation>
+                <property>
+                    <name>test-custom2</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>openjpa.customdriver1</groupId>
+                    <artifactId>openjpa.customdriver1</artifactId>
+                    <version>1.0</version>
+                    <scope>system</scope>
+                    <systemPath>${openjpa.custom.driverjar1}</systemPath>
+                </dependency>
+                <dependency>
+                    <groupId>openjpa.customdriver2</groupId>
+                    <artifactId>openjpa.customdriver2</artifactId>
+                    <version>1.0</version>
+                    <scope>system</scope>
+                    <systemPath>${openjpa.custom.driverjar2}</systemPath>
+                </dependency>
+            </dependencies>
+            <properties>
+                <connection.driver.name>${openjpa.custom.driverclass}</connection.driver.name>
+                <connection.url>${openjpa.custom.url}</connection.url>
+                <connection.username>${openjpa.custom.username}</connection.username>
+                <connection.password>${openjpa.custom.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+        </profile>
+
+        <!--
+            The test-custom2 profile does not work very well when used with a
+            continuous build system. As a convenience I've added profiles for
+            some of the proprietary databases to make testing easier.
+          -->
+        <profile>
+            <!--
+                Example db2 profile. You can use this profile if you:
+                1) have the DB2 artifacts installed in a local repo and supply
+                the URL:
+	            -Ddb2.maven.repo=http://my.local.repo
+                2) have a copy of the DB2 JCC driver and run the following
+                commands :
+                    mvn install:install-file -Dfile=${path to db2jcc.jar} \
+                                             -DgroupId=com.ibm.db2 \
+                                             -DartifactId=jcc-driver \
+                                             -Dversion=9.5 \
+                                             -Dpackaging=jar
+
+                    mvn install:install-file -Dfile=${path to db2jcc_license.jar} \
+                                             -DgroupId=com.ibm.db2 \
+                                             -DartifactId=jcc-license \
+                                             -Dversion=9.5 \
+                                             -Dpackaging=jar
+
+                You must also set the following properties:
+                    -Dopenjpa.db2.url=jdbc:db2://<HOST>:<PORT>/<DBNAME>
+                    -Dopenjpa.db2.username=<db2_uid>
+                    -Dopenjpa.db2.password=<db2_pwd>
+
+                Optionally, you can override the default DB2 groupId,
+                artifactIds and version by also supplying the following
+                properties:
+                    -Ddb2.groupid=com.ibm.db2
+                    -Dids.driver.artifactid=jcc-driver
+                    -Dids.license.artifactid=jcc-license
+                    -Ddb2.version=9.5
+            -->
+            <id>test-db2-jcc</id>
+            <activation>
+                <property>
+                    <name>test-db2-jcc</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${db2.groupid}</groupId>
+                    <artifactId>${db2.driver.artifactid}</artifactId>
+                    <version>${db2.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${db2.groupid}</groupId>
+                    <artifactId>${db2.license.artifactid}</artifactId>
+                    <version>${db2.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
+                <db2.groupid>com.ibm.db2</db2.groupid>
+                <db2.driver.artifactid>jcc-driver</db2.driver.artifactid>
+                <db2.license.artifactid>jcc-license</db2.license.artifactid>
+                <db2.version>9.5</db2.version>
+                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
+                <!--<connection.url>jdbc:db2://localhost/openjpa</connection.url>-->
+                <connection.url>${openjpa.db2.url}</connection.url>
+                <connection.username>${openjpa.db2.username}</connection.username>
+                <connection.password>${openjpa.db2.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+            <repositories>
+                <repository>
+                    <id>db2.repository</id>
+                    <name>DB2 Repository</name>
+                    <url>${db2.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+
+        <!-- Profile for testing Apache Derby with the DB2 JCC driver -->
+        <profile>
+            <id>test-derbyjcc</id>
+            <activation>
+                <property>
+                    <name>test-derbyjcc</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${db2.groupid}</groupId>
+                    <artifactId>${db2.driver.artifactid}</artifactId>
+                    <version>${db2.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${db2.groupid}</groupId>
+                    <artifactId>${db2.license.artifactid}</artifactId>
+                    <version>${db2.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <db2.maven.repo>http://not.a.real.repository</db2.maven.repo>
+                <db2.groupid>com.ibm.db2</db2.groupid>
+                <db2.driver.artifactid>jcc-driver</db2.driver.artifactid>
+                <db2.license.artifactid>jcc-license</db2.license.artifactid>
+                <db2.version>9.5</db2.version>
+                <!--
+                    Note: DB must be created before using this profile,
+                    which can be done by running:
+                        mvn test -Dtest=<testcase> -Ptest-derbynet
+                -->
+                <openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url>
+                <!-- Note: commons-dbcp2 requires dummy values for uid/pwd -->
+                <openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username>
+                <openjpa.derbyjcc.password>pwd</openjpa.derbyjcc.password>
+                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
+                <connection.url>${openjpa.derbyjcc.url}</connection.url>
+                <connection.username>${openjpa.derbyjcc.username}</connection.username>
+                <connection.password>${openjpa.derbyjcc.password}</connection.password>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>db2.repository</id>
+                    <name>DB2 Repository</name>
+                    <url>${db2.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+
+        <!-- Profile for testing Informix with the DB2 JCC driver -->
+        <profile>
+            <!--
+                Example Informix JCC profile. You can use this profile if you:
+                1a) have the DB2 JCC artifacts installed in a local repo and
+                supply the URL:
+	            -Dids.maven.repo=http://my.local.repo
+                1b) or have a copy of the DB2 JCC driver and run the commands
+                listed above in the test-db2-jcc profile.
+		2) have the DRDA service enabled on the IDS server, which
+                is usually port 9089
+
+                You must also set the following properties:
+                    -Dopenjpa.ids.url=jdbc:ids://<HOST>:<PORT>/<DBNAME>
+                    -Dopenjpa.ids.username=<ids_uid>
+                    -Dopenjpa.ids.password=<ids_pwd>
+
+                Optionally, you can override the default DB2 JCC groupId,
+                artifactIds and version by also supplying the following
+                properties:
+                    -Dids.groupid=com.ibm.db2
+                    -Dids.driver.artifactid=jcc-driver
+                    -Dids.license.artifactid=jcc-license
+                    -Dids.version=9.5
+            -->
+            <id>test-ids-jcc</id>
+            <activation>
+                <property>
+                    <name>test-ids-jcc</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${ids.groupid}</groupId>
+                    <artifactId>${ids.driver.artifactid}</artifactId>
+                    <version>${ids.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${ids.groupid}</groupId>
+                    <artifactId>${ids.license.artifactid}</artifactId>
+                    <version>${ids.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <ids.maven.repo>http://not.a.real.repository</ids.maven.repo>
+                <ids.groupid>com.ibm.db2</ids.groupid>
+                <ids.driver.artifactid>jcc-driver</ids.driver.artifactid>
+                <ids.license.artifactid>jcc-license</ids.license.artifactid>
+                <ids.version>9.5</ids.version>
+                <connection.driver.name>com.ibm.db2.jcc.DB2Driver</connection.driver.name>
+                <connection.url>${openjpa.ids.url}</connection.url>
+                <connection.username>${openjpa.ids.username}</connection.username>
+                <connection.password>${openjpa.ids.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+            <repositories>
+                <repository>
+                    <id>ids.repository</id>
+                    <name>Informix Repository</name>
+                    <url>${ids.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+
+        <!-- Profile for testing Informix with the Informix JDBC Driver -->
+        <profile>
+            <!--
+                Example Informix profile. You can use this profile if you:
+                1) have the Informix JDBC artifacts installed in a local repo and
+                supply the URL:
+                  -Dids.maven.repo=http://my.local.repo
+                2) have a copy of the Informix driver and run the following
+                commands :
+                    mvn install:install-file -Dfile=${path to ifxjdbc.jar} \
+                                             -DgroupId=com.informix \
+                                             -DartifactId=informix-driver \
+                                             -Dversion=3.70 \
+                                             -Dpackaging=jar
+
+                You must also set the following properties:
+                    -Dopenjpa.ids.url=jdbc:informix-sqli://<HOST>:<PORT>:informixserver=<INFORMIXSERVER>;database=<DBNAME>
+                    -Dopenjpa.ids.username=<ids_uid>
+                    -Dopenjpa.ids.password=<ids_pwd>
+
+                Optionally, you can override the default Informix groupId,
+                artifactIds and version by also supplying the following
+                properties:
+                    -Dids.groupid=com.informix
+                    -Dids.driver.artifactid=informix-driver
+                    -Dids.version=3.70
+            -->
+            <id>test-ids-informix</id>
+            <activation>
+                <property>
+                    <name>test-ids-informix</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${ids.groupid}</groupId>
+                    <artifactId>${ids.driver.artifactid}</artifactId>
+                    <version>${ids.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <ids.maven.repo>http://not.a.real.repository</ids.maven.repo>
+                <ids.groupid>com.informix</ids.groupid>
+                <ids.driver.artifactid>informix-driver</ids.driver.artifactid>
+                <ids.version>3.70</ids.version>
+                <connection.driver.name>com.informix.jdbc.IfxDriver</connection.driver.name>
+                <connection.url>${openjpa.ids.url}</connection.url>
+                <connection.username>${openjpa.ids.username}</connection.username>
+                <connection.password>${openjpa.ids.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+            <repositories>
+                <repository>
+                    <id>ids.repository</id>
+                    <name>Informix Repository</name>
+                    <url>${ids.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+
+        <!-- Profile for testing with Oracle DB -->
+        <profile>
+            <!--
+                Example oracle profile. You can use this profile if you:
+                1) have the Oracle artifacts installed in a local repo and
+                supply the URL:
+	            -Doracle.maven.repo=http://my.local.repo
+                2) have a copy of the Oracle driver and run the following
+                command:
+                    mvn install:install-file -Dfile=${path to ojdbc.jar} \
+                                             -DgroupId=com.oracle \
+                                             -DartifactId=jdbc-driver \
+                                             -Dversion=10g \
+                                             -Dpackaging=jar
+
+                You must also set the following properties:
+                    -Dopenjpa.oracle.url
+                    -Dopenjpa.oracle.username
+                    -Dopenjpa.oracle.password
+
+                Optionally, you can override the default Oracle groupId and
+                version by also supplying the following properties:
+                    -Doracle.groupid=com.oracle
+                    -Doracle.version=10g
+            -->
+            <id>test-oracle</id>
+            <activation>
+                <property>
+                    <name>test-oracle</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${oracle.groupid}</groupId>
+                    <artifactId>${oracle.artifactid}</artifactId>
+                    <version>${oracle.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <oracle.maven.repo>http://not.a.real.repository</oracle.maven.repo>
+                <oracle.groupid>com.oracle</oracle.groupid>
+                <oracle.artifactid>jdbc-driver</oracle.artifactid>
+                <oracle.version>11.2.0.1-jdbc6</oracle.version>
+                <connection.driver.name>oracle.jdbc.driver.OracleDriver</connection.driver.name>
+                <!--<connection.url>jdbc:oracle:thin:@localhost:1521:OPENJPA</connection.url>-->
+                <connection.url>${openjpa.oracle.url}</connection.url>
+                <connection.username>${openjpa.oracle.username}</connection.username>
+                <connection.password>${openjpa.oracle.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+            <repositories>
+                <repository>
+                    <id>oracle.repository</id>
+                    <name>Oracle Repository</name>
+                    <url>${oracle.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+
+        <!-- Profile for testing IBM SolidDB -->
+        <profile>
+            <id>test-soliddb</id>
+            <activation>
+                <property>
+                    <name>test-soliddb</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${soliddb.groupid}</groupId>
+                    <artifactId>${soliddb.driver.artifactid}</artifactId>
+                    <version>${soliddb.version}</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <properties>
+                <soliddb.maven.repo>http://not.a.real.repository</soliddb.maven.repo>
+                <soliddb.groupid>com.ibm.soliddb</soliddb.groupid>
+                <soliddb.driver.artifactid>soliddb</soliddb.driver.artifactid>
+                <soliddb.version>6.5</soliddb.version>
+                <connection.driver.name>solid.jdbc.SolidDriver</connection.driver.name>
+                <!--<connection.url>jdbc:solid://localhost:2315</connection.url>-->
+                <connection.url>${openjpa.soliddb.url}</connection.url>
+                <connection.username>${openjpa.soliddb.username}</connection.username>
+                <connection.password>${openjpa.soliddb.password}</connection.password>
+                <jdbc.DBDictionary />
+            </properties>
+            <repositories>
+                <repository>
+                    <id>soliddb.repository</id>
+                    <name>SolidDB Repository</name>
+                    <url>${soliddb.maven.repo}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+
     </profiles>
 
     <!-- default versions for dependencies that child modules may include -->