From df5f899b2f712c4fbafd21f66e95f6b116eb25cd Mon Sep 17 00:00:00 2001 From: ulferts Date: Wed, 14 Jul 2021 12:06:15 +0200 Subject: [PATCH] Fix/bump gems (#9435) * bump aws-partitions * bump dry-inflector & faraday & faraday-httpclient & faraday-patron & mime-types-data * bump newrelic_rpm * bump oj * bump rake * bump rdoc * bump rubocop * bump rubocop-rails * bump rubyzip * use rubocop-1-18-2 on codeclimate * remove rewrelic * bump oj * bump addressable * sentry-delayed_job & sentry-rails & sentry-ruby & sentry-ruby-core * bump danger * bump aws-partitions * bump git * use rubocop-1-18-3 on codeclimate * bump aws-sdk-sns * fix rubocop rule for Rails/ContentTag * bump aws-partitions * bump aws-sdk-core & aws-sigv4 * bump dry-core & excon * bump faraday & faraday-net_http_persistent * bump git * bump oj * bump parser * bump rake * bump recaptcha * bump rubocop-rails * bump sentry-delayed_job * bump sentry-rails * bump sentry-ruby & sentry-ruby-core * use rubocop-1-12-1 on codeclimate --- .codeclimate.yml | 2 +- .rubocop.yml | 4 +- Gemfile | 16 ++-- Gemfile.lock | 76 ++++++++++--------- ...nproject-two_factor_authentication.gemspec | 2 +- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index dc4d32bb1ce..50b36c2031b 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -27,7 +27,7 @@ checks: plugins: rubocop: enabled: true - channel: rubocop-1-10-0 + channel: rubocop-1-12-1 # Codeclimate uses brakeman 4.3.1 which does not support rails 6 # Check https://docs.codeclimate.com/docs/brakeman for updates. brakeman: diff --git a/.rubocop.yml b/.rubocop.yml index 61e46e8d0df..672c04c3d94 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -110,8 +110,8 @@ Rails/SkipsModelValidations: # Don't force us to use tag instead of content_tag # as this breaks angular elements -Rubocop/Rails/ContentTag: - enabled: false +Rails/ContentTag: + Enabled: false # For feature specs, we tend to have longer specs that cover a larger part of the functionality. # This is done for multiple reasons: diff --git a/Gemfile b/Gemfile index 777e9851208..633b7e65271 100644 --- a/Gemfile +++ b/Gemfile @@ -58,7 +58,7 @@ gem 'awesome_nested_set', '~> 3.4.0' gem 'rubytree', '~> 1.0.0' gem 'typed_dag', '~> 2.0.2' -gem 'addressable', '~> 2.7.0' +gem 'addressable', '~> 2.8.0' # Remove whitespace from model input gem "auto_strip_attributes", "~> 2.5" @@ -107,7 +107,7 @@ gem 'posix-spawn', '~> 0.3.13', require: false gem 'bcrypt', '~> 3.1.6' gem 'multi_json', '~> 1.15.0' -gem 'oj', '~> 3.11.0' +gem 'oj', '~> 3.12.0' gem 'daemons' gem 'delayed_cron_job', '~> 0.7.4' @@ -191,9 +191,9 @@ gem 'mini_magick', '~> 4.11.0', require: false # Sentry error reporting, loaded on demand group :sentry do - gem "sentry-delayed_job", '~> 4.5.1', require: false - gem "sentry-rails", '~> 4.5.1', require: false - gem "sentry-ruby", '~> 4.5.1', require: false + gem "sentry-delayed_job", '~> 4.6.0', require: false + gem "sentry-rails", '~> 4.6.0', require: false + gem "sentry-ruby", '~> 4.6.0', require: false end group :test do @@ -282,8 +282,8 @@ group :development, :test do gem 'pry-rescue', '~> 1.5.2' gem 'pry-stack_explorer', '~> 0.6.0' - # Dangerfile scanner on travis and locally - gem 'danger', '~> 8.2.0' + # Dangerfile scanner on CI and locally + gem 'danger', '~> 8.3.1' # Brakeman scanner gem 'brakeman', '~> 5.0.0' @@ -319,8 +319,6 @@ gem 'openproject-translations', git: 'https://github.com/opf/openproject-translations.git', branch: 'dev' -gem 'newrelic_rpm', require: ENV.has_key?('NEW_RELIC_LICENSE_KEY') - # Load Gemfile.local, Gemfile.plugins, plugins', and custom Gemfiles gemfiles = Dir.glob File.expand_path('{Gemfile.plugins,Gemfile.modules,Gemfile.local,lib/plugins/*/Gemfile}', __dir__) diff --git a/Gemfile.lock b/Gemfile.lock index c0e7fef4521..c51fa170e89 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,7 +164,7 @@ PATH remote: modules/two_factor_authentication specs: openproject-two_factor_authentication (1.0.0) - aws-sdk-sns (~> 1.41.0) + aws-sdk-sns (~> 1.42.0) messagebird-rest (~> 1.4.2) rotp (~> 6.1) @@ -263,7 +263,7 @@ GEM activerecord (>= 4.2) acts_as_tree (2.9.1) activerecord (>= 3.0.0) - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.1.0) afm (0.2.2) @@ -278,8 +278,8 @@ GEM awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) aws-eventstream (1.1.1) - aws-partitions (1.472.0) - aws-sdk-core (3.115.0) + aws-partitions (1.478.0) + aws-sdk-core (3.117.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -291,10 +291,10 @@ GEM aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sdk-sns (1.41.0) + aws-sdk-sns (1.42.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (1.2.4) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) bindata (2.4.10) @@ -358,7 +358,7 @@ GEM rest-client (~> 2.0) daemons (1.4.0) dalli (2.7.11) - danger (8.2.3) + danger (8.3.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -416,9 +416,9 @@ GEM dry-container (0.8.0) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.6.0) + dry-core (0.7.1) concurrent-ruby (~> 1.0) - dry-inflector (0.2.0) + dry-inflector (0.2.1) dry-logic (1.2.0) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5) @@ -446,7 +446,7 @@ GEM escape_utils (1.2.1) eventmachine (1.2.7) eventmachine_httpserver (0.2.1) - excon (0.83.0) + excon (0.84.0) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) @@ -454,12 +454,14 @@ GEM railties (>= 5.0.0) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.4.3) + faraday (1.5.1) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) faraday-net_http_persistent (~> 1.1) + faraday-patron (~> 1.0) multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) @@ -467,8 +469,10 @@ GEM faraday-excon (1.1.0) faraday-http-cache (2.2.0) faraday (>= 0.8) + faraday-httpclient (1.0.1) faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) fastimage (2.2.4) ffi (1.15.3) flamegraph (0.9.5) @@ -496,7 +500,7 @@ GEM ruby-progressbar (~> 1.4) get_process_mem (0.2.7) ffi (~> 1.0) - git (1.8.1) + git (1.9.1) rchardet (~> 1.8) globalid (0.4.2) activesupport (>= 4.2.0) @@ -585,7 +589,7 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) + mime-types-data (3.2021.0704) mini_magick (4.11.0) mini_mime (1.1.0) mini_portile2 (2.5.3) @@ -602,7 +606,6 @@ GEM nap (1.1.0) net-ldap (0.17.0) netrc (0.11.0) - newrelic_rpm (7.1.0) nio4r (2.5.7) no_proxy_fix (0.1.2) nokogiri (1.11.7) @@ -613,7 +616,7 @@ GEM octokit (4.21.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - oj (3.11.7) + oj (3.12.1) okcomputer (1.18.4) omniauth-saml (1.10.3) omniauth (~> 1.3, >= 1.3.2) @@ -634,7 +637,7 @@ GEM parallel (1.20.1) parallel_tests (3.7.0) parallel - parser (3.0.1.1) + parser (3.0.2.0) ast (~> 2.4.1) pdf-core (0.9.0) pdf-inspector (1.3.0) @@ -743,14 +746,14 @@ GEM thor (~> 1.0) rainbow (3.0.0) raindrops (0.19.2) - rake (13.0.3) + rake (13.0.6) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) rbtree3 (0.6.0) rchardet (1.8.0) - rdoc (6.3.1) - recaptcha (5.8.0) + rdoc (6.3.2) + recaptcha (5.8.1) json redcarpet (3.5.1) regexp_parser (2.1.1) @@ -798,7 +801,7 @@ GEM rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.10.2) - rubocop (1.18.0) + rubocop (1.18.3) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) @@ -809,7 +812,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.7.0) parser (>= 3.0.1.1) - rubocop-rails (2.11.1) + rubocop-rails (2.11.3) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.7.0, < 2.0) @@ -831,7 +834,7 @@ GEM rubytree (1.0.0) json (~> 2.1) structured_warnings (~> 0.3) - rubyzip (2.3.0) + rubyzip (2.3.2) sanitize (5.2.3) crass (~> 1.0.2) nokogiri (>= 1.8.0) @@ -852,16 +855,16 @@ GEM childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) semantic (1.6.1) - sentry-delayed_job (4.5.2) - sentry-ruby-core (~> 4.5.0) - sentry-rails (4.5.2) + sentry-delayed_job (4.6.1) + sentry-ruby-core (~> 4.6.0) + sentry-rails (4.6.1) railties (>= 5.0) - sentry-ruby-core (~> 4.5.0) - sentry-ruby (4.5.2) + sentry-ruby-core (~> 4.6.0) + sentry-ruby (4.6.1) concurrent-ruby (~> 1.0, >= 1.0.2) faraday (>= 1.0) - sentry-ruby-core (= 4.5.2) - sentry-ruby-core (4.5.2) + sentry-ruby-core (= 4.6.1) + sentry-ruby-core (4.6.1) concurrent-ruby faraday shoulda-context (2.0.0) @@ -958,7 +961,7 @@ DEPENDENCIES activerecord-session_store (~> 2.0.0) acts_as_list (~> 1.0.1) acts_as_tree (~> 2.9.0) - addressable (~> 2.7.0) + addressable (~> 2.8.0) airbrake (~> 11.0.0) auto_strip_attributes (~> 2.5) awesome_nested_set (~> 3.4.0) @@ -980,7 +983,7 @@ DEPENDENCIES costs! daemons dalli (~> 2.7.10) - danger (~> 8.2.0) + danger (~> 8.3.1) danger-brakeman dashboards! database_cleaner (~> 2.0) @@ -1017,9 +1020,8 @@ DEPENDENCIES multi_json (~> 1.15.0) my_page! net-ldap (~> 0.17.0) - newrelic_rpm nokogiri (~> 1.11.0) - oj (~> 3.11.0) + oj (~> 3.12.0) okcomputer (~> 1.18.1) omniauth! omniauth-openid-connect! @@ -1090,9 +1092,9 @@ DEPENDENCIES secure_headers (~> 6.3.0) selenium-webdriver (~> 3.14) semantic (~> 1.6.1) - sentry-delayed_job (~> 4.5.1) - sentry-rails (~> 4.5.1) - sentry-ruby (~> 4.5.1) + sentry-delayed_job (~> 4.6.0) + sentry-rails (~> 4.6.0) + sentry-ruby (~> 4.6.0) shoulda-context (~> 2.0) shoulda-matchers (~> 4.5) spring diff --git a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec index a7f83df75fc..38cc9e61dda 100644 --- a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec +++ b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec @@ -16,5 +16,5 @@ Gem::Specification.new do |s| s.add_dependency 'messagebird-rest', '~> 1.4.2' s.add_dependency 'rotp', '~> 6.1' - s.add_dependency 'aws-sdk-sns', '~> 1.41.0' + s.add_dependency 'aws-sdk-sns', '~> 1.42.0' end