Skip to content

Commit 9718483

Browse files
committed
Remove license_scout as direct dependency from omnibus/Gemfile since omnibus also pulls in license_scout as its direct dependency, bundle update license_scout gets blocked. Bump omnibus to pull in latest license_scout
Signed-off-by: neha-p6 <neha.pansare@progress.com>
1 parent d55d096 commit 9718483

File tree

2 files changed

+17
-25
lines changed

2 files changed

+17
-25
lines changed

omnibus/Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ group :omnibus do
55
gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main")
66
gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main")
77
gem 'artifactory'
8-
gem 'license_scout', git: "https://github.com/chef/license_scout.git", branch: "1-stable"
98
gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1"
109
end
1110

omnibus/Gemfile.lock

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
GIT
2-
remote: https://github.com/chef/license_scout.git
3-
revision: 9f00bccb86bea89193b0fc745aed654be2d14046
4-
branch: 1-stable
5-
specs:
6-
license_scout (1.3.19)
7-
ffi-yajl (~> 2.2)
8-
mixlib-shellout (>= 2.2, < 4.0)
9-
toml-rb (>= 1, < 3)
10-
111
GIT
122
remote: https://github.com/chef/omnibus-software.git
133
revision: 0cb128b237c26b5796370b761adbd499f71e5413
@@ -18,19 +8,19 @@ GIT
188

199
GIT
2010
remote: https://github.com/chef/omnibus.git
21-
revision: 39f0b3049936841589406bdcfb9d115f4db17041
11+
revision: b9f4c8f7ae7d01faebf6ee9188abcf207a4e823d
2212
branch: main
2313
specs:
24-
omnibus (9.1.1)
14+
omnibus (9.1.5)
2515
aws-sdk-s3 (~> 1.116.0)
2616
chef-cleanroom (~> 1.0)
2717
chef-utils (>= 15.4)
2818
contracts (>= 0.16.0, < 0.17.0)
2919
ffi-yajl (~> 2.2)
30-
license_scout (~> 1.3.17)
20+
license_scout (~> 1.4.0)
3121
mixlib-shellout (>= 2.0, < 4.0)
3222
mixlib-versioning
33-
ohai (>= 16, < 19)
23+
ohai (>= 18.2.6, < 19)
3424
pedump
3525
rexml (~> 3.4)
3626
ruby-progressbar (~> 1.7)
@@ -72,17 +62,17 @@ GEM
7262
ast (2.4.3)
7363
awesome_print (1.9.2)
7464
aws-eventstream (1.4.0)
75-
aws-partitions (1.1147.0)
76-
aws-sdk-core (3.229.0)
65+
aws-partitions (1.1181.0)
66+
aws-sdk-core (3.237.0)
7767
aws-eventstream (~> 1, >= 1.3.0)
7868
aws-partitions (~> 1, >= 1.992.0)
7969
aws-sigv4 (~> 1.9)
8070
base64
8171
bigdecimal
8272
jmespath (~> 1, >= 1.6.1)
8373
logger
84-
aws-sdk-kms (1.110.0)
85-
aws-sdk-core (~> 3, >= 3.228.0)
74+
aws-sdk-kms (1.117.0)
75+
aws-sdk-core (~> 3, >= 3.234.0)
8676
aws-sigv4 (~> 1.5)
8777
aws-sdk-s3 (1.116.0)
8878
aws-sdk-core (~> 3, >= 3.127.0)
@@ -111,7 +101,7 @@ GEM
111101
retryable (>= 2.0, < 4.0)
112102
solve (~> 4.0)
113103
thor (>= 0.20, < 1.3.0)
114-
bigdecimal (3.2.2)
104+
bigdecimal (3.3.1)
115105
builder (3.3.0)
116106
cgi (0.5.0)
117107
chef (18.8.46)
@@ -278,14 +268,18 @@ GEM
278268
rdoc (>= 4.0.0)
279269
reline (>= 0.4.2)
280270
jmespath (1.6.2)
281-
json (2.13.2)
271+
json (2.16.0)
282272
language_server-protocol (3.17.0.5)
283273
libyajl2 (2.1.0)
284274
license-acceptance (2.1.13)
285275
pastel (~> 0.7)
286276
tomlrb (>= 1.2, < 3.0)
287277
tty-box (~> 0.6)
288278
tty-prompt (~> 0.20)
279+
license_scout (1.4.1)
280+
ffi-yajl (~> 2.2)
281+
mixlib-shellout (>= 2.2, < 4.0)
282+
toml-rb (>= 1, < 3)
289283
lint_roller (1.1.0)
290284
little-plugger (1.1.4)
291285
logger (1.7.0)
@@ -359,9 +353,9 @@ GEM
359353
parslet (2.0.0)
360354
pastel (0.8.0)
361355
tty-color (~> 0.5)
362-
pedump (0.6.10)
356+
pedump (0.7.3)
363357
awesome_print
364-
iostruct (>= 0.0.4)
358+
iostruct (>= 0.5.0)
365359
multipart-post (>= 2.0.0)
366360
rainbow
367361
zhexdump (>= 0.0.2)
@@ -392,7 +386,7 @@ GEM
392386
reline (0.6.2)
393387
io-console (~> 0.5)
394388
retryable (3.0.5)
395-
rexml (3.4.2)
389+
rexml (3.4.4)
396390
rspec (3.13.2)
397391
rspec-core (~> 3.13.0)
398392
rspec-expectations (~> 3.13.0)
@@ -548,7 +542,6 @@ DEPENDENCIES
548542
artifactory
549543
berkshelf (~> 8.0.22)
550544
chef (~> 18.8.46)
551-
license_scout!
552545
omnibus!
553546
omnibus-software!
554547
rake

0 commit comments

Comments
 (0)