Merge pull request #9574 from opf/fix/bump_gems

Fix/bump gems
3 years ago · aa956a35f4
parent d8d349ddc1 622be3ba4c
commit aa956a35f4
4 changed files with 72 additions and 97 deletions
--- a/22
+++ b/22
@ -32,7 +32,7 @@ ruby '~> 2.7.4'

 gem 'actionpack-xml_parser', '~> 2.0.0'
 gem 'activemodel-serializers-xml', '~> 1.0.1'
-gem 'activerecord-import', '~> 1.1.0'
+gem 'activerecord-import', '~> 1.2.0'
 gem 'activerecord-session_store', '~> 2.0.0'
 gem 'rails', '~> 6.1.3'
 gem 'responders', '~> 3.0'
@ -85,7 +85,7 @@ gem 'escape_utils', '~> 1.0'
 # Syntax highlighting used in html-pipeline with rouge
 gem 'rouge', '~> 3.26.0'
 # HTML sanitization used for html-pipeline
-gem 'sanitize', '~> 5.2.1'
+gem 'sanitize', '~> 6.0.0'
 # HTML autolinking for mails and urls (replaces autolink)
 gem 'rinku', '~> 2.0.4'
 # Version parsing with semver
@ -95,7 +95,7 @@ gem 'semantic', '~> 1.6.1'
 # used for statistics on svn repositories
 gem 'svg-graph', '~> 2.2.0'

-gem 'date_validator', '~> 0.11.0'
+gem 'date_validator', '~> 0.12.0'
 gem 'email_validator', '~> 2.2.3'
 gem 'ruby-duration', '~> 3.2.0'

@ -108,7 +108,7 @@ gem 'posix-spawn', '~> 0.3.13', require: false
 gem 'bcrypt', '~> 3.1.6'

 gem 'multi_json', '~> 1.15.0'
-gem 'oj', '~> 3.12.0'
+gem 'oj', '~> 3.13.0'

 gem 'daemons'
 gem 'delayed_cron_job', '~> 0.7.4'
@ -149,7 +149,7 @@ gem 'prawn-markup', '~> 0.3.0'
 gem 'cells-erb', '~> 0.1.0'
 gem 'cells-rails', '~> 0.0.9'

-gem 'meta-tags', '~> 2.14.0'
+gem 'meta-tags', '~> 2.15.0'

 group :production do
  # we use dalli as standard memcache client
@ -160,7 +160,7 @@ group :production do
  gem 'unicorn-worker-killer', require: false
 end

-gem 'i18n-js', '~> 3.8.0'
+gem 'i18n-js', '~> 3.9.0'
 gem 'rails-i18n', '~> 6.0.0'
 gem 'sprockets', '~> 3.7.0'

@ -168,9 +168,9 @@ gem 'sprockets', '~> 3.7.0'
 # also, better than thin since we can control worker concurrency.
 gem 'unicorn'

-gem 'puma', '~> 5.3.0' # used for development and optionally for production
+gem 'puma', '~> 5.4.0' # used for development and optionally for production

-gem 'nokogiri', '~> 1.11.0'
+gem 'nokogiri', '~> 1.12.0'

 gem 'carrierwave', '~> 1.3.1'
 gem 'carrierwave_direct', '~> 2.1.0'
@ -239,7 +239,7 @@ group :test do

  gem 'equivalent-xml', '~> 0.6'
  gem 'json_spec', '~> 1.1.4'
-  gem 'shoulda-matchers', '~> 4.5', require: nil
+  gem 'shoulda-matchers', '~> 5.0', require: nil

  gem 'parallel_tests', '~> 3.1'
 end
@ -249,7 +249,7 @@ group :ldap do
 end

 group :development do
-  gem 'listen', '~> 3.5.1' # Use for event-based reloaders
+  gem 'listen', '~> 3.6.0' # Use for event-based reloaders

  gem 'faker'
  gem 'letter_opener'
@ -284,7 +284,7 @@ group :development, :test do
  gem 'pry-stack_explorer', '~> 0.6.0'

  # Brakeman scanner
-  gem 'brakeman', '~> 5.0.0'
+  gem 'brakeman', '~> 5.1.0'
  gem 'danger-brakeman'
 end

--- 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.42.0)
+      aws-sdk-sns (~> 1.44.0)
      messagebird-rest (~> 1.4.2)
      rotp (~> 6.1)

@ -236,7 +236,7 @@ GEM
    activerecord (6.1.4)
      activemodel (= 6.1.4)
      activesupport (= 6.1.4)
