Update jdb-postgresql gems to fix spec in jruby on travis

2 files changed, 14 insertions, 14 deletions

diff --git a/Gemfile b/Gemfile
index dbac2f452..e801e72a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '3.2.18'
 
 platforms :jruby do
-  gem 'activerecord-jdbcpostgresql-adapter', '1.2.9'
-  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.3'
   gem 'jruby-openssl'
   gem "jruby-rack-worker"
   gem 'warbler'
@@ -47,6 +46,7 @@ gem 'bootstrap-sass', '~> 3.1.1'
 gem 'bootswatch-rails'
 gem 'font-awesome-sass'
 gem 'will_paginate-bootstrap'
+gem 'simple_form'
 
 # Format Output
 gem 'json'
diff --git a/Gemfile.lock b/Gemfile.lock
index f15389b0b..d259795eb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,13 +40,11 @@ GEM
       activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.2.9)
-    activerecord-jdbcpostgresql-adapter (1.2.9)
-      activerecord-jdbc-adapter (~> 1.2.9)
-      jdbc-postgres (>= 9.1, < 9.3)
-    activerecord-jdbcsqlite3-adapter (1.2.1)
-      activerecord-jdbc-adapter (~> 1.2.1)
-      jdbc-sqlite3 (~> 3.7.2)
+    activerecord-jdbc-adapter (1.3.9)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.9)
+      activerecord-jdbc-adapter (~> 1.3.9)
+      jdbc-postgres (>= 9.1)
     activeresource (3.2.18)
       activemodel (= 3.2.18)
       activesupport (= 3.2.18)
@@ -153,7 +151,7 @@ GEM
       georuby (>= 1.9.8)
       rgeo (>= 0.3.20)
     google-analytics-rails (0.0.4)
-    gravatar_image_tag (1.1.3)
+    gravatar_image_tag (1.2.0)
     guard (1.3.2)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
@@ -168,8 +166,7 @@ GEM
     inherited_resources (1.4.1)
       has_scope (~> 0.6.0.rc)
       responders (~> 1.0.0.rc)
-    jdbc-postgres (9.2.1002.1)
-    jdbc-sqlite3 (3.7.2.1)
+    jdbc-postgres (9.3.1101)
     journey (1.0.4)
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
@@ -311,6 +308,9 @@ GEM
       websocket (~> 1.0.4)
     shoulda-matchers (1.2.0)
       activesupport (>= 3.0.0)
+    simple_form (2.1.1)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
     spreadsheet (0.9.7)
       ruby-ole (>= 1.0)
     sprockets (2.2.2)
@@ -359,8 +359,7 @@ DEPENDENCIES
   RedCloth
   SyslogLogger
   active_enum
-  activerecord-jdbcpostgresql-adapter (= 1.2.9)
-  activerecord-jdbcsqlite3-adapter
+  activerecord-jdbcpostgresql-adapter (~> 1.3.3)
   acts_as_list (= 0.1.6)
   acts_as_tree-1.8 (= 1.1.0)
   bootstrap-sass (~> 3.1.1)
@@ -414,6 +413,7 @@ DEPENDENCIES
   rubyzip
   sass-rails (~> 3.2.3)
   shoulda-matchers
+  simple_form
   sqlite3
   squeel
   therubyracer (~> 0.10.2)