From ff97aa0f8fa6ac66a31dfe04bceac5977a7c1cb5 Mon Sep 17 00:00:00 2001 From: Jan Orel Date: Mon, 11 Apr 2022 12:08:54 +0200 Subject: [PATCH] M #-: Dalli <3.0, refresh Gemfile locks (#1926) (cherry picked from commit 3793f80671d0076ab9bc70c85abe7c1a3c3b2cca) --- share/install_gems/CentOS7/Gemfile.lock | 10 +- share/install_gems/Debian10/Gemfile.lock | 23 ++-- share/install_gems/Debian11/Gemfile.lock | 11 +- share/install_gems/Gemfile | 143 ++++++++++++++++----- share/install_gems/Ubuntu1804/Gemfile.lock | 23 ++-- share/install_gems/Ubuntu2004/Gemfile.lock | 23 ++-- 6 files changed, 152 insertions(+), 81 deletions(-) diff --git a/share/install_gems/CentOS7/Gemfile.lock b/share/install_gems/CentOS7/Gemfile.lock index 0a3bef245a..44c590e71b 100644 --- a/share/install_gems/CentOS7/Gemfile.lock +++ b/share/install_gems/CentOS7/Gemfile.lock @@ -47,9 +47,9 @@ GEM chunky_png (1.3.11) concurrent-ruby (1.1.6) configparser (0.1.7) - curb (0.9.10) - daemons (1.3.1) - dalli (2.7.10) + curb (1.0.0) + daemons (1.4.1) + dalli (2.7.11) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) eventmachine (1.2.7) @@ -162,9 +162,7 @@ DEPENDENCIES azure_mgmt_storage configparser curb - dalli - faraday (~> 0.15) - faraday_middleware (~> 0.12) + dalli (< 3.0) ffi-rzmq (~> 2.0.7) highline (~> 1.7) i18n (~> 0.9) diff --git a/share/install_gems/Debian10/Gemfile.lock b/share/install_gems/Debian10/Gemfile.lock index 5e34687e62..8942c88098 100644 --- a/share/install_gems/Debian10/Gemfile.lock +++ b/share/install_gems/Debian10/Gemfile.lock @@ -12,11 +12,11 @@ GEM xml-simple (>= 1.0.12) android_key_attestation (0.3.0) augeas (0.6.4) - awrence (1.1.1) - aws-eventstream (1.1.0) - aws-partitions (1.304.0) - aws-sdk-cloudwatch (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + awrence (1.2.1) + aws-eventstream (1.2.0) + aws-partitions (1.574.0) + aws-sdk-cloudwatch (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.94.0) aws-eventstream (~> 1, >= 1.0.2) @@ -53,10 +53,10 @@ GEM configparser (0.1.7) cose (0.11.0) cbor (~> 0.5.9) - openssl-signature_algorithm (~> 0.3.0) - curb (0.9.10) - daemons (1.3.1) - dalli (2.7.10) + openssl-signature_algorithm (~> 1.0) + curb (1.0.0) + daemons (1.4.1) + dalli (2.7.11) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) eventmachine (1.2.7) @@ -200,9 +200,8 @@ DEPENDENCIES azure_mgmt_storage configparser curb - dalli - faraday (~> 0.15) - faraday_middleware (~> 0.12) + dalli (< 3.0) + faraday_middleware (~> 1.2.0) ffi-rzmq (~> 2.0.7) highline (~> 1.7) i18n (~> 0.9) diff --git a/share/install_gems/Debian11/Gemfile.lock b/share/install_gems/Debian11/Gemfile.lock index e4a48fcd99..38912642d4 100644 --- a/share/install_gems/Debian11/Gemfile.lock +++ b/share/install_gems/Debian11/Gemfile.lock @@ -12,9 +12,9 @@ GEM augeas (0.6.4) awrence (1.2.1) aws-eventstream (1.2.0) - aws-partitions (1.501.0) - aws-sdk-cloudwatch (1.55.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-partitions (1.574.0) + aws-sdk-cloudwatch (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.121.0) aws-eventstream (~> 1, >= 1.0.2) @@ -201,9 +201,8 @@ DEPENDENCIES azure_mgmt_storage configparser curb - dalli - faraday (~> 0.15) - faraday_middleware (~> 0.12) + dalli (< 3.0) + faraday_middleware (~> 1.2.0) ffi-rzmq (~> 2.0.7) git (~> 1.5) gnuplot diff --git a/share/install_gems/Gemfile b/share/install_gems/Gemfile index 7eec533665..d475ac89b4 100644 --- a/share/install_gems/Gemfile +++ b/share/install_gems/Gemfile @@ -56,36 +56,113 @@ if RUBY_VERSION >= '2.3' gem 'vsphere-automation-vcenter', '~> 0.4.6' end -gem 'json' # sunstone, oneflow, cloud, ... -gem 'sqlite3' # quota, onedb -gem 'treetop', '>= 1.6.3' # oneflow -gem 'sequel' # quota, oneb -gem 'sinatra' # sunstone, cloud, oneflow -gem 'thin' # sunstone, cloud -gem 'memcache-client' # sunstone -gem 'dalli' # sunstone -gem 'rotp' # sunstone -gem 'amazon-ec2' # cloud -gem 'uuidtools' # cloud -gem 'curb' # cloud -gem 'configparser' # hybrid -gem 'azure_mgmt_compute' # hybrid -gem 'azure_mgmt_monitor' # hybrid -gem 'azure_mgmt_network' # hybrid -gem 'azure_mgmt_resources' # hybrid -gem 'azure_mgmt_storage' # hybrid -gem 'rbvmomi', '~> 2.2.0' # vmware -gem 'parse-cron' # oneflow -gem 'aws-sdk-ec2', '>=1.151' # ec2_hybrid -gem 'aws-sdk-s3' # s3 marketplace -gem 'aws-sdk-cloudwatch' # ec2_hybrid -gem 'ox' # oca -gem 'highline', '~> 1.7' # oneprovision -gem 'faraday', '~> 0.15' # packethost -gem 'faraday_middleware', '~> 0.12' # packethost -gem 'activesupport', '~> 4.2' # packethost -gem 'i18n', '~> 0.9' # packethost -gem 'ffi-rzmq', '~> 2.0.7' # onehem (hooks) -gem 'ipaddress', '~> 0.8.3' # sunstone, oneflow -gem 'augeas', '~> 0.6' # serversync -gem 'gnuplot' # monitoring host plot +ps = '< 3.0.0' if ruby_version < Gem::Version.new('2.1.0') + +if ruby_version < Gem::Version.new('2.2.0') + rack = '< 2.0.0' + minitest = '< 5.12.0' + pg = '< 1.2.0' +end + +if ruby_version < Gem::Version.new('2.3.0') + zendesk = '< 1.17.0' + rq = '< 1.0.0' +end + +gem 'ffi-rzmq', '~> 2.0.7' +gem 'net-ldap' +gem 'nokogiri', nokogiri +gem 'public_suffix', ps + +group :cli do + gem 'gnuplot' + gem 'highline', '~> 1.7' + gem 'mysql2' + gem 'pg', pg + gem 'sqlite3' + gem 'sequel' +end + +group :onecfg, :cli do + gem 'augeas', '~> 0.6' +end + +group :onecfg, :cloud, :oneflow, :sunstone do + gem 'json', '>= 2.0' +end + +group :onecfg do + gem 'git', '~> 1.5' +end + +group :hybrid do + gem 'aws-sdk-ec2', '>=1.151' + gem 'aws-sdk-s3' + gem 'aws-sdk-cloudwatch' + gem 'azure_mgmt_compute' + gem 'azure_mgmt_monitor' + gem 'azure_mgmt_network' + gem 'azure_mgmt_resources' + gem 'azure_mgmt_storage' + gem 'configparser' +end + +group :packethost do + gem 'minitest', minitest + if ruby_version >= Gem::Version.new('2.3.0') + gem 'faraday_middleware', '~> 1.2.0' + end + gem 'activesupport', '~> 4.2' + gem 'i18n', '~> 0.9' +end + +group :cloud, :oneflow, :sunstone do + gem 'rack', rack + gem 'sinatra' +end + +group :cloud do + gem 'thin' + gem 'uuidtools' + gem 'curb' +end + +group :oneflow, :sunstone do + gem 'ipaddress', '~> 0.8.3' +end + +group :oneflow do + gem 'treetop', '>= 1.6.3' + gem 'parse-cron' +end + +group :sunstone do + if ruby_version >= Gem::Version.new('2.4.0') + gem 'webauthn' + end + + gem 'zendesk_api', zendesk + gem 'rqrcode', rq + gem 'memcache-client' + gem 'dalli', '<3.0' # https://github.com/OpenNebula/one/issues/5584 + gem 'rotp' +end + +group :oca do + gem 'ox' +end + +group :vmware do + gem 'addressable' + + if ruby_version >= Gem::Version.new('2.3.0') + gem 'vsphere-automation-cis', '~> 0.4.6' + gem 'vsphere-automation-vcenter', '~> 0.4.6' + end + + if ruby_version >= Gem::Version.new('2.4.1') + gem 'rbvmomi', '~> 3.0.0' + else + gem 'rbvmomi', '~> 2.2.0' + end +end diff --git a/share/install_gems/Ubuntu1804/Gemfile.lock b/share/install_gems/Ubuntu1804/Gemfile.lock index 5e34687e62..8942c88098 100644 --- a/share/install_gems/Ubuntu1804/Gemfile.lock +++ b/share/install_gems/Ubuntu1804/Gemfile.lock @@ -12,11 +12,11 @@ GEM xml-simple (>= 1.0.12) android_key_attestation (0.3.0) augeas (0.6.4) - awrence (1.1.1) - aws-eventstream (1.1.0) - aws-partitions (1.304.0) - aws-sdk-cloudwatch (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + awrence (1.2.1) + aws-eventstream (1.2.0) + aws-partitions (1.574.0) + aws-sdk-cloudwatch (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.94.0) aws-eventstream (~> 1, >= 1.0.2) @@ -53,10 +53,10 @@ GEM configparser (0.1.7) cose (0.11.0) cbor (~> 0.5.9) - openssl-signature_algorithm (~> 0.3.0) - curb (0.9.10) - daemons (1.3.1) - dalli (2.7.10) + openssl-signature_algorithm (~> 1.0) + curb (1.0.0) + daemons (1.4.1) + dalli (2.7.11) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) eventmachine (1.2.7) @@ -200,9 +200,8 @@ DEPENDENCIES azure_mgmt_storage configparser curb - dalli - faraday (~> 0.15) - faraday_middleware (~> 0.12) + dalli (< 3.0) + faraday_middleware (~> 1.2.0) ffi-rzmq (~> 2.0.7) highline (~> 1.7) i18n (~> 0.9) diff --git a/share/install_gems/Ubuntu2004/Gemfile.lock b/share/install_gems/Ubuntu2004/Gemfile.lock index 5226edd591..34e1c0f184 100644 --- a/share/install_gems/Ubuntu2004/Gemfile.lock +++ b/share/install_gems/Ubuntu2004/Gemfile.lock @@ -12,11 +12,11 @@ GEM xml-simple (>= 1.0.12) android_key_attestation (0.3.0) augeas (0.6.4) - awrence (1.1.1) - aws-eventstream (1.1.0) - aws-partitions (1.304.0) - aws-sdk-cloudwatch (1.36.0) - aws-sdk-core (~> 3, >= 3.71.0) + awrence (1.2.1) + aws-eventstream (1.2.0) + aws-partitions (1.574.0) + aws-sdk-cloudwatch (1.62.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-core (3.94.0) aws-eventstream (~> 1, >= 1.0.2) @@ -53,10 +53,10 @@ GEM configparser (0.1.7) cose (0.11.0) cbor (~> 0.5.9) - openssl-signature_algorithm (~> 0.3.0) - curb (0.9.10) - daemons (1.3.1) - dalli (2.7.10) + openssl-signature_algorithm (~> 1.0) + curb (1.0.0) + daemons (1.4.1) + dalli (2.7.11) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) eventmachine (1.2.7) @@ -202,9 +202,8 @@ DEPENDENCIES azure_mgmt_storage configparser curb - dalli - faraday (~> 0.15) - faraday_middleware (~> 0.12) + dalli (< 3.0) + faraday_middleware (~> 1.2.0) ffi-rzmq (~> 2.0.7) highline (~> 1.7) i18n (~> 0.9)