From 18fdeccbf9090cc0f62154adb6de31a098da95be Mon Sep 17 00:00:00 2001 From: jimbali <40831617+jimbali@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:18:55 +0100 Subject: [PATCH] Update dependencies flagged by dependabot (#2284) * chore(deps): Update dependencies flagged by dependabot [MAP-890] * chore: update docker image version --- .circleci/config.yml | 2 +- .ruby-version | 2 +- Dockerfile | 6 +- Gemfile.lock | 191 ++++++++++++++++++++++--------------------- 4 files changed, 105 insertions(+), 96 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f0c3b549..6124f6f2a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -276,7 +276,7 @@ executors: test-executor: docker: # Check https://circleci.com/docs/2.0/language-ruby/ for more details - - image: cimg/ruby:3.2.2 + - image: cimg/ruby:3.2.5 environment: BUNDLER_VERSION: 2.4.20 RAILS_ENV: test diff --git a/.ruby-version b/.ruby-version index be94e6f53..5ae69bd5f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.2.5 diff --git a/Dockerfile b/Dockerfile index 550495447..c46f2e678 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.2-alpine as build-stage +FROM ruby:3.2.5-alpine as build-stage ENV RAILS_ENV=production ENV RACK_ENV=production @@ -21,7 +21,7 @@ RUN bundle _2.1.4_ install --jobs 4 --retry 3 \ && find /usr/local/bundle/gems/ -name "*.o" -delete ############### End of Build step ############### -FROM ruby:3.2.2-alpine as swagger-build +FROM ruby:3.2.5-alpine as swagger-build WORKDIR /app RUN apk --update --no-cache add git build-base postgresql-dev shared-mime-info gcompat tzdata @@ -34,7 +34,7 @@ COPY . /app RUN SKIP_MAINTAIN_TEST_SCHEMA=true rails rswag:specs:swaggerize ############### End of Build step ############### -FROM ruby:3.2.2-alpine +FROM ruby:3.2.5-alpine ARG APP_BUILD_DATE ENV APP_BUILD_DATE ${APP_BUILD_DATE} diff --git a/Gemfile.lock b/Gemfile.lock index 1817cba7a..b4ce9aca1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,75 +1,75 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.1) - actionpack (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.1) - actionview (= 7.0.8.1) - activesupport (= 7.0.8.1) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.1) - actionpack (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.1) - activesupport (= 7.0.8.1) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.1) - activesupport (= 7.0.8.1) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) - activemodel (7.0.8.1) - activesupport (= 7.0.8.1) - activerecord (7.0.8.1) - activemodel (= 7.0.8.1) - activesupport (= 7.0.8.1) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) activerecord-import (1.6.0) activerecord (>= 4.2) - activestorage (7.0.8.1) - actionpack (= 7.0.8.1) - activejob (= 7.0.8.1) - activerecord (= 7.0.8.1) - activesupport (= 7.0.8.1) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.1) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) async (1.31.0) console (~> 1.10) @@ -111,11 +111,12 @@ GEM aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.19) + base64 (0.2.0) + bcrypt (3.1.20) bigdecimal (3.1.7) - bootsnap (1.16.0) + bootsnap (1.18.3) msgpack (~> 1.2) - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) cancancan (3.5.0) childprocess (0.9.0) @@ -123,7 +124,7 @@ GEM choice (0.2.0) climate_control (1.2.0) coderay (1.1.3) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) console (1.19.0) fiber-annotation @@ -136,17 +137,17 @@ GEM docile (1.4.0) doorkeeper (5.5.4) railties (>= 5) - dotenv (2.8.1) - dotenv-rails (2.8.1) - dotenv (= 2.8.1) - railties (>= 3.2) - erubi (1.12.0) + dotenv (3.1.2) + dotenv-rails (3.1.2) + dotenv (= 3.1.2) + railties (>= 6.1) + erubi (1.13.0) factory_bot (6.2.0) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (3.2.1) + faker (3.4.2) i18n (>= 1.8.11, < 2) faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) @@ -171,8 +172,10 @@ GEM activerecord (>= 4.2, < 8) flipper (~> 1.2.2) geocoder (1.8.2) - git (1.18.0) + git (2.1.1) + activesupport (>= 5.0) addressable (~> 2.8) + process_executer (~> 1.1) rchardet (~> 1.8) github_changelog_generator (1.16.4) activesupport @@ -189,7 +192,7 @@ GEM notifications-ruby-client (~> 5.1) rails (>= 4.1.0) hashie (5.0.0) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) jmespath (1.6.2) json (2.6.3) @@ -213,6 +216,7 @@ GEM listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -230,26 +234,26 @@ GEM net-pop net-smtp marcel (1.0.4) - method_source (1.0.0) + method_source (1.1.0) mini_mime (1.1.5) - mini_portile2 (2.8.5) - minitest (5.22.3) + mini_portile2 (2.8.7) + minitest (5.24.1) msgpack (1.7.2) multi_json (1.15.0) multi_xml (0.6.0) net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-imap (0.4.10) + net-imap (0.4.14) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.2) timeout - net-smtp (0.4.0.1) + net-smtp (0.5.0) net-protocol - nio4r (2.7.1) - nokogiri (1.16.3) + nio4r (2.7.3) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) notifications-ruby-client (5.4.0) @@ -264,14 +268,16 @@ GEM octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) - paper_trail (14.0.0) - activerecord (>= 6.0) + paper_trail (15.1.0) + activerecord (>= 6.1) request_store (~> 1.4) parallel (1.23.0) parser (3.2.2.1) ast (~> 2.4.1) pg (1.5.6) - prometheus-client (4.2.1) + process_executer (1.1.0) + prometheus-client (4.2.3) + base64 protocol-hpack (1.4.2) protocol-http (0.24.7) protocol-http1 (0.15.1) @@ -287,29 +293,29 @@ GEM pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (5.0.3) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.1) rack (2.2.9) - rack-cors (2.0.1) + rack-cors (2.0.2) rack (>= 2.0.0) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.1) - actioncable (= 7.0.8.1) - actionmailbox (= 7.0.8.1) - actionmailer (= 7.0.8.1) - actionpack (= 7.0.8.1) - actiontext (= 7.0.8.1) - actionview (= 7.0.8.1) - activejob (= 7.0.8.1) - activemodel (= 7.0.8.1) - activerecord (= 7.0.8.1) - activestorage (= 7.0.8.1) - activesupport (= 7.0.8.1) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) bundler (>= 1.15.0) - railties (= 7.0.8.1) + railties (= 7.0.8.4) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -322,27 +328,28 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8.1) - actionpack (= 7.0.8.1) - activesupport (= 7.0.8.1) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rchardet (1.8.0) redis (5.0.7) redis-client (>= 0.9.0) - redis-client (0.21.1) + redis-client (0.22.2) connection_pool regexp_parser (2.8.0) - request_store (1.6.0) + request_store (1.7.0) rack (>= 1.4) - rexml (3.2.5) + rexml (3.3.2) + strscan routing-filter (0.7.0) actionpack (>= 6.1) activesupport (>= 6.1) @@ -371,9 +378,9 @@ GEM json-schema (>= 2.2, < 4.0) railties (>= 3.1, < 7.1) rspec-core (>= 2.14) - rswag-ui (2.10.1) - actionpack (>= 3.1, < 7.1) - railties (>= 3.1, < 7.1) + rswag-ui (2.13.0) + actionpack (>= 3.1, < 7.2) + railties (>= 3.1, < 7.2) rubocop (1.44.1) json (~> 2.3) parallel (~> 1.10) @@ -421,13 +428,14 @@ GEM sidekiq (>= 3.0) service_mock (0.9) childprocess (~> 0.5) - shoulda-matchers (5.3.0) + shoulda-matchers (6.2.0) activesupport (>= 5.2.0) - sidekiq (7.2.2) + sidekiq (7.3.0) concurrent-ruby (< 2) connection_pool (>= 2.3.0) + logger rack (>= 2.2.4) - redis-client (>= 0.19.0) + redis-client (>= 0.22.2) simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) @@ -442,6 +450,7 @@ GEM spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) spring (>= 4) + strscan (3.1.0) sync (0.5.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -461,7 +470,7 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.6.13) + zeitwerk (2.6.17) PLATFORMS ruby