Skip to content

Commit ad74a2e

Browse files
committed
Land rapid7#8706, Pin xpath version for integration testing
2 parents aa0fca9 + 38d5258 commit ad74a2e

File tree

2 files changed

+24
-21
lines changed

2 files changed

+24
-21
lines changed

Gemfile.lock

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,32 +66,33 @@ PATH
6666
windows_error
6767
xdr
6868
xmlrpc
69+
xpath (= 2.0)
6970

7071
GEM
7172
remote: https://rubygems.org/
7273
specs:
7374
Ascii85 (1.0.2)
74-
actionpack (4.2.8)
75-
actionview (= 4.2.8)
76-
activesupport (= 4.2.8)
75+
actionpack (4.2.9)
76+
actionview (= 4.2.9)
77+
activesupport (= 4.2.9)
7778
rack (~> 1.6)
7879
rack-test (~> 0.6.2)
7980
rails-dom-testing (~> 1.0, >= 1.0.5)
8081
rails-html-sanitizer (~> 1.0, >= 1.0.2)
81-
actionview (4.2.8)
82-
activesupport (= 4.2.8)
82+
actionview (4.2.9)
83+
activesupport (= 4.2.9)
8384
builder (~> 3.1)
8485
erubis (~> 2.7.0)
8586
rails-dom-testing (~> 1.0, >= 1.0.5)
8687
rails-html-sanitizer (~> 1.0, >= 1.0.3)
87-
activemodel (4.2.8)
88-
activesupport (= 4.2.8)
88+
activemodel (4.2.9)
89+
activesupport (= 4.2.9)
8990
builder (~> 3.1)
90-
activerecord (4.2.8)
91-
activemodel (= 4.2.8)
92-
activesupport (= 4.2.8)
91+
activerecord (4.2.9)
92+
activemodel (= 4.2.9)
93+
activesupport (= 4.2.9)
9394
arel (~> 6.0)
94-
activesupport (4.2.8)
95+
activesupport (4.2.9)
9596
i18n (~> 0.7)
9697
minitest (~> 5.1)
9798
thread_safe (~> 0.3, >= 0.3.4)
@@ -114,7 +115,7 @@ GEM
114115
bindata (2.4.0)
115116
bit-struct (0.16)
116117
builder (3.2.3)
117-
capybara (2.14.3)
118+
capybara (2.14.4)
118119
addressable
119120
mime-types (>= 1.16)
120121
nokogiri (>= 1.3.3)
@@ -166,11 +167,11 @@ GEM
166167
multi_json (~> 1.11)
167168
os (~> 0.9)
168169
signet (~> 0.7)
169-
grpc (1.4.0)
170+
grpc (1.4.1)
170171
google-protobuf (~> 3.1)
171172
googleauth (~> 0.5.1)
172173
hashery (2.1.2)
173-
i18n (0.8.4)
174+
i18n (0.8.6)
174175
jsobfu (0.4.2)
175176
rkelly-remix
176177
json (2.1.0)
@@ -268,14 +269,14 @@ GEM
268269
rails-deprecated_sanitizer (>= 1.0.1)
269270
rails-html-sanitizer (1.0.3)
270271
loofah (~> 2.0)
271-
railties (4.2.8)
272-
actionpack (= 4.2.8)
273-
activesupport (= 4.2.8)
272+
railties (4.2.9)
273+
actionpack (= 4.2.9)
274+
activesupport (= 4.2.9)
274275
rake (>= 0.8.7)
275276
thor (>= 0.18.1, < 2.0)
276277
rake (12.0.0)
277278
rb-readline (0.5.4)
278-
recog (2.1.10)
279+
recog (2.1.11)
279280
nokogiri
280281
redcarpet (3.4.0)
281282
rex-arch (0.1.9)
@@ -286,7 +287,7 @@ GEM
286287
rex-core
287288
rex-struct2
288289
rex-text
289-
rex-core (0.1.10)
290+
rex-core (0.1.11)
290291
rex-encoder (0.1.4)
291292
metasm
292293
rex-arch
@@ -375,7 +376,7 @@ GEM
375376
sshkey (1.9.0)
376377
thor (0.19.4)
377378
thread_safe (0.3.6)
378-
timecop (0.9.0)
379+
timecop (0.9.1)
379380
ttfunk (1.5.1)
380381
tzinfo (1.2.3)
381382
thread_safe (~> 0.1)
@@ -386,7 +387,7 @@ GEM
386387
activemodel (>= 4.2.7)
387388
activesupport (>= 4.2.7)
388389
xmlrpc (0.3.0)
389-
xpath (2.1.0)
390+
xpath (2.0.0)
390391
nokogiri (~> 1.3)
391392
yard (0.9.9)
392393

metasploit-framework.gemspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,6 @@ Gem::Specification.new do |spec|
184184
spec.add_runtime_dependency 'nexpose'
185185
# Needed for NDMP sockets
186186
spec.add_runtime_dependency 'xdr'
187+
# Needed for the xpath
188+
spec.add_runtime_dependency 'xpath', '2.0'
187189
end

0 commit comments

Comments
 (0)