Merge branch 'postgres' into dev

dekellum · Jun 19, 2017 · f6fa792 · f6fa792
2 parents 006c866 + fb1b960
commit f6fa792
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/jdbc-postgres/Gemfile.lock b/jdbc-postgres/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rjack-jdbc-postgres (9.4.1208.0)
+    rjack-jdbc-postgres (42.1.1.0)
 
 GEM
   remote: https://rubygems.org/

diff --git a/jdbc-postgres/History.rdoc b/jdbc-postgres/History.rdoc
@@ -1,3 +1,5 @@
+=== 42.1.1.0 (TBD)
+
 === 9.4.1208.0 (2016-3-24)
 * Update to 9.4.1208
 

diff --git a/jdbc-postgres/Manifest.txt b/jdbc-postgres/Manifest.txt
@@ -5,5 +5,5 @@ Rakefile
 lib/rjack-jdbc-postgres/base.rb
 lib/rjack-jdbc-postgres.rb
 test/test_jdbc_postgres.rb
-lib/rjack-jdbc-postgres/postgresql-9.4.1208.jdbc41.jar
-lib/rjack-jdbc-postgres/postgresql-9.4.1208.jdbc42.jar
+lib/rjack-jdbc-postgres/postgresql-42.1.1.jdbc41.jar
+lib/rjack-jdbc-postgres/postgresql-42.1.1.jdbc42.jar
diff --git a/jdbc-postgres/lib/rjack-jdbc-postgres/base.rb b/jdbc-postgres/lib/rjack-jdbc-postgres/base.rb
@@ -32,7 +32,7 @@ module RJack
   module JDBCPostgres
 
     # Postgres JDBC Driver version
-    DRIVER_VERSION = "9.4.1208"
+    DRIVER_VERSION = "42.1.1"
 
     # rjack gem version
     VERSION = DRIVER_VERSION.gsub( '-', '.' ) + '.0'