From b0c7d047279ad5dbdef81845cff8d643f26c2d22 Mon Sep 17 00:00:00 2001 From: Michael Bloch Date: Thu, 13 Jul 2023 11:46:11 +1000 Subject: [PATCH] fixed dependency error --- Gemfile | 15 ++-- Gemfile.lock | 235 +++++++++++++++++++++++++++------------------------ 2 files changed, 134 insertions(+), 116 deletions(-) diff --git a/Gemfile b/Gemfile index 8d47a9e..aa85991 100644 --- a/Gemfile +++ b/Gemfile @@ -11,11 +11,12 @@ def location_for(place, fake_version = nil) end group :test do - gem 'puppetlabs_spec_helper', :require => false + gem 'puppet', '~> 7.18', :require => false + gem 'puppetlabs_spec_helper', '4.0.1', :require => false # gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git' # gem 'rspec-puppet-facts', :require => false # gem 'rspec-puppet-utils', :require => false - gem 'puppet-lint', :require => false + gem 'puppet-lint', '2.5.2', :require => false gem 'puppet-lint-param-docs', :require => false gem 'puppet-lint-strict_indent-check', :require => false gem 'puppet-lint-absolute_classname-check', :require => false @@ -30,16 +31,16 @@ group :test do gem 'puppet-lint-duplicate_class_parameters-check', :require => false gem 'metadata-json-lint', :require => false gem 'puppet-blacksmith', :require => false - gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git' + gem 'voxpupuli-release', '2.0.0', :require => false gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0' gem 'semantic_puppet', :require => false end group :development do - gem 'travis', :require => false - gem 'travis-lint', :require => false - gem 'guard-rake', :require => false - gem 'puppet-strings', :require => false + gem 'travis', :require => false + gem 'travis-lint', :require => false + gem 'guard-rake', :require => false + gem 'puppet-strings', :require => false end # # group :system_tests do diff --git a/Gemfile.lock b/Gemfile.lock index f72ad35..17e97a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,38 +1,50 @@ -GIT - remote: https://github.com/voxpupuli/voxpupuli-release-gem.git - revision: aa12bdde4cc033152233ad818ef90afb812ef377 - specs: - voxpupuli-release (1.0.1) - puppet-blacksmith (>= 4.0.0) - rake - GEM remote: https://rubygems.org/ specs: - activesupport (5.2.4.4) + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) coderay (1.1.3) - concurrent-ruby (1.1.7) - deep_merge (1.2.1) - diff-lcs (1.4.4) + concurrent-ruby (1.2.2) + deep_merge (1.2.2) + diff-lcs (1.5.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - facter (4.0.46) + facter (4.4.1) hocon (~> 1.3) thor (>= 1.0.1, < 2.0) - faraday (1.1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - faraday_middleware (1.0.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) - fast_gettext (1.8.0) - ffi (1.13.1) - formatador (0.2.5) + fast_gettext (2.3.0) + ffi (1.15.5) + formatador (1.1.0) gh (0.18.0) activesupport (~> 5.0) addressable (~> 2.4) @@ -41,50 +53,49 @@ GEM multi_json (~> 1.0) net-http-persistent (~> 2.9) net-http-pipeline - guard (2.16.2) + guard (2.18.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) nenv (~> 0.1) notiffany (~> 0.0) - pry (>= 0.9.12) + pry (>= 0.13.0) shellany (~> 0.0) thor (>= 0.18.1) guard-rake (1.0.0) guard rake - hiera (3.6.0) - highline (2.0.3) - hocon (1.3.1) + hiera (3.12.0) + highline (2.1.0) + hocon (1.4.0) http-accept (1.7.0) - http-cookie (1.0.3) + http-cookie (1.0.5) domain_name (~> 0.5) - httpclient (2.8.3) - i18n (1.8.5) + i18n (1.14.1) concurrent-ruby (~> 1.0) - json (2.3.1) - json-schema (2.8.1) - addressable (>= 2.4) - json_pure (2.3.1) + json (2.6.3) + json-schema (4.0.0) + addressable (>= 2.8) + json_pure (2.6.3) launchy (2.4.3) addressable (~> 2.3) - listen (3.3.3) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) locale (2.1.3) lumberjack (1.2.8) - metadata-json-lint (3.0.0) - json-schema (~> 2.8) + metadata-json-lint (3.0.3) + json-schema (>= 2.8, < 5.0) spdx-licenses (~> 1.0) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.1104) + mime-types-data (3.2023.0218.1) minitar (0.9) - minitest (5.14.2) - mocha (1.11.2) + minitest (5.18.1) + mocha (1.16.1) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.3.0) nenv (0.3.0) net-http-persistent (2.9.4) net-http-pipeline (1.0.1) @@ -92,72 +103,72 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - pathspec (0.2.1) - pry (0.13.1) + pathspec (1.0.0) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.6) - puppet (6.19.1) + public_suffix (5.0.3) + puppet (7.25.0) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) facter (> 2.0.1, < 5) - fast_gettext (~> 1.1) + fast_gettext (>= 1.1, < 3) hiera (>= 3.2.1, < 4) - httpclient (~> 2.8) locale (~> 2.1) multi_json (~> 1.10) puppet-resource_api (~> 1.5) + scanf (~> 1.0) semantic_puppet (~> 1.0) - puppet-blacksmith (6.1.0) - puppet-modulebuilder (~> 0.2) + puppet-blacksmith (7.0.0) + puppet-modulebuilder (~> 1.0) rest-client (~> 2.0) - puppet-lint (2.4.2) - puppet-lint-absolute_classname-check (3.0.0) - puppet-lint (>= 1.0, < 3.0) - puppet-lint-classes_and_types_beginning_with_digits-check (0.1.2) + puppet-lint (2.5.2) + puppet-lint-absolute_classname-check (3.1.0) + puppet-lint (>= 1.0, < 4) + puppet-lint-classes_and_types_beginning_with_digits-check (1.0.0) puppet-lint (>= 1.0, < 3.0) puppet-lint-duplicate_class_parameters-check (1.0.5) puppet-lint (>= 1.1, < 3.0) - puppet-lint-leading_zero-check (0.1.1) - puppet-lint (>= 1.0, < 3.0) + puppet-lint-leading_zero-check (1.1.0) + puppet-lint (>= 1.0, < 4.0) puppet-lint-legacy_facts-check (1.0.4) puppet-lint (~> 2.4) - puppet-lint-param-docs (1.6.0) - puppet-lint (>= 1.1, < 3.0) - puppet-lint-resource_reference_syntax (1.1.0) - puppet-lint (>= 1.0, < 3.0) - puppet-lint-strict_indent-check (2.0.7) - puppet-lint (> 1.0) - puppet-lint-trailing_comma-check (0.4.2) - puppet-lint (>= 1.0, < 3.0) - puppet-lint-unquoted_string-check (2.0.0) - puppet-lint (>= 2.1, < 3.0) - puppet-lint-variable_contains_upcase (1.2.0) - puppet-lint (>= 1.0, < 3.0) - puppet-lint-version_comparison-check (0.2.1) - puppet-lint (>= 1.0, < 3.0) - puppet-modulebuilder (0.2.1) - minitar (~> 0.6) - pathspec (~> 0.2.1) - puppet-resource_api (1.8.13) + puppet-lint-param-docs (1.7.6) + puppet-lint (>= 1.1, < 4.0) + puppet-lint-resource_reference_syntax (1.2.0) + puppet-lint (>= 1.0, < 4) + puppet-lint-strict_indent-check (2.1.0) + puppet-lint (>= 1.0, < 4) + puppet-lint-trailing_comma-check (1.0.0) + puppet-lint (>= 1.0, < 4) + puppet-lint-unquoted_string-check (2.2.0) + puppet-lint (>= 2.1, < 4) + puppet-lint-variable_contains_upcase (1.4.0) + puppet-lint (>= 1.0, < 5) + puppet-lint-version_comparison-check (1.1.0) + puppet-lint (>= 1.0, < 4) + puppet-modulebuilder (1.0.0) + minitar (~> 0.9) + pathspec (>= 0.2.1, < 2.0.0) + puppet-resource_api (1.8.14) hocon (>= 1.0) - puppet-strings (2.5.0) - rgen - yard (~> 0.9.5) - puppet-syntax (3.1.0) + puppet-strings (4.1.0) + rgen (~> 0.9) + yard (~> 0.9) + puppet-syntax (3.3.0) puppet (>= 5) rake - puppetlabs_spec_helper (2.15.0) + puppetlabs_spec_helper (4.0.1) mocha (~> 1.0) - pathspec (~> 0.2.1) + pathspec (>= 0.2.1, < 1.1.0) puppet-lint (~> 2.0) puppet-syntax (>= 2.0, < 4) rspec-puppet (~> 2.0) pusher-client (0.6.2) json websocket (~> 1.0) - rake (13.0.1) - rb-fsevent (0.10.4) + rake (13.0.6) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rest-client (2.1.0) @@ -165,29 +176,30 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rgen (0.8.2) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.0) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.0) + rgen (0.9.1) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-puppet (2.8.0) + rspec-support (~> 3.12.0) + rspec-puppet (2.12.0) rspec - rspec-support (3.10.0) - ruby2_keywords (0.0.2) - semantic_puppet (1.0.2) + rspec-support (3.12.1) + ruby2_keywords (0.0.5) + scanf (1.0.0) + semantic_puppet (1.1.0) shellany (0.0.1) - spdx-licenses (1.2.0) - thor (1.0.1) + spdx-licenses (1.3.0) + thor (1.2.2) thread_safe (0.3.6) - travis (1.10.0) + travis (1.11.1) faraday (~> 1.0) faraday_middleware (~> 1.0) gh (~> 0.13) @@ -197,22 +209,27 @@ GEM pusher-client (~> 0.4) travis-lint (2.0.0) json - tzinfo (1.2.8) + tzinfo (1.2.11) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - websocket (1.2.8) - yard (0.9.25) + unf_ext (0.0.8.2) + voxpupuli-release (2.0.0) + puppet-blacksmith (>= 4.0.0) + puppet-strings (>= 2.9.0) + rake + websocket (1.2.9) + yard (0.9.34) PLATFORMS - ruby + x86_64-linux DEPENDENCIES guard-rake metadata-json-lint + puppet (~> 7.18) puppet-blacksmith - puppet-lint + puppet-lint (= 2.5.2) puppet-lint-absolute_classname-check puppet-lint-classes_and_types_beginning_with_digits-check puppet-lint-duplicate_class_parameters-check @@ -226,11 +243,11 @@ DEPENDENCIES puppet-lint-variable_contains_upcase puppet-lint-version_comparison-check puppet-strings - puppetlabs_spec_helper + puppetlabs_spec_helper (= 4.0.1) semantic_puppet travis travis-lint - voxpupuli-release! + voxpupuli-release (= 2.0.0) BUNDLED WITH - 1.17.3 + 2.3.21