Skip to content

Commit 7a2753f

Browse files
authored
Merge pull request #20377 from adfoster-r7/update-license-generation
Update license generation
2 parents 14fb001 + c2007c7 commit 7a2753f

File tree

3 files changed

+17
-2
lines changed

3 files changed

+17
-2
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ group :development do
3131
end
3232

3333
group :development, :test do
34+
# For ./tools/dev/update_gem_licenses.sh
35+
gem 'license_finder', '5.11.1'
3436
# running documentation generation tasks and rspec tasks
3537
gem 'rake'
3638
# Define `rake spec`. Must be in development AND test so that its available by default as a rake test when the

Gemfile.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,13 @@ GEM
299299
rkelly-remix
300300
json (2.10.2)
301301
language_server-protocol (3.17.0.5)
302+
license_finder (5.11.1)
303+
bundler
304+
rubyzip (>= 1, < 3)
305+
thor
306+
toml (= 0.2.0)
307+
with_env (= 1.1.0)
308+
xml-simple
302309
lint_roller (1.1.0)
303310
little-plugger (1.1.4)
304311
logger (1.6.6)
@@ -392,6 +399,7 @@ GEM
392399
parser (3.3.8.0)
393400
ast (~> 2.4.1)
394401
racc
402+
parslet (1.8.2)
395403
patch_finder (1.0.2)
396404
pcaprub (0.13.3)
397405
pdf-reader (2.14.1)
@@ -599,6 +607,8 @@ GEM
599607
tilt (2.6.0)
600608
timecop (0.9.10)
601609
timeout (0.4.3)
610+
toml (0.2.0)
611+
parslet (~> 1.8.0)
602612
ttfunk (1.8.0)
603613
bigdecimal (~> 3.1)
604614
tzinfo (2.0.6)
@@ -628,9 +638,12 @@ GEM
628638
nori (~> 2.0, >= 2.7.1)
629639
rexml (~> 3.0)
630640
rubyntlm (~> 0.6.0, >= 0.6.3)
641+
with_env (1.1.0)
631642
xdr (3.0.3)
632643
activemodel (>= 4.2, < 8.0)
633644
activesupport (>= 4.2, < 8.0)
645+
xml-simple (1.1.9)
646+
rexml
634647
xmlrpc (0.3.3)
635648
webrick
636649
yard (0.9.37)
@@ -644,6 +657,7 @@ DEPENDENCIES
644657
debug (>= 1.0.0)
645658
factory_bot_rails
646659
fivemat
660+
license_finder (= 5.11.1)
647661
memory_profiler
648662
metasploit-framework!
649663
octokit

tools/dev/update_gem_licenses.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
# This script regenerates the LICENSE_GEMS file with the current gem licenses.
44
# It should be run automatically whenever Metasploit cuts a new release itself.
55

6-
gem install license_finder --version "5.11.1"
76
echo "This file is auto-generated by tools/dev/update_gem_licenses.sh" > LICENSE_GEMS
8-
license_finder | grep , >> LICENSE_GEMS
7+
bundle exec license_finder | grep , >> LICENSE_GEMS

0 commit comments

Comments
 (0)