summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn <john.mccrae@progress.com>2022-12-09 09:27:17 -0800
committerJohn <john.mccrae@progress.com>2022-12-09 09:27:17 -0800
commitba351e31cc6406b18cfe99ae784c7d0274e884f8 (patch)
tree600a386eadc57c33239558e6bdc28192b3fdfd97
parent02ba298206f8d675b05c0eb6f6f5a0457cc11079 (diff)
downloadchef-ba351e31cc6406b18cfe99ae784c7d0274e884f8.tar.gz
Revert "Overriding dependabot and bumping gem versions"
This reverts commit 02ba298206f8d675b05c0eb6f6f5a0457cc11079.
-rw-r--r--Gemfile.lock101
-rw-r--r--omnibus/Gemfile.lock12
2 files changed, 96 insertions, 17 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c1754d704c..30c56ce498 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,6 +35,13 @@ GIT
netrc (~> 0.8)
GIT
+ remote: https://github.com/chef/ruby-shadow
+ revision: 3b8ea40b0e943b5de721d956741308ce805a5c3c
+ branch: lcg/ruby-3.0
+ specs:
+ ruby-shadow (2.5.0)
+
+GIT
remote: https://github.com/chef/ruby-proxifier
revision: 8b87d0b5b469adbd93eabc0d20f3e47007aef743
branch: lcg/ruby-3
@@ -78,6 +85,52 @@ PATH
unf_ext (>= 0.0.8.2)
uuidtools (>= 2.1.5, < 3.0)
vault (~> 0.16)
+ chef (18.0.196-x64-mingw-ucrt)
+ addressable
+ aws-sdk-s3 (~> 1.91)
+ aws-sdk-secretsmanager (~> 1.46)
+ chef-config (= 18.0.196)
+ chef-powershell (~> 1.0.12)
+ chef-utils (= 18.0.196)
+ chef-vault
+ chef-zero (>= 14.0.11)
+ corefoundation (~> 0.3.4)
+ diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
+ erubis (~> 2.7)
+ ffi (>= 1.15.5)
+ ffi-libarchive (~> 1.0, >= 1.0.3)
+ ffi-yajl (~> 2.2)
+ iniparse (~> 1.4)
+ inspec-core (>= 5)
+ iso8601 (>= 0.12.1, < 0.14)
+ license-acceptance (>= 1.0.5, < 3)
+ mixlib-archive (>= 0.4, < 2.0)
+ mixlib-authentication (>= 2.1, < 4)
+ mixlib-cli (>= 2.1.1, < 3.0)
+ mixlib-log (>= 2.0.3, < 4.0)
+ mixlib-shellout (>= 3.1.1, < 4.0)
+ net-ftp
+ net-sftp (>= 2.1.2, < 5.0)
+ ohai (~> 18.0)
+ plist (~> 3.2)
+ proxifier (~> 1.0)
+ syslog-logger (~> 1.6)
+ train-core (~> 3.10)
+ train-rest (>= 0.4.1)
+ train-winrm (>= 0.2.5)
+ unf_ext (>= 0.0.8.2)
+ uuidtools (>= 2.1.5, < 3.0)
+ vault (~> 0.16)
+ win32-api (~> 1.10.0)
+ win32-certstore (~> 0.6.15)
+ win32-event (~> 0.6.1)
+ win32-eventlog (= 0.6.3)
+ win32-mmap (~> 0.4.1)
+ win32-mutex (~> 0.4.2)
+ win32-process (~> 0.9)
+ win32-service (>= 2.1.5, < 3.0)
+ win32-taskscheduler (~> 2.0)
+ wmi-lite (~> 1.0)
PATH
remote: chef-bin
@@ -112,16 +165,16 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.2)
aws-eventstream (1.2.0)
- aws-partitions (1.674.0)
- aws-sdk-core (3.168.4)
+ aws-partitions (1.668.0)
+ aws-sdk-core (3.168.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
- aws-sdk-kms (1.61.0)
+ aws-sdk-kms (1.60.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.117.2)
+ aws-sdk-s3 (1.117.1)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@@ -134,6 +187,9 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.3)
+ chef-powershell (1.0.13)
+ ffi (~> 1.15)
+ ffi-yajl (~> 2.4)
chef-telemetry (1.1.1)
chef-config
concurrent-ruby (~> 1.0)
@@ -157,7 +213,7 @@ GEM
ffi (>= 1.15.0)
crack (0.4.5)
rexml
- date (3.3.1)
+ date (3.2.2)
debug_inspector (1.1.0)
diff-lcs (1.5.0)
domain_name (0.5.20190701)
@@ -229,8 +285,9 @@ GEM
inspec-core-bin (5.18.14)
inspec-core (= 5.18.14)
ipaddress (0.8.3)
+ iso8601 (0.13.0)
jmespath (1.6.2)
- json (2.6.3)
+ json (2.6.2)
libyajl2 (2.1.0)
license-acceptance (2.1.13)
pastel (~> 0.7)
@@ -264,7 +321,7 @@ GEM
net-ftp (0.2.0)
net-protocol
time
- net-protocol (0.2.1)
+ net-protocol (0.1.3)
timeout
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
@@ -289,7 +346,7 @@ GEM
pry-stack_explorer (0.6.1)
binding_of_caller (~> 1.0)
pry (~> 0.13)
- public_suffix (5.0.1)
+ public_suffix (5.0.0)
rack (2.2.4)
rainbow (3.1.1)
rake (13.0.6)
@@ -321,7 +378,7 @@ GEM
rubocop-ast (>= 1.15.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
- rubocop-ast (1.24.0)
+ rubocop-ast (1.23.0)
parser (>= 3.1.1.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
@@ -334,11 +391,12 @@ GEM
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
+ structured_warnings (0.4.0)
syslog-logger (1.6.8)
thor (1.2.1)
time (0.2.0)
date
- timeout (0.3.1)
+ timeout (0.3.0)
tomlrb (1.3.0)
train-core (3.10.7)
addressable (~> 2.5)
@@ -387,8 +445,28 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.7.0)
+ win32-api (1.10.1)
+ win32-certstore (0.6.15)
+ chef-powershell (>= 1.0.12)
+ ffi
+ win32-event (0.6.3)
+ win32-ipc (>= 0.6.0)
+ win32-eventlog (0.6.3)
+ ffi
+ win32-ipc (0.7.0)
+ ffi
+ win32-mmap (0.4.2)
+ ffi
+ win32-mutex (0.4.3)
+ win32-ipc (>= 0.6.0)
win32-process (0.10.0)
ffi (>= 1.0.0)
+ win32-service (2.3.2)
+ ffi
+ ffi-win32-extensions
+ win32-taskscheduler (2.0.4)
+ ffi
+ structured_warnings
winrm (2.3.6)
builder (>= 2.1.2)
erubi (~> 1.8)
@@ -436,7 +514,8 @@ DEPENDENCIES
rb-readline
rest-client!
rspec
+ ruby-shadow!
webmock
BUNDLED WITH
- 2.3.18
+ 2.3.17
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index b0a374753b..280b4121ba 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/omnibus.git
- revision: 2c058e1c4dc4624328ab73662ace66d638eb1573
+ revision: 52b6d2e08bc2c90592b99da41a1728fb1629f673
branch: main
specs:
- omnibus (9.0.14)
+ omnibus (9.0.12)
aws-sdk-s3 (~> 1.116.0)
chef-cleanroom (~> 1.0)
chef-utils (>= 15.4)
@@ -178,7 +178,7 @@ GEM
contracts (0.16.1)
corefoundation (0.3.13)
ffi (>= 1.15.0)
- date (3.3.1)
+ date (3.2.2)
diff-lcs (1.5.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
@@ -303,7 +303,7 @@ GEM
net-ftp (0.2.0)
net-protocol
time
- net-protocol (0.2.1)
+ net-protocol (0.1.3)
timeout
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
@@ -419,7 +419,7 @@ GEM
thor (1.2.1)
time (0.2.0)
date
- timeout (0.3.1)
+ timeout (0.3.0)
toml-rb (2.2.0)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
@@ -465,7 +465,7 @@ GEM
vault (0.17.0)
aws-sigv4
webrick (1.7.0)
- win32-api (1.10.1)
+ win32-api (1.10.1-universal-mingw32)
win32-certstore (0.6.15)
chef-powershell (>= 1.0.12)
ffi