diff --git a/components/gems/Gemfile b/components/gems/Gemfile index 5ec171804..90158fc9b 100644 --- a/components/gems/Gemfile +++ b/components/gems/Gemfile @@ -44,10 +44,6 @@ end group(:omnibus_package) do gem "appbundler" - ## Until we resolve https://github.com/inspec/train/issues/548 - gem "train", "=3.2.0" - gem "train-core", "=3.2.0" - # Expeditor manages the version of chef released to Rubygems. We only release 'stable' chef # gems to Rubygems now, so letting this float on latest should always give us the latest # stable release. May have to re-pin around major version bumping time, or during patch diff --git a/components/gems/Gemfile.lock b/components/gems/Gemfile.lock index 2b1a49478..23a6782d3 100644 --- a/components/gems/Gemfile.lock +++ b/components/gems/Gemfile.lock @@ -837,20 +837,19 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train (3.2.0) + train (3.2.28) activesupport (~> 5.2.3) azure_graph_rbac (~> 0.16) azure_mgmt_key_vault (~> 0.17) azure_mgmt_resources (~> 0.15) azure_mgmt_security (~> 0.18) + azure_mgmt_storage (~> 0.18) docker-api (~> 1.26) google-api-client (>= 0.23.9, < 0.35.0) googleauth (>= 0.6.6, < 0.11.0) - inifile - json (>= 1.8, < 3.0) - mixlib-shellout (>= 2.0, < 4.0) - net-scp (>= 1.2, < 3.0) - net-ssh (>= 2.9, < 6.0) + inifile (~> 3.0) + train-core (= 3.2.28) + train-winrm (~> 0.2) train-aws (0.1.15) aws-sdk-apigateway (~> 1.0) aws-sdk-apigatewayv2 (~> 1.0) @@ -898,7 +897,8 @@ GEM aws-sdk-sns (~> 1.9) aws-sdk-sqs (~> 1.10) aws-sdk-ssm (~> 1.0) - train-core (3.2.0) + train-core (3.2.28) + addressable (~> 2.5) json (>= 1.8, < 3.0) mixlib-shellout (>= 2.0, < 4.0) net-scp (>= 1.2, < 3.0) @@ -1094,8 +1094,6 @@ DEPENDENCIES ruby-shadow stove (>= 7.1.5) test-kitchen (>= 2.0) - train (= 3.2.0) - train-core (= 3.2.0) win32-api win32-dir win32-event diff --git a/components/gems/Rakefile b/components/gems/Rakefile index 3abf78295..f12fe1fee 100644 --- a/components/gems/Rakefile +++ b/components/gems/Rakefile @@ -24,8 +24,6 @@ task :update do require "bundler" Bundler.with_clean_env do rm_f "Gemfile.lock" - sh "bundle _1.17.3_ lock --update --add-platform ruby" - sh "bundle _1.17.3_ lock --update --add-platform x64-mingw32" - sh "bundle _1.17.3_ lock --update --add-platform x86-mingw32" + sh "bundle _1.17.3_ lock --update --add-platform ruby x64-mingw32 x86-mingw32" end end