summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremiah Snapp <jeremiah@chef.io>2019-08-02 17:06:55 -0400
committerJeremiah Snapp <jeremiah@chef.io>2019-08-02 17:06:55 -0400
commit18a9f982a7f241651f012de7ec223867455e525e (patch)
tree895848cca19a107744283685d26f4811a947201f
parentcf743e1152c54cf616a5266025cd278306f1b0db (diff)
downloadchef-18a9f982a7f241651f012de7ec223867455e525e.tar.gz
Add artifactory to omnibus/Gemfile and update omnibus gem
A new version of omnibus is required and the artifactory gem is required for the publish part of the build stage. Signed-off-by: Jeremiah Snapp <jeremiah@chef.io>
-rw-r--r--omnibus/Gemfile1
-rw-r--r--omnibus/Gemfile.lock22
2 files changed, 13 insertions, 10 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 3580039d4f..2a12aafccb 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -2,6 +2,7 @@ source "https://rubygems.org"
gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "artifactory"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 15fb8c0ed2..5b8b1c0d5e 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 968307c129ee54416f5a4d07ca8f8ca2d2b12825
+ revision: 33bddeefb10afe23a57ea72807625881ab01990f
branch: master
specs:
- omnibus (6.0.27)
+ omnibus (6.1.0)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -30,19 +30,20 @@ GEM
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
+ artifactory (3.0.5)
awesome_print (1.8.0)
aws-eventstream (1.0.3)
- aws-partitions (1.169.0)
- aws-sdk-core (3.54.0)
+ aws-partitions (1.196.0)
+ aws-sdk-core (3.62.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.21.0)
- aws-sdk-core (~> 3, >= 3.53.0)
+ aws-sdk-kms (1.24.0)
+ aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.41.0)
- aws-sdk-core (~> 3, >= 3.53.0)
+ aws-sdk-s3 (1.46.0)
+ aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.0)
@@ -206,7 +207,7 @@ GEM
mixlib-archive (1.0.1-universal-mingw32)
mixlib-log
mixlib-authentication (2.1.1)
- mixlib-cli (2.0.6)
+ mixlib-cli (2.1.1)
mixlib-config (3.0.1)
tomlrb
mixlib-install (3.11.18)
@@ -270,7 +271,7 @@ GEM
pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
- public_suffix (3.1.0)
+ public_suffix (3.1.1)
rack (2.0.7)
retryable (3.0.4)
rspec (3.8.0)
@@ -410,6 +411,7 @@ PLATFORMS
x86-mingw32
DEPENDENCIES
+ artifactory
berkshelf (>= 7.0)
kitchen-vagrant
ohai (~> 14.0)