Update to compatible dependencies

MSP-10654
bug/bundler_fix
Luke Imhoff 2014-07-07 14:41:03 -05:00
parent d7908e3050
commit 271fae07cf
No known key found for this signature in database
GPG Key ID: 5B1FB01FB33356F8
2 changed files with 13 additions and 12 deletions

View File

@ -7,9 +7,9 @@ group :db do
# Needed for Msf::DbManager
gem 'activerecord', '>= 3.0.0', '< 4.0.0'
# Metasploit::Credential database models
gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.4.8-electro-release'
gem 'metasploit-credential', git: 'github-metasploit-credential:rapid7/metasploit-credential.git', tag: 'v0.5.5.pre.compatibility'
# Database models shared between framework and Pro.
gem 'metasploit_data_models', '~> 0.17.2.pre.metasploit.pre.data.pre.models.pre.search'
gem 'metasploit_data_models', '>= 0.18.0.pre.compatibility', '< 0.19'
# Needed for module caching in Mdm::ModuleDetails
gem 'pg', '>= 0.11'
end

View File

@ -1,12 +1,12 @@
GIT
remote: github-metasploit-credential:rapid7/metasploit-credential.git
revision: b7234221ce41e311947e3e32c03aa7b6474f4f4f
tag: v0.4.8-electro-release
revision: e2e4095035abc7d69648eb7400f3161f24436945
tag: v0.5.5.pre.compatibility
specs:
metasploit-credential (0.4.8.pre.electro.pre.release)
metasploit-credential (0.5.5.pre.compatibility)
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.2.pre.metasploit.pre.data.pre.models.pre.search, < 0.18)
metasploit-model (>= 0.25.1, < 0.26)
metasploit_data_models (>= 0.18.0.pre.compatibility, < 0.19)
rubyntlm
rubyzip (~> 1.1)
@ -67,14 +67,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.pre.semantic.pre.versioning.pre.2.pre.0)
metasploit-model (0.25.2)
activesupport
metasploit_data_models (0.17.2.pre.metasploit.pre.data.pre.models.pre.search)
metasploit_data_models (0.18.0.pre.compatibility)
activerecord (>= 3.2.13, < 4.0.0)
activesupport
metasploit-model (>= 0.24.1.pre.semantic.pre.versioning.pre.2.pre.0, < 0.25)
metasploit-concern (~> 0.1.0)
metasploit-model (>= 0.25.1, < 0.26)
pg
method_source (0.8.2)
mini_portile (0.6.0)
@ -157,7 +158,7 @@ DEPENDENCIES
fivemat (= 1.2.1)
metasploit-credential!
metasploit-framework!
metasploit_data_models (~> 0.17.2.pre.metasploit.pre.data.pre.models.pre.search)
metasploit_data_models (>= 0.18.0.pre.compatibility, < 0.19)
network_interface (~> 0.0.1)
pcaprub
pg (>= 0.11)