diff --git a/Gemfile b/Gemfile index 35e3ac65..4f90d276 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' -gem 'activerecord', '~> 4.1.0' +gem 'activerecord', '~> 4.1.14' gem 'activerecord-jdbcderby-adapter' diff --git a/Gemfile.lock b/Gemfile.lock index 6e0741a0..2621e8e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,42 @@ GEM remote: https://rubygems.org/ specs: - activemodel (4.1.8) - activesupport (= 4.1.8) + activemodel (4.1.14.1) + activesupport (= 4.1.14.1) builder (~> 3.1) - activerecord (4.1.8) - activemodel (= 4.1.8) - activesupport (= 4.1.8) + activerecord (4.1.14.1) + activemodel (= 4.1.14.1) + activesupport (= 4.1.14.1) arel (~> 5.0.0) activerecord-jdbc-adapter (1.3.13) activerecord (>= 2.2) activerecord-jdbcderby-adapter (1.3.13) activerecord-jdbc-adapter (~> 1.3.13) jdbc-derby (~> 10.6) - activesupport (4.1.8) + activesupport (4.1.14.1) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) - builder (3.2.2) - i18n (0.7.0) + builder (3.2.3) + concurrent-ruby (1.1.5) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jdbc-derby (10.10.2.0) - json (1.8.1-java) - minitest (5.5.0) - thread_safe (0.3.4-java) - tzinfo (1.2.2) + json (1.8.6) + json (1.8.6-java) + minitest (5.12.2) + thread_safe (0.3.6) + thread_safe (0.3.6-java) + tzinfo (1.2.5) thread_safe (~> 0.1) PLATFORMS java + ruby DEPENDENCIES - activerecord (~> 4.1.0) + activerecord (~> 4.1.14) activerecord-jdbcderby-adapter