Skip to content

Commit b4c71b6

Browse files
RoyShravanijashaik
andauthored
[CHEF-26124] Fix dependabot issues (#4100)
* sqlite 3.50.4 Signed-off-by: RoyShravani <shravani.roy@progress.com> * testing sqlite in refresh channel Signed-off-by: RoyShravani <shravani.roy@progress.com> * refresh channel Signed-off-by: RoyShravani <shravani.roy@progress.com> * revert Signed-off-by: RoyShravani <shravani.roy@progress.com> * rails 7.1.5.2 Signed-off-by: RoyShravani <shravani.roy@progress.com> * revert zetwerk update Signed-off-by: RoyShravani <shravani.roy@progress.com> * bundle update Signed-off-by: RoyShravani <shravani.roy@progress.com> * fixes Signed-off-by: RoyShravani <shravani.roy@progress.com> * updating chef gem * Updated chef version to 18.8.46 in omnibus_overrides.rb Signed-off-by: Jan Shahid Shaik <jashaik@progress.com> --------- Signed-off-by: RoyShravani <shravani.roy@progress.com> Signed-off-by: Jan Shahid Shaik <jashaik@progress.com> Co-authored-by: Jan Shahid Shaik <jashaik@progress.com>
1 parent 6d685fe commit b4c71b6

15 files changed

Lines changed: 224 additions & 177 deletions

File tree

oc-chef-pedant/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ gem "rake"
1010
# We require chef internally to get the version in
1111
# lib/pedant/request.rb. It's really strange code and it should be
1212
# revisited.
13-
gem "chef", "18.8.11"
13+
gem "chef", "18.8.46"
1414

1515
# For "rake chef_zero_spec"
1616
# gem 'chef-zero', github: 'chef/chef-zero'

oc-chef-pedant/Gemfile.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ GEM
6060
debug_inspector (>= 1.2.0)
6161
builder (3.3.0)
6262
byebug (12.0.0)
63-
chef (18.8.11)
64-
activesupport (>= 4.2.7.1, <= 7.1.3.2)
63+
chef (18.8.46)
64+
activesupport (>= 4.2.7.1, <= 7.1.5.2)
6565
addressable
6666
aws-sdk-s3 (~> 1.91)
6767
aws-sdk-secretsmanager (~> 1.46)
68-
chef-config (= 18.8.11)
69-
chef-utils (= 18.8.11)
68+
chef-config (= 18.8.46)
69+
chef-utils (= 18.8.46)
7070
chef-vault
7171
chef-zero (>= 15.0.21)
7272
corefoundation (~> 0.3.4)
@@ -89,16 +89,16 @@ GEM
8989
plist (~> 3.2)
9090
proxifier2 (~> 1.1)
9191
syslog-logger (~> 1.6)
92-
train-core (~> 3.10, <= 3.12.13)
92+
train-core (~> 3.13, >= 3.13.4)
9393
train-rest (>= 0.4.1)
9494
train-winrm (~> 0.2.17)
9595
unf_ext (~> 0.0.8.2)
9696
uri (~> 1.0.3)
9797
uuidtools (>= 2.1.5, < 3.0)
9898
vault (~> 0.18.2)
99-
chef-config (18.8.11)
99+
chef-config (18.8.46)
100100
addressable
101-
chef-utils (= 18.8.11)
101+
chef-utils (= 18.8.46)
102102
fuzzyurl
103103
mixlib-config (>= 2.2.12, < 4.0)
104104
mixlib-shellout (>= 2.0, < 4.0)
@@ -109,7 +109,7 @@ GEM
109109
chef-telemetry (1.1.1)
110110
chef-config
111111
concurrent-ruby (~> 1.0)
112-
chef-utils (18.8.11)
112+
chef-utils (18.8.46)
113113
concurrent-ruby
114114
chef-vault (4.1.23)
115115
chef-winrm (2.3.12)
@@ -181,7 +181,7 @@ GEM
181181
i18n (1.14.7)
182182
concurrent-ruby (~> 1.0)
183183
iniparse (1.5.0)
184-
inspec-core (5.22.95)
184+
inspec-core (5.23.6)
185185
addressable (~> 2.4)
186186
chef-telemetry (~> 1.0, >= 1.0.8)
187187
cookstyle
@@ -202,7 +202,7 @@ GEM
202202
sslshake (~> 1.2)
203203
thor (>= 0.20, < 1.5.0)
204204
tomlrb (>= 1.2, < 2.1)
205-
train-core (~> 3.12.13)
205+
train-core (~> 3.13, >= 3.13.4)
206206
tty-prompt (~> 0.17)
207207
tty-table (~> 0.10)
208208
ipaddress (0.8.3)
@@ -353,9 +353,9 @@ GEM
353353
date
354354
timeout (0.4.3)
355355
tomlrb (1.3.0)
356-
train-core (3.12.13)
356+
train-core (3.13.4)
357357
addressable (~> 2.5)
358-
ffi (!= 1.13.0)
358+
ffi (~> 1.16.0)
359359
json (>= 1.8, < 3.0)
360360
mixlib-shellout (>= 2.0, < 4.0)
361361
net-scp (>= 1.2, < 5.0)
@@ -404,7 +404,7 @@ PLATFORMS
404404
x86_64-linux
405405

406406
DEPENDENCIES
407-
chef (= 18.8.11)
407+
chef (= 18.8.46)
408408
oc-chef-pedant!
409409
pry
410410
pry-byebug

oc-chef-pedant/Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def bundle_exec_with_chef(test_gem, commands)
2727
# TODO: one of workaround to fix verify pipeline failure
2828
# Could not found another way to update chef version without releasing new chef-zero gem
2929
elsif line =~ /^\s*gem\s*['"]chef['"]\s*,?.*$/ # foodcritic end
30-
line = "gem \"chef\", \"~> 18.8.11\""
30+
line = "gem \"chef\", \"~> 18.8.46\""
3131
elsif line =~ /^\s*gem\s*['"]ohai['"]\s*,?.*$/ # foodcritic end
3232
line = "gem \"ohai\", \"~> 18.0\""
3333
elsif line =~ /\s*gem\s*['"]#{test_gem}['"]/ # foodcritic end

omnibus/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ group :test do
1212
gem 'test-kitchen' # for Test Kitchen testing of the omnibus builds
1313
gem 'berkshelf', '~> 8.0.22' # depsolving the Test Kitchen suite
1414
gem 'archive-tar-minitar' # required by berkshelf for packaging
15-
gem 'chef', '~> 18.8.11'
15+
gem 'chef', '~> 18.8.46'
1616
gem 'rake'
1717
end

0 commit comments

Comments
 (0)