From 558a8912cd5a293fcf39e3cf278247ad91bc82a8 Mon Sep 17 00:00:00 2001 From: Jeff Putney Date: Fri, 29 Aug 2014 13:12:47 -0500 Subject: [PATCH 1/8] [maven-release-plugin] prepare release AuditTableGen-0.1.0 --- pom.xml | 243 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 121 insertions(+), 122 deletions(-) diff --git a/pom.xml b/pom.xml index 79184f6..e4701fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1,124 +1,123 @@ - - - 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.0 + 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 + + + + scm:git:git://github.com/gsacks/AuditTableGen.git @@ -132,4 +131,4 @@ - + From 4ed370576a08b0bade5e07225e405032402ee804 Mon Sep 17 00:00:00 2001 From: Jeff Putney Date: Fri, 29 Aug 2014 13:13:16 -0500 Subject: [PATCH 2/8] [maven-release-plugin] prepare release AuditTableGen-0.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4701fa..49e1ad7 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ - scm:git:git://github.com/gsacks/AuditTableGen.git + scm:git:git://github.com/jputney/AuditTableGen.git From 70c1ee103e5f62f95f2c1ca2934ae0edefb36aff Mon Sep 17 00:00:00 2001 From: Jeff Putney Date: Fri, 29 Aug 2014 13:20:28 -0500 Subject: [PATCH 3/8] add release tmp files to ignores --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a6f89c2..a05740f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/target/ \ No newline at end of file +/target/release.properties +pom.xml.releaseBackup From ccbc4c307f82396d8a12db281e9104332f7b6b38 Mon Sep 17 00:00:00 2001 From: Jeff Putney Date: Fri, 29 Aug 2014 13:21:10 -0500 Subject: [PATCH 4/8] add release tmp files to ignores --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a05740f..87f3f73 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target/release.properties pom.xml.releaseBackup +release.properties From 7698233f5fd34c3fbc3389a2527be03ead5ad7a6 Mon Sep 17 00:00:00 2001 From: Jeff Putney Date: Fri, 29 Aug 2014 13:26:06 -0500 Subject: [PATCH 5/8] [maven-release-plugin] prepare release AuditTableGen-0.1.0 --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 49e1ad7..b0cd76f 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,9 @@ - scm: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 + scm:git:git://git@github.com/jputney/AuditTableGen.git From 02c9b04f4d1777df32495113fa467a9ec17b95ae Mon Sep 17 00:00:00 2001 From: Jeff Putney Date: Fri, 29 Aug 2014 13:29:33 -0500 Subject: [PATCH 6/8] [maven-release-plugin] prepare release AuditTableGen-0.1.0 --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index b0cd76f..c25f337 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,11 @@ + + org.apache.maven.plugins + maven-release-plugin + 2.3.2 + org.apache.maven.plugins maven-surefire-plugin From fa935c2f01a267510ab15a7d80d3b9dd99f687e4 Mon Sep 17 00:00:00 2001 From: Jeff Putney Date: Fri, 29 Aug 2014 13:32:55 -0500 Subject: [PATCH 7/8] add target to ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 87f3f73..e8b2cf7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /target/release.properties pom.xml.releaseBackup release.properties +target From f932fba3d023233f24b59279b77e3bb84728a171 Mon Sep 17 00:00:00 2001 From: Jeff Putney Date: Fri, 29 Aug 2014 15:35:36 -0500 Subject: [PATCH 8/8] version 0.1.1-SNAPSHOT --- pom.xml | 2 +- src/main/java/net/certifi/audittablegen/PostgresqlDMR.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c25f337..f87c494 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ net.certifi AuditTableGen - 0.1.0 + 0.1.1-SNAPSHOT jar AuditTableGen 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"));