summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-09-28 11:04:34 +0600
committerJohn McCrae <john.mccrae@progress.com>2022-09-28 11:04:34 +0600
commitb7159a8dda464d0e712701afcf337b3e14eae482 (patch)
tree59fc2a8d48329421b4931167e22e43f8134cc0bb
parentdd982bc5014498fe21b03de5d41f881f7a2bbcdb (diff)
downloadchef-b7159a8dda464d0e712701afcf337b3e14eae482.tar.gz
testing a build with updated gems AND the whitelist changes
Signed-off-by: John McCrae <john.mccrae@progress.com>
-rw-r--r--Gemfile.lock30
-rw-r--r--omnibus/Gemfile3
-rw-r--r--omnibus/Gemfile.lock30
3 files changed, 33 insertions, 30 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e1d917dade..b9ca2d5d15 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/ohai.git
- revision: 89e6a08889f414efabc53a1c15c418baddc5cd2d
+ revision: 3855db320bf14766e37eaeb1bb61ba87c2542ac8
branch: main
specs:
- ohai (18.0.20)
+ ohai (18.0.24)
chef-config (>= 14.12, < 19)
chef-utils (>= 16.0, < 19)
ffi (~> 1.9)
@@ -158,15 +158,15 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
appbundler (0.13.4)
mixlib-cli (>= 1.4, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.2)
aws-eventstream (1.2.0)
- aws-partitions (1.627.0)
- aws-sdk-core (3.143.0)
+ aws-partitions (1.638.0)
+ aws-sdk-core (3.156.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
@@ -304,6 +304,8 @@ GEM
mime-types-data (3.2022.0105)
mixlib-archive (1.1.7)
mixlib-log
+ mixlib-archive (1.1.7-universal-mingw32)
+ mixlib-log
mixlib-authentication (3.0.10)
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
@@ -340,18 +342,18 @@ GEM
pry (0.13.0)
coderay (~> 1.1)
method_source (~> 1.0)
- pry-byebug (3.9.0)
+ pry-byebug (3.10.1)
byebug (~> 11.0)
- pry (~> 0.13.0)
+ pry (>= 0.13, < 0.15)
pry-stack_explorer (0.6.1)
binding_of_caller (~> 1.0)
pry (~> 0.13)
- public_suffix (4.0.7)
+ public_suffix (5.0.0)
rack (2.2.4)
rainbow (3.1.1)
rake (13.0.6)
rb-readline (0.5.5)
- regexp_parser (2.5.0)
+ regexp_parser (2.6.0)
rexml (3.2.5)
rspec (3.11.0)
rspec-core (~> 3.11.0)
@@ -359,7 +361,7 @@ GEM
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
- rspec-expectations (3.11.0)
+ rspec-expectations (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-its (1.3.0)
@@ -368,7 +370,7 @@ GEM
rspec-mocks (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
- rspec-support (3.11.0)
+ rspec-support (3.11.1)
rubocop (1.25.1)
parallel (~> 1.10)
parser (>= 3.1.0.0)
@@ -435,12 +437,12 @@ GEM
unf_ext
unf_ext (0.0.8.2)
unf_ext (0.0.8.2-x64-mingw-ucrt)
- unicode-display_width (2.2.0)
+ unicode-display_width (2.3.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
vault (0.17.0)
aws-sigv4
- webmock (3.17.1)
+ webmock (3.18.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index a8d16ac939..c6589d956b 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,6 +1,7 @@
source "https://rubygems.org"
-gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main")
+# gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main")
+gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "praj/INFC-268/whitelist_solaris_libs")
gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main")
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 7d0e73c12c..ad70ec7e75 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus.git
- revision: 5b41f817c386d598c57652f1e1340ea312ed487d
- branch: main
+ revision: 0dbab02e77d8c4ada0ecb43c0c7ce104dd4481699
+ branch: praj/INFC-268/whitelist_solaris_libs
specs:
omnibus (9.0.6)
aws-sdk-s3 (~> 1)
@@ -29,13 +29,13 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
+ addressable (2.8.1)
+ public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
awesome_print (1.9.2)
aws-eventstream (1.2.0)
- aws-partitions (1.610.0)
- aws-sdk-core (3.131.3)
+ aws-partitions (1.638.0)
+ aws-sdk-core (3.156.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
@@ -47,7 +47,7 @@ GEM
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
- aws-sdk-secretsmanager (1.64.0)
+ aws-sdk-secretsmanager (1.65.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.5.1)
@@ -174,7 +174,7 @@ GEM
ffi (>= 1.15.0)
diff-lcs (1.5.0)
ed25519 (1.3.0)
- erubi (1.10.0)
+ erubi (1.11.0)
erubis (2.7.0)
faraday (1.4.3)
faraday-em_http (~> 1.0)
@@ -264,7 +264,7 @@ GEM
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
tomlrb
- mixlib-install (3.12.19)
+ mixlib-install (3.12.20)
mixlib-shellout
mixlib-versioning
thor
@@ -324,7 +324,7 @@ GEM
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
- public_suffix (4.0.7)
+ public_suffix (5.0.0)
rack (2.2.4)
rainbow (3.1.1)
retryable (3.0.5)
@@ -335,7 +335,7 @@ GEM
rspec-mocks (~> 3.11.0)
rspec-core (3.11.0)
rspec-support (~> 3.11.0)
- rspec-expectations (3.11.0)
+ rspec-expectations (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
rspec-its (1.3.0)
@@ -344,7 +344,7 @@ GEM
rspec-mocks (3.11.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.11.0)
- rspec-support (3.11.0)
+ rspec-support (3.11.1)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.5)
rubyntlm (0.6.3)
@@ -364,7 +364,7 @@ GEM
strings-ansi (0.2.0)
structured_warnings (0.4.0)
syslog-logger (1.6.8)
- test-kitchen (3.3.1)
+ test-kitchen (3.3.2)
bcrypt_pbkdf (~> 1.0)
chef-utils (>= 16.4.35)
ed25519 (~> 1.2)
@@ -411,7 +411,7 @@ GEM
pastel (~> 0.8)
strings (~> 0.2.0)
tty-screen (~> 0.8)
- unicode-display_width (2.2.0)
+ unicode-display_width (2.3.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
vault (0.17.0)
@@ -479,4 +479,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 2.3.7
+ 2.3.21