diff --git a/Gemfile.lock b/Gemfile.lock index 9e1bd405b8..b2227a89a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,8 +7,8 @@ PATH bcrypt jsobfu (~> 0.2.0) json - metasploit-concern (= 1.0.0.pre.rails.pre.4.0) - metasploit-model (= 1.0.0.pre.rails.pre.4.0) + metasploit-concern (~> 1.0) + metasploit-model (~> 1.0) metasploit-payloads (= 0.0.3) msgpack nokogiri @@ -22,9 +22,9 @@ PATH tzinfo metasploit-framework-db (4.11.0.pre.dev) activerecord (>= 4.0.9, < 4.1.0) - metasploit-credential (= 1.0.0.pre.rails.pre.4.0c) + metasploit-credential (~> 1.0) metasploit-framework (= 4.11.0.pre.dev) - metasploit_data_models (= 1.0.0.pre.rails.pre.4.0b) + metasploit_data_models (~> 1.0) pg (>= 0.11) metasploit-framework-pcap (4.11.0.pre.dev) metasploit-framework (= 4.11.0.pre.dev) @@ -107,28 +107,29 @@ GEM json (1.8.2) mail (2.6.3) mime-types (>= 1.16, < 3) - metasploit-concern (1.0.0.pre.rails.pre.4.0) + metasploit-concern (1.0.0) activerecord (>= 4.0.9, < 4.1.0) activesupport (>= 4.0.9, < 4.1.0) railties (>= 4.0.9, < 4.1.0) - metasploit-credential (1.0.0.pre.rails.pre.4.0c) - metasploit-concern (= 1.0.0.pre.rails.pre.4.0) - metasploit-model (= 1.0.0.pre.rails.pre.4.0) - metasploit_data_models (= 1.0.0.pre.rails.pre.4.0b) + metasploit-credential (1.0.0) + metasploit-concern (~> 1.0) + metasploit-model (~> 1.0) + metasploit_data_models (~> 1.0) pg railties rubyntlm rubyzip (~> 1.1) - metasploit-model (1.0.0.pre.rails.pre.4.0) + metasploit-model (1.0.0) + activemodel (>= 4.0.9, < 4.1.0) activesupport (>= 4.0.9, < 4.1.0) railties (>= 4.0.9, < 4.1.0) metasploit-payloads (0.0.3) - metasploit_data_models (1.0.0.pre.rails.pre.4.0b) + metasploit_data_models (1.0.1) activerecord (>= 4.0.9, < 4.1.0) activesupport (>= 4.0.9, < 4.1.0) arel-helpers - metasploit-concern (= 1.0.0.pre.rails.pre.4.0) - metasploit-model (= 1.0.0.pre.rails.pre.4.0) + metasploit-concern (~> 1.0) + metasploit-model (~> 1.0) pg postgres_ext railties (>= 4.0.9, < 4.1.0) @@ -173,7 +174,7 @@ GEM thor (>= 0.18.1, < 2.0) rake (10.4.2) rb-readline-r7 (0.5.2.0) - recog (1.0.27) + recog (1.0.29) nokogiri redcarpet (3.2.3) rkelly-remix (0.0.6) diff --git a/metasploit-framework-db.gemspec b/metasploit-framework-db.gemspec index d60eb942ca..5b261dbf35 100644 --- a/metasploit-framework-db.gemspec +++ b/metasploit-framework-db.gemspec @@ -29,9 +29,9 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'activerecord', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION # Metasploit::Credential database models - spec.add_runtime_dependency 'metasploit-credential', '1.0.0.pre.rails.pre.4.0c' + spec.add_runtime_dependency 'metasploit-credential', '~> 1.0' # Database models shared between framework and Pro. - spec.add_runtime_dependency 'metasploit_data_models', '1.0.0.pre.rails.pre.4.0b' + spec.add_runtime_dependency 'metasploit_data_models', '~> 1.0' # depend on metasploit-framewrok as the optional gems are useless with the actual code spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}" # Needed for module caching in Mdm::ModuleDetails diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec index 137cdff33b..46f7b3601c 100644 --- a/metasploit-framework.gemspec +++ b/metasploit-framework.gemspec @@ -59,10 +59,10 @@ Gem::Specification.new do |spec| # Needed for some admin modules (scrutinizer_add_user.rb) spec.add_runtime_dependency 'json' # Metasploit::Concern hooks - spec.add_runtime_dependency 'metasploit-concern', '1.0.0.pre.rails.pre.4.0' + spec.add_runtime_dependency 'metasploit-concern', '~> 1.0' # Things that would normally be part of the database model, but which # are needed when there's no database - spec.add_runtime_dependency 'metasploit-model', '1.0.0.pre.rails.pre.4.0' + spec.add_runtime_dependency 'metasploit-model', '~> 1.0' # Needed for Meterpreter on Windows, soon others. spec.add_runtime_dependency 'metasploit-payloads', '0.0.3' # Needed by msfgui and other rpc components