summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-07-07 18:32:13 -0700
committerGitHub <noreply@github.com>2020-07-07 18:32:13 -0700
commit6c562ea3a291ce5f0896953910f4f42f8cda8971 (patch)
tree821424e893c099c038f7432a3aa93ebe633f4415
parentbae0c63245b50ec5b56287589907b167bf2b63d2 (diff)
parentf44e2eb58d190907860e70fbd955a7647c93aea3 (diff)
downloadchef-6c562ea3a291ce5f0896953910f4f42f8cda8971.tar.gz
Merge pull request #10128 from chef/iso8601
Allow iso8601 gem version 0.13
-rw-r--r--Gemfile.lock8
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-universal-mingw32.gemspec2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock2
6 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 05e82266c9..870569b84b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,10 +8,10 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 8028951abb141fef97a9b2ddc5e2120f63fbc16a
+ revision: 0a6530f2b7fdf225a7ca0ae54459cfce9b8d3b4c
branch: master
specs:
- ohai (16.2.3)
+ ohai (16.2.4)
chef-config (>= 12.8, < 17)
chef-utils (>= 16.0, < 17)
ffi (~> 1.9)
@@ -78,7 +78,7 @@ PATH
ffi-yajl (~> 2.2)
highline (>= 1.6.9, < 3)
iniparse (~> 1.4)
- iso8601 (~> 0.12.1)
+ iso8601 (>= 0.12.1, < 0.14)
license-acceptance (~> 1.0, >= 1.0.5)
mixlib-archive (>= 0.4, < 2.0)
mixlib-authentication (>= 2.1, < 4)
@@ -226,7 +226,7 @@ GEM
inspec-core-bin (4.21.3)
inspec-core (= 4.21.3)
ipaddress (0.8.3)
- iso8601 (0.12.3)
+ iso8601 (0.13.0)
json (2.3.1)
json_schemer (0.2.11)
ecma-re-validator (~> 0.2)
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 10590b30ce..a7278ca1e9 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -14,6 +14,6 @@
# limitations under the License.
module ChefConfig
- CHEFCONFIG_ROOT = File.expand_path('..', __dir__)
+ CHEFCONFIG_ROOT = File.expand_path("..", __dir__)
VERSION = "16.2.87".freeze
end
diff --git a/chef-universal-mingw32.gemspec b/chef-universal-mingw32.gemspec
index 9aa286ee82..21429b38ab 100644
--- a/chef-universal-mingw32.gemspec
+++ b/chef-universal-mingw32.gemspec
@@ -14,7 +14,7 @@ gemspec.add_dependency "win32-process", "~> 0.8.2"
gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
gemspec.add_dependency "wmi-lite", "~> 1.0"
gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
-gemspec.add_dependency "iso8601", "~> 0.12.1"
+gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
gemspec.add_dependency "win32-certstore", "~> 0.3"
gemspec.extensions << "ext/win32-eventlog/Rakefile"
gemspec.files += Dir.glob("{distro,ext}/**/*")
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 267363eeea..26a7f6c1c3 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -14,6 +14,6 @@
# limitations under the License.
module ChefUtils
- CHEFUTILS_ROOT = File.expand_path('..', __dir__)
+ CHEFUTILS_ROOT = File.expand_path("..", __dir__)
VERSION = "16.2.87".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 22c2f0976d..5300cb4013 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -22,7 +22,7 @@
require_relative "version_string"
class Chef
- CHEF_ROOT = File.expand_path('..', __dir__)
+ CHEF_ROOT = File.expand_path("..", __dir__)
VERSION = Chef::VersionString.new("16.2.87")
end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 026d6dd5b5..00c685a6f1 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.338.0)
+ aws-partitions (1.339.0)
aws-sdk-core (3.103.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)