From 574f4356e8ca659040da85a13b1e0af5c33e707f Mon Sep 17 00:00:00 2001 From: Trevor Rosen Date: Tue, 8 Jul 2014 18:20:20 -0500 Subject: [PATCH] Update deps --- Gemfile | 2 +- Gemfile.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 42feedc9ba..30bced1b2f 100755 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ group :db do # gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.5.1-electro-release' gem 'metasploit-credential', path: '/Users/trevor/rapid7/metasploit-credential' # Database models shared between framework and Pro. - gem 'metasploit_data_models', '~> 0.17.3.pre.metasploit.pre.data.pre.models.pre.search' + gem 'metasploit_data_models', '~> 0.18.0.pre.compatibility' # Needed for module caching in Mdm::ModuleDetails gem 'pg', '>= 0.11' end diff --git a/Gemfile.lock b/Gemfile.lock index 67ddfcb655..88415e70e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -18,10 +18,10 @@ PATH PATH remote: /Users/trevor/rapid7/metasploit-credential specs: - metasploit-credential (0.5.4) + metasploit-credential (0.5.5.pre.electro.pre.release) metasploit-concern (~> 0.1.0) - metasploit-model (>= 0.24.1.pre.semantic.pre.versioning.pre.2.pre.0, < 0.25) - metasploit_data_models (>= 0.17.3, < 0.18) + metasploit-model (>= 0.25.1, < 0.26) + metasploit_data_models (>= 0.18.0.pre.compatibility, < 0.19) rubyntlm rubyzip (~> 1.1) @@ -65,15 +65,15 @@ GEM i18n (0.6.9) journey (1.0.4) json (1.8.1) - metasploit-concern (0.1.0) + metasploit-concern (0.1.1) activesupport (~> 3.0, >= 3.0.0) - metasploit-model (0.24.1) + metasploit-model (0.25.2) activesupport - metasploit_data_models (0.17.5) + metasploit_data_models (0.18.0) activerecord (>= 3.2.13, < 4.0.0) activesupport metasploit-concern (~> 0.1.0) - metasploit-model (>= 0.24.1, < 0.25) + metasploit-model (>= 0.25.1, < 0.26) pg method_source (0.8.2) mini_portile (0.6.0) @@ -156,7 +156,7 @@ DEPENDENCIES fivemat (= 1.2.1) metasploit-credential! metasploit-framework! - metasploit_data_models (~> 0.17.3.pre.metasploit.pre.data.pre.models.pre.search) + metasploit_data_models (~> 0.18.0.pre.compatibility) network_interface (~> 0.0.1) pcaprub pg (>= 0.11)