-    activerecord-import (1.1.0)
+    activerecord-import (1.2.0)
      activerecord (>= 3.2)
    activerecord-nulldb-adapter (0.7.0)
      activerecord (>= 5.2.0, < 6.3)
@ -278,21 +278,21 @@ GEM
    awesome_nested_set (3.4.0)
      activerecord (>= 4.0.0, < 7.0)
    aws-eventstream (1.1.1)
-    aws-partitions (1.478.0)
-    aws-sdk-core (3.117.0)
+    aws-partitions (1.484.0)
+    aws-sdk-core (3.119.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.239.0)
      aws-sigv4 (~> 1.1)
      jmespath (~> 1.0)
-    aws-sdk-kms (1.44.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kms (1.46.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.96.1)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.98.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.42.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-sns (1.44.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
      aws-sigv4 (~> 1.1)
    aws-sigv4 (1.2.4)
      aws-eventstream (~> 1, >= 1.0.2)
@ -300,9 +300,9 @@ GEM
    bindata (2.4.10)
    binding_of_caller (1.0.0)
      debug_inspector (>= 0.0.1)
-    bootsnap (1.7.5)
+    bootsnap (1.7.7)
      msgpack (~> 1.0)
-    brakeman (5.0.4)
+    brakeman (5.1.1)
    browser (5.3.1)
    builder (3.2.4)
    byebug (11.1.3)
@ -382,7 +382,7 @@ GEM
      activerecord (>= 5.a)
      database_cleaner-core (~> 2.0.0)
    database_cleaner-core (2.0.1)
-    date_validator (0.11.0)
+    date_validator (0.12.0)
      activemodel (>= 3)
      activesupport (>= 3)
    debug_inspector (1.1.0)
@ -448,7 +448,7 @@ GEM
    escape_utils (1.2.1)
    eventmachine (1.2.7)
    eventmachine_httpserver (0.2.1)
-    excon (0.84.0)
+    excon (0.85.0)
    factory_bot (6.2.0)
      activesupport (>= 5.0.0)
    factory_bot_rails (6.2.0)
@ -456,7 +456,7 @@ GEM
      railties (>= 5.0.0)
    faker (2.18.0)
      i18n (>= 1.6, < 2)
-    faraday (1.5.1)
+    faraday (1.6.0)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@ -464,6 +464,7 @@ GEM
      faraday-net_http (~> 1.0)
      faraday-net_http_persistent (~> 1.1)
      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
      multipart-post (>= 1.2, < 3)
      ruby2_keywords (>= 0.0.4)
    faraday-em_http (1.0.0)
@ -475,10 +476,11 @@ GEM
    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
    fastimage (2.2.4)
    ffi (1.15.3)
    flamegraph (0.9.5)
-    fog-aws (3.10.0)
+    fog-aws (3.11.0)
      fog-core (~> 2.1)
      fog-json (~> 1.1)
      fog-xml (~> 0.1)
@ -504,8 +506,8 @@ GEM
      ffi (~> 1.0)
    git (1.9.1)
      rchardet (~> 1.8)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
    gon (6.4.0)
      actionpack (>= 3.0.20)
      i18n (>= 0.7)
@ -533,7 +535,7 @@ GEM
    httpclient (2.8.3)
    i18n (1.8.10)
      concurrent-ruby (~> 1.0)
-    i18n-js (3.8.3)
+    i18n-js (3.9.0)
      i18n (>= 0.6.6)
    icalendar (2.7.1)
      ice_cube (~> 0.16)
@ -561,7 +563,7 @@ GEM
      addressable (~> 2.7)
    letter_opener (1.7.0)
      launchy (~> 2.2)
-    listen (3.5.1)
+    listen (3.6.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    livingstyleguide (2.1.0)
@ -579,14 +581,14 @@ GEM
      activesupport (>= 4)
      railties (>= 4)
      request_store (~> 1.0)
-    loofah (2.10.0)
+    loofah (2.11.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    mail (2.7.1)
      mini_mime (>= 0.1.1)
    marcel (1.0.1)
    messagebird-rest (1.4.2)
-    meta-tags (2.14.0)
+    meta-tags (2.15.0)
      actionpack (>= 3.2.0, < 6.2)
    method_source (1.0.0)
    mime-types (3.3.1)
@ -594,7 +596,7 @@ GEM
    mime-types-data (3.2021.0704)
    mini_magick (4.11.0)
    mini_mime (1.1.0)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.6.1)
    minisyntax (0.2.5)
    minitest (5.14.4)
    mixlib-shellout (2.1.0)
@ -608,17 +610,15 @@ GEM
    nap (1.1.0)
    net-ldap (0.17.0)
    netrc (0.11.0)
-    nio4r (2.5.7)
+    nio4r (2.5.8)
    no_proxy_fix (0.1.2)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.2)
+      mini_portile2 (~> 2.6.1)
      racc (~> 1.4)
-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)
    octokit (4.21.0)
      faraday (>= 0.9)
      sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.12.1)
