diff --git a/.gitignore b/.gitignore index a6f89c2..e8b2cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -/target/ \ No newline at end of file +/target/release.properties +pom.xml.releaseBackup +release.properties +target diff --git a/pom.xml b/pom.xml index 79184f6..f87c494 100644 --- a/pom.xml +++ b/pom.xml @@ -1,127 +1,133 @@ - - - 4.0.0 - - net.certifi - AuditTableGen - 0.1.0-SNAPSHOT - jar - - AuditTableGen - http://maven.apache.org - - - UTF-8 - - - - - junit - junit - 4.11 - test - - - commons-cli - commons-cli - 1.2 - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - commons-dbcp - commons-dbcp - 1.4 - - - org.mockito - mockito-all - 1.9.5 - test - - - org.easytesting - fest-assert - 1.4 - test - - - joda-time - joda-time - 2.3 - - - - ch.qos.logback - logback-classic - 1.0.13 - - - org.hsqldb - hsqldb - 2.3.0 - - - com.google.guava - guava - 14.0.1 - - - org.liquibase - liquibase-core - 3.0.2 - - - commons-collections - commons-collections - 3.2.1 - - - org.apache.commons - commons-lang3 - 3.1 - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.15 - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.15 - - - integration-test - - integration-test - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - false - - - - + + + 4.0.0 + + net.certifi + AuditTableGen + 0.1.1-SNAPSHOT + jar + + AuditTableGen + http://maven.apache.org + + + UTF-8 + + + + + junit + junit + 4.11 + test + + + commons-cli + commons-cli + 1.2 + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + commons-dbcp + commons-dbcp + 1.4 + + + org.mockito + mockito-all + 1.9.5 + test + + + org.easytesting + fest-assert + 1.4 + test + + + joda-time + joda-time + 2.3 + + + + ch.qos.logback + logback-classic + 1.0.13 + + + org.hsqldb + hsqldb + 2.3.0 + + + com.google.guava + guava + 14.0.1 + + + org.liquibase + liquibase-core + 3.0.2 + + + commons-collections + commons-collections + 3.2.1 + + + org.apache.commons + commons-lang3 + 3.1 + + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.15 + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.15 + + + integration-test + + integration-test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + false + + + + - scm:git:git://github.com/gsacks/AuditTableGen.git + scm:git:git://git@github.com/jputney/AuditTableGen.git + scm:git:git://git@github.com/jputney/AuditTableGen.git + scm:git:git://git@github.com/jputney/AuditTableGen.git @@ -132,4 +138,4 @@ - + diff --git a/src/main/java/net/certifi/audittablegen/PostgresqlDMR.java b/src/main/java/net/certifi/audittablegen/PostgresqlDMR.java index e13520d..c4f9230 100644 --- a/src/main/java/net/certifi/audittablegen/PostgresqlDMR.java +++ b/src/main/java/net/certifi/audittablegen/PostgresqlDMR.java @@ -27,8 +27,7 @@ import javax.sql.DataSource; import org.apache.commons.collections.map.CaseInsensitiveMap; import org.apache.commons.dbcp.BasicDataSource; -import org.postgresql.Driver; -import org.postgresql.ds.PGSimpleDataSource; +import org.postgresql.ds.PGPoolingDataSource; import org.slf4j.LoggerFactory; /** @@ -58,8 +57,8 @@ public class PostgresqlDMR extends GenericDMR { static DataSource getRunTimeDataSource(Properties props){ //BasicDataSource dataSource = new BasicDataSource(); - //PGPoolingDataSource dataSource = new PGPoolingDataSource(); - PGSimpleDataSource dataSource = new PGSimpleDataSource(); + PGPoolingDataSource dataSource = new PGPoolingDataSource(); + //PGSimpleDataSource dataSource = new PGSimpleDataSource(); int port; dataSource.setUser(props.getProperty("username")); dataSource.setPassword(props.getProperty("password"));