diff -Nru apache-openjpa-2.2.0-source/openjpa-persistence-jdbc/pom.xml apache-openjpa-2.2.0-source-gil/openjpa-persistence-jdbc/pom.xml --- apache-openjpa-2.2.0-source/openjpa-persistence-jdbc/pom.xml 2012-02-16 09:34:04.000000000 +0100 +++ apache-openjpa-2.2.0-source-gil/openjpa-persistence-jdbc/pom.xml 2012-06-24 13:54:07.862296097 +0200 @@ -91,7 +91,7 @@ </profile> <!-- Profile for testing with MySQL DB --> - <profile> + <!--profile> <id>test-mysql</id> <activation> <property> @@ -107,17 +107,17 @@ </dependency> </dependencies> <properties> - <connection.driver.name>com.mysql.jdbc.Driver</connection.driver.name> + <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.url>${openjpa.mysql.url}</connection.url> <connection.username>${openjpa.mysql.username}</connection.username> <connection.password>${openjpa.mysql.password}</connection.password> - <jdbc.DBDictionary /> + <jdbc.DBDictionary /--> <!-- DBCP overrides for MySQL testing --> - <dbcp.maxIdle>0</dbcp.maxIdle> + <!--dbcp.maxIdle>0</dbcp.maxIdle> <dbcp.minIdle>0</dbcp.minIdle> </properties> - </profile> + </profile--> <!-- Profile for testing with PostgreSQL DB --> <profile> @@ -150,7 +150,7 @@ </profile> <!-- Profile for testing with SQLServer DB using MS JDBC driver --> - <profile> + <!--profile--> <!-- Example MS SQL profile. You can use this profile if you: 1) have the MS SQL artifacts installed in a local repo and @@ -178,7 +178,7 @@ If you are using Java SE 6 or later, you will need to use: -Dmssql.artifactid=sqljdbc4 --> - <id>test-mssql</id> + <!--id>test-mssql</id> <activation> <property> <name>test-mssql</name> @@ -197,9 +197,9 @@ <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.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.url>${openjpa.mssql.url}</connection.url> <connection.username>${openjpa.mssql.username}</connection.username> <connection.password>${openjpa.mssql.password}</connection.password> <jdbc.DBDictionary /> @@ -219,10 +219,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing with SQLServer DB using the jTDS driver --> - <profile> + <!--profile> <id>test-sqlserver</id> <activation> <property> @@ -239,17 +239,17 @@ </dependencies> <properties> <jtds.version>1.2</jtds.version> - <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name> + <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.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--> <!-- Profile for testing with Sybase DB using the jTDS driver --> - <profile> + <!--profile> <id>test-sybase</id> <activation> <property> @@ -266,17 +266,17 @@ </dependencies> <properties> <jtds.version>1.2</jtds.version> - <connection.driver.name>net.sourceforge.jtds.jdbc.Driver</connection.driver.name> + <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.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--> <!-- Profile for testing with Sybase DB using the jConnect driver --> - <profile> + <!--profile> <id>test-sybase-jconnect</id> <dependencies> <dependency> @@ -287,17 +287,17 @@ </dependency> </dependencies> <properties> - <connection.driver.name>com.sybase.jdbc3.jdbc.SybDriver</connection.driver.name> + <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.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--> <!-- Profile for testing with Ingres DB --> - <profile> + <!--profile> <id>test-ingres</id> <activation> <property> @@ -314,14 +314,14 @@ </dependencies> <properties> <ingres.version>9.2-3.4.8</ingres.version> - <connection.driver.name>com.ingres.jdbc.IngresDriver</connection.driver.name> + <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.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--> <!-- Profile for testing with a custom DB using a system jar --> <!-- @@ -374,7 +374,7 @@ -Dopenjpa.custom.username=USERNAME \ -Dopenjpa.custom.password=PASSWORD --> - <profile> + <!--profile> <id>test-custom2</id> <activation> <property> @@ -404,14 +404,14 @@ <connection.password>${openjpa.custom.password}</connection.password> <jdbc.DBDictionary /> </properties> - </profile> + </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> + <!--profile--> <!-- Example db2 profile. You can use this profile if you: 1) have the DB2 artifacts installed in a local repo and supply @@ -444,7 +444,7 @@ -Dids.license.artifactid=jcc-license -Ddb2.version=9.5 --> - <id>test-db2-jcc</id> + <!--id>test-db2-jcc</id> <activation> <property> <name>test-db2-jcc</name> @@ -470,9 +470,9 @@ <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.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.url>${openjpa.db2.url}</connection.url> <connection.username>${openjpa.db2.username}</connection.username> <connection.password>${openjpa.db2.password}</connection.password> <jdbc.DBDictionary /> @@ -492,10 +492,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing Apache Derby with the DB2 JCC driver --> - <profile> + <!--profile> <id>test-derbyjcc</id> <activation> <property> @@ -521,15 +521,15 @@ <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> + <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> + <!--openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url--> <!-- Note: commons-dbcp requires dummy values for uid/pwd --> - <openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username> + <!--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> @@ -551,10 +551,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing Informix with the DB2 JCC driver --> - <profile> + <!--profile--> <!-- Example Informix JCC profile. You can use this profile if you: 1a) have the DB2 JCC artifacts installed in a local repo and @@ -578,7 +578,7 @@ -Dids.license.artifactid=jcc-license -Dids.version=9.5 --> - <id>test-ids-jcc</id> + <!--id>test-ids-jcc</id> <activation> <property> <name>test-ids-jcc</name> @@ -625,10 +625,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing Informix with the Informix JDBC Driver --> - <profile> + <!--profile--> <!-- Example Informix profile. You can use this profile if you: 1) have the Informix JDBC artifacts installed in a local repo and @@ -654,7 +654,7 @@ -Dids.driver.artifactid=informix-driver -Dids.version=3.70 --> - <id>test-ids-informix</id> + <!--id>test-ids-informix</id> <activation> <property> <name>test-ids-informix</name> @@ -694,10 +694,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing with Oracle DB --> - <profile> + <!--profile--> <!-- Example oracle profile. You can use this profile if you: 1) have the Oracle artifacts installed in a local repo and @@ -721,7 +721,7 @@ -Doracle.groupid=com.oracle -Doracle.version=10g --> - <id>test-oracle</id> + <!--id>test-oracle</id> <activation> <property> <name>test-oracle</name> @@ -740,9 +740,9 @@ <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.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.url>${openjpa.oracle.url}</connection.url> <connection.username>${openjpa.oracle.username}</connection.username> <connection.password>${openjpa.oracle.password}</connection.password> <jdbc.DBDictionary /> @@ -762,10 +762,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing IBM SolidDB --> - <profile> + <!--profile> <id>test-soliddb</id> <activation> <property> @@ -785,9 +785,9 @@ <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.driver.name>solid.jdbc.SolidDriver</connection.driver.name--> <!--<connection.url>jdbc:solid://localhost:2315</connection.url>--> - <connection.url>${openjpa.soliddb.url}</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 /> @@ -807,7 +807,7 @@ </releases> </repository> </repositories> - </profile> + </profile--> </profiles> diff -Nru apache-openjpa-2.2.0-source/openjpa-persistence-locking/pom.xml apache-openjpa-2.2.0-source-gil/openjpa-persistence-locking/pom.xml --- apache-openjpa-2.2.0-source/openjpa-persistence-locking/pom.xml 2012-02-16 09:33:46.000000000 +0100 +++ apache-openjpa-2.2.0-source-gil/openjpa-persistence-locking/pom.xml 2012-06-24 13:59:03.517270302 +0200 @@ -154,7 +154,7 @@ </profile> <!-- Profile for testing with SQLServer DB using MS JDBC driver --> - <profile> + <!--profile--> <!-- Example MS SQL profile. You can use this profile if you: 1) have the MS SQL artifacts installed in a local repo and @@ -182,7 +182,7 @@ If you are using Java SE 6 or later, you will need to use: -Dmssql.artifactid=sqljdbc4 --> - <id>test-mssql</id> + <!--id>test-mssql</id> <activation> <property> <name>test-mssql</name> @@ -222,10 +222,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing with SQLServer DB using the jTDS driver --> - <profile> + <!--profile> <id>test-sqlserver</id> <activation> <property> @@ -248,10 +248,10 @@ <connection.password>${openjpa.sqlserver.password}</connection.password> <jdbc.DBDictionary /> </properties> - </profile> + </profile--> <!-- Profile for testing with Sybase DB using the jTDS driver --> - <profile> + <!--profile> <id>test-sybase</id> <activation> <property> @@ -274,10 +274,10 @@ <connection.password>${openjpa.sybase.password}</connection.password> <jdbc.DBDictionary /> </properties> - </profile> + </profile--> <!-- Profile for testing with Ingres DB --> - <profile> + <!--profile> <id>test-ingres</id> <activation> <property> @@ -300,7 +300,7 @@ <connection.password>${openjpa.ingres.password}</connection.password> <jdbc.DBDictionary /> </properties> - </profile> + </profile--> <!-- Profile for testing with a custom DB using a system jar --> <!-- @@ -390,7 +390,7 @@ continuous build system. As a convenience I've added profiles for some of the proprietary databases to make testing easier. --> - <profile> + <!--profile--> <!-- Example db2 profile. You can use this profile if you: 1) have the DB2 artifacts installed in a local repo and supply @@ -423,7 +423,7 @@ -Dids.license.artifactid=jcc-license -Ddb2.version=9.5 --> - <id>test-db2-jcc</id> + <!--id>test-db2-jcc</id> <activation> <property> <name>test-db2-jcc</name> @@ -470,10 +470,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing Apache Derby with the DB2 JCC driver --> - <profile> + <!--profile> <id>test-derbyjcc</id> <activation> <property> @@ -499,15 +499,15 @@ <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> + <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> + <!--openjpa.derbyjcc.url>jdbc:db2://localhost:1527/openjpa20</openjpa.derbyjcc.url--> <!-- Note: commons-dbcp requires dummy values for uid/pwd --> - <openjpa.derbyjcc.username>uid</openjpa.derbyjcc.username> + <!--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> @@ -530,10 +530,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing Informix with the DB2 JCC driver --> - <profile> + <!--profile--> <!-- Example Informix JCC profile. You can use this profile if you: 1a) have the DB2 JCC artifacts installed in a local repo and @@ -557,7 +557,7 @@ -Dids.license.artifactid=jcc-license -Dids.version=9.5 --> - <id>test-ids-jcc</id> + <!--id>test-ids-jcc</id> <activation> <property> <name>test-ids-jcc</name> @@ -604,10 +604,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing Informix with the Informix JDBC Driver --> - <profile> + <!--profile--> <!-- Example Informix profile. You can use this profile if you: 1) have the Informix JDBC artifacts installed in a local repo and @@ -633,7 +633,7 @@ -Dids.driver.artifactid=informix-driver -Dids.version=3.70 --> - <id>test-ids-informix</id> + <!--id>test-ids-informix</id> <activation> <property> <name>test-ids-informix</name> @@ -673,10 +673,10 @@ </releases> </repository> </repositories> - </profile> + </profile--> <!-- Profile for testing with Oracle DB --> - <profile> + <!--profile--> <!-- Example oracle profile. You can use this profile if you: 1) have the Oracle artifacts installed in a local repo and @@ -700,7 +700,7 @@ -Doracle.groupid=com.oracle -Doracle.version=10g --> - <id>test-oracle</id> + <!--id>test-oracle</id> <activation> <property> <name>test-oracle</name> @@ -740,7 +740,7 @@ </releases> </repository> </repositories> - </profile> + </profile--> </profiles> <dependencies>