+    oj (3.13.0)
    okcomputer (1.18.4)
    omniauth-saml (1.10.3)
      omniauth (~> 1.3, >= 1.3.2)
@ -688,7 +688,7 @@ GEM
      eventmachine_httpserver
      http_parser.rb (~> 0.6.0)
      multi_json
-    puma (5.3.2)
+    puma (5.4.0)
      nio4r (~> 2.0)
    racc (1.5.2)
    rack (2.2.3)
@ -700,7 +700,7 @@ GEM
      rack (>= 2.0.0)
    rack-mini-profiler (2.3.2)
      rack (>= 1.2.0)
-    rack-oauth2 (1.17.0)
+    rack-oauth2 (1.18.0)
      activesupport
      attr_required
      httpclient
@ -803,16 +803,16 @@ GEM
    rspec-retry (0.6.2)
      rspec-core (> 3.3)
    rspec-support (3.10.2)
-    rubocop (1.18.3)
+    rubocop (1.18.4)
      parallel (~> 1.10)
      parser (>= 3.0.0.0)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 1.8, < 3.0)
      rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.8.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.9.0)
      parser (>= 3.0.1.1)
    rubocop-rails (2.11.3)
      activesupport (>= 4.2.0)
@ -832,15 +832,14 @@ GEM
    ruby-saml (1.12.2)
      nokogiri (>= 1.10.5)
      rexml
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
    rubytree (1.0.0)
      json (~> 2.1)
      structured_warnings (~> 0.3)
    rubyzip (2.3.2)
-    sanitize (5.2.3)
+    sanitize (6.0.0)
      crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
+      nokogiri (>= 1.12.0)
    sassc (2.4.0)
      ffi (~> 1.9)
    sassc-rails (2.1.2)
@ -857,21 +856,22 @@ GEM
      childprocess (>= 0.5, < 4.0)
      rubyzip (>= 1.2.2)
    semantic (1.6.1)
-    sentry-delayed_job (4.6.1)
+    sentry-delayed_job (4.6.4)
+      delayed_job (>= 4.0)
      sentry-ruby-core (~> 4.6.0)
-    sentry-rails (4.6.1)
+    sentry-rails (4.6.4)
      railties (>= 5.0)
      sentry-ruby-core (~> 4.6.0)
