Skip to content

Commit f748256

Browse files
committed
Use the prerelease versions of the gems
MSP-11412
1 parent 04dbfb9 commit f748256

File tree

3 files changed

+31
-52
lines changed

3 files changed

+31
-52
lines changed

Gemfile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@ group :db do
88
gem 'activerecord', '>= 3.0.0', '< 4.0.0'
99

1010
# Metasploit::Credential database models
11-
gem 'metasploit-credential', '~> 0.11.0'
11+
gem 'metasploit-credential', '~> 0.11.0.pre.engine.pre.requires'
1212
# Database models shared between framework and Pro.
13-
gem 'metasploit_data_models', '~> 0.21.0'
13+
gem 'metasploit_data_models', '~> 0.21.0.pre.engine.pre.requires'
1414
# Needed for module caching in Mdm::ModuleDetails
1515
gem 'pg', '>= 0.11'
1616
end
1717

18-
gem 'metasploit-concern', path: '/Users/techpeace/rapid7/metasploit-concern'
19-
gem 'metasploit-model', path: '/Users/techpeace/rapid7/metasploit-model'
20-
2118
group :development do
2219
# Markdown formatting for yard
2320
gem 'redcarpet'

Gemfile.lock

Lines changed: 27 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ PATH
77
bcrypt
88
jsobfu (~> 0.2.0)
99
json
10-
metasploit-concern (~> 0.2.1)
11-
metasploit-model (~> 0.27.1)
10+
metasploit-concern (~> 0.3.0.pre.engine.pre.requires)
11+
metasploit-model (~> 0.28.0.pre.engine.pre.requires)
1212
meterpreter_bins (= 0.0.7)
1313
msgpack
1414
nokogiri
@@ -19,44 +19,6 @@ PATH
1919
sqlite3
2020
tzinfo
2121

22-
PATH
23-
remote: /Users/techpeace/rapid7/metasploit-concern
24-
specs:
25-
metasploit-concern (0.2.1)
26-
activesupport (~> 3.0, >= 3.0.0)
27-
railties (< 4.0.0)
28-
29-
PATH
30-
remote: /Users/techpeace/rapid7/metasploit-credential
31-
specs:
32-
metasploit-credential (0.10.2)
33-
metasploit-concern (~> 0.2.1)
34-
metasploit-model (~> 0.27.0)
35-
metasploit_data_models (~> 0.20.0)
36-
pg
37-
railties (< 4.0.0)
38-
rubyntlm
39-
rubyzip (~> 1.1)
40-
41-
PATH
42-
remote: /Users/techpeace/rapid7/metasploit-model
43-
specs:
44-
metasploit-model (0.27.4)
45-
activesupport
46-
railties (< 4.0.0)
47-
48-
PATH
49-
remote: /Users/techpeace/rapid7/metasploit_data_models
50-
specs:
51-
metasploit_data_models (0.20.1)
52-
activerecord (>= 3.2.13, < 4.0.0)
53-
activesupport
54-
arel-helpers
55-
metasploit-concern (~> 0.2.1)
56-
metasploit-model (~> 0.27.0)
57-
pg
58-
railties (< 4.0.0)
59-
6022
GEM
6123
remote: https://rubygems.org/
6224
specs:
@@ -129,12 +91,34 @@ GEM
12991
hike (1.2.3)
13092
i18n (0.6.11)
13193
journey (1.0.4)
132-
jsobfu (0.2.0)
94+
jsobfu (0.2.1)
13395
rkelly-remix (= 0.0.6)
13496
json (1.8.1)
13597
mail (2.5.4)
13698
mime-types (~> 1.16)
13799
treetop (~> 1.4.8)
100+
metasploit-concern (0.3.0.pre.engine.pre.requires)
101+
activesupport (~> 3.0, >= 3.0.0)
102+
railties (< 4.0.0)
103+
metasploit-credential (0.11.0.pre.engine.pre.requires)
104+
metasploit-concern
105+
metasploit-model
106+
metasploit_data_models
107+
pg
108+
railties (< 4.0.0)
109+
rubyntlm
110+
rubyzip (~> 1.1)
111+
metasploit-model (0.28.0.pre.engine.pre.requires)
112+
activesupport
113+
railties (< 4.0.0)
114+
metasploit_data_models (0.21.0.pre.engine.pre.requires)
115+
activerecord (>= 3.2.13, < 4.0.0)
116+
activesupport
117+
arel-helpers
118+
metasploit-concern
119+
metasploit-model
120+
pg
121+
railties (< 4.0.0)
138122
meterpreter_bins (0.0.7)
139123
method_source (0.8.2)
140124
mime-types (1.25.1)
@@ -234,11 +218,9 @@ DEPENDENCIES
234218
factory_girl (>= 4.1.0)
235219
factory_girl_rails
236220
fivemat (= 1.2.1)
237-
metasploit-concern!
238-
metasploit-credential!
221+
metasploit-credential (~> 0.11.0.pre.engine.pre.requires)
239222
metasploit-framework!
240-
metasploit-model!
241-
metasploit_data_models!
223+
metasploit_data_models (~> 0.21.0.pre.engine.pre.requires)
242224
network_interface (~> 0.0.1)
243225
pcaprub
244226
pg (>= 0.11)

metasploit-framework.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ Gem::Specification.new do |spec|
6060
# Needed for some admin modules (scrutinizer_add_user.rb)
6161
spec.add_runtime_dependency 'json'
6262
# Metasploit::Concern hooks
63-
spec.add_runtime_dependency 'metasploit-concern', '~> 0.3.0'
63+
spec.add_runtime_dependency 'metasploit-concern', '~> 0.3.0.pre.engine.pre.requires'
6464
# Things that would normally be part of the database model, but which
6565
# are needed when there's no database
66-
spec.add_runtime_dependency 'metasploit-model', '~> 0.28.0'
66+
spec.add_runtime_dependency 'metasploit-model', '~> 0.28.0.pre.engine.pre.requires'
6767
# Needed for Meterpreter on Windows, soon others.
6868
spec.add_runtime_dependency 'meterpreter_bins', '0.0.7'
6969
# Needed by msfgui and other rpc components

0 commit comments

Comments
 (0)