-    sentry-ruby (4.6.1)
+    sentry-ruby (4.6.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      faraday (>= 1.0)
-      sentry-ruby-core (= 4.6.1)
-    sentry-ruby-core (4.6.1)
+      sentry-ruby-core (= 4.6.4)
+    sentry-ruby-core (4.6.4)
      concurrent-ruby
      faraday
    shoulda-context (2.0.0)
-    shoulda-matchers (4.5.1)
-      activesupport (>= 4.2.0)
+    shoulda-matchers (5.0.0)
+      activesupport (>= 5.2.0)
    spreadsheet (1.2.9)
      ruby-ole
    spring (2.1.1)
@ -893,7 +893,7 @@ GEM
      activesupport (>= 3)
      attr_required (>= 0.0.5)
      httpclient (>= 2.4)
-    sys-filesystem (1.4.1)
+    sys-filesystem (1.4.2)
      ffi (~> 1.1)
    table_print (1.5.7)
    temple (0.8.2)
@ -938,8 +938,8 @@ GEM
    webfinger (1.1.0)
      activesupport
      httpclient (>= 2.4)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
      crack (>= 0.3.2)
      hashdiff (>= 0.4.0, < 2.0.0)
    websocket-driver (0.7.5)
@ -958,7 +958,7 @@ PLATFORMS
 DEPENDENCIES
  actionpack-xml_parser (~> 2.0.0)
  activemodel-serializers-xml (~> 1.0.1)
-  activerecord-import (~> 1.1.0)
+  activerecord-import (~> 1.2.0)
  activerecord-nulldb-adapter (~> 0.7.0)
  activerecord-session_store (~> 2.0.0)
  acts_as_list (~> 1.0.1)
@ -971,7 +971,7 @@ DEPENDENCIES
  aws-sdk-s3 (~> 1.91)
  bcrypt (~> 3.1.6)
  bootsnap (~> 1.7.0)
-  brakeman (~> 5.0.0)
+  brakeman (~> 5.1.0)
  browser (~> 5.3.0)
  budgets!
  capybara (~> 3.35.0)
@ -988,7 +988,7 @@ DEPENDENCIES
  danger-brakeman
  dashboards!
  database_cleaner (~> 2.0)
-  date_validator (~> 0.11.0)
+  date_validator (~> 0.12.0)
  deckar01-task_list (~> 2.3.1)
  delayed_cron_job (~> 0.7.4)
  delayed_job_active_record (~> 4.1.5)
@ -1009,21 +1009,21 @@ DEPENDENCIES
  grids!
  html-pipeline (~> 2.14.0)
  htmldiff
-  i18n-js (~> 3.8.0)
+  i18n-js (~> 3.9.0)
  json_spec (~> 1.1.4)
  ladle
  launchy (~> 2.5.0)
  letter_opener
-  listen (~> 3.5.1)
+  listen (~> 3.6.0)
  livingstyleguide (~> 2.1.0)
  lograge (~> 0.11.0)
-  meta-tags (~> 2.14.0)
+  meta-tags (~> 2.15.0)
  mini_magick (~> 4.11.0)
  multi_json (~> 1.15.0)
  my_page!
  net-ldap (~> 0.17.0)
-  nokogiri (~> 1.11.0)
-  oj (~> 3.12.0)
+  nokogiri (~> 1.12.0)
+  oj (~> 3.13.0)
  okcomputer (~> 1.18.1)
  omniauth!
  omniauth-openid-connect!
@ -1061,7 +1061,7 @@ DEPENDENCIES
  pry-rescue (~> 1.5.2)
  pry-stack_explorer (~> 0.6.0)
  puffing-billy (~> 2.4.0)
-  puma (~> 5.3.0)
+  puma (~> 5.4.0)
  rack-attack (~> 6.5.0)
  rack-cors (~> 1.1.1)
  rack-mini-profiler
@ -1089,7 +1089,7 @@ DEPENDENCIES
  ruby-prof
  ruby-progressbar (~> 1.11.0)
  rubytree (~> 1.0.0)
-  sanitize (~> 5.2.1)
+  sanitize (~> 6.0.0)
  sassc-rails
  secure_headers (~> 6.3.0)
  selenium-webdriver (~> 3.14)
@ -1098,7 +1098,7 @@ DEPENDENCIES
  sentry-rails (~> 4.6.0)
  sentry-ruby (~> 4.6.0)
  shoulda-context (~> 2.0)
-  shoulda-matchers (~> 4.5)
+  shoulda-matchers (~> 5.0)
  spring
  spring-commands-rspec
  sprockets (~> 3.7.0)
--- a/lib/tasks/dependencies.rake
+++ b/lib/tasks/dependencies.rake
@ -31,8 +31,7 @@ require 'open3'
 namespace :openproject do
  namespace :dependencies do
    desc 'Updates everything that is updatable automatically especially dependencies'
-    task update: ['openproject:dependencies:update:gems',
-                  'openproject:dependencies:update:rubocop']
+    task update: %w[openproject:dependencies:update:gems]

    namespace :update do
      def parse_capture(capture, &block)
@ -74,30 +73,6 @@ namespace :openproject do
          end
        end
      end
-
-      desc 'Update rubocop used on codeclimate to the extend supported'
-      task :rubocop do
-        out, _process = Open3.capture3('git',
-                                       'ls-remote',
-                                       'https://github.com/codeclimate/codeclimate-rubocop',
-                                       'channel/rubocop*')
-
-        parsed = parse_capture(out) do |line|
-          matches = line.match(/rubocop-(\d+)-(\d+)(?:-(\d+))?/).to_a
-
-          # This version seems to have been a mistake
-          next if matches[0] == 'rubocop-1-70'
-
-          matches[1..3].map(&:to_i) + [matches[0]]
-        end
-
-        new_version = parsed.sort.pop.last
-
-        Open3.capture3('sed', '-i.bak', "s/channel: rubocop[-0-9]*/channel: #{new_version}/", '.codeclimate.yml')
-        Open3.capture3('rm', '.codeclimate.yml.bak')
-        Open3.capture3('git', 'add', '.codeclimate.yml')
-        Open3.capture3('git', 'commit', '-m', "use #{new_version} on codeclimate")
-      end
    end
  end
 end
--- a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec
+++ b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec
@ -15,5 +15,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.42.0'
+  s.add_dependency 'aws-sdk-sns', '~> 1.44.0'
 end