Skip to content

Commit 4cd8479

Browse files
authored
Merge pull request #751 from CDLUC3/chore/ruby-upgrade
Ruby upgrade
2 parents 3eb021b + 94cf582 commit 4cd8479

6 files changed

Lines changed: 269 additions & 236 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
## DMPTool Releases
44

5+
### v5.46
6+
- Upgrade to Ruby 3.3
7+
- Update all gem dependencies
8+
- Update JS dependencies
9+
510
### v5.45
611
- Add logic to provide special handling for certain Org's SSO #738, #739
712
- Update all gem dependencies

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This Dockerfile is meant for running the application in an AWS ECS container. The required
55
# Rails credentials and ENV variables are all defined by the CloudFormation template and passed
66
# into the container on startup
7-
FROM ruby:3.0
7+
FROM ruby:3.3
88

99
RUN echo $(apt-cache search magick)
1010

Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.2-slim-bookworm
1+
FROM ruby:3.3-slim-bookworm
22

33
RUN groupadd -g 1000 dmpt && useradd -u 1000 -g 1000 dmpt
44

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44

5-
ruby '>= 3.2'
5+
ruby '>= 3.3'
66

77
# ===========#
88
# CORE RAILS #

Gemfile.lock

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GIT
22
remote: https://github.com/CDLUC3/uc3-ssm
3-
revision: 2431a53123916a7f25a85e6c4453d55a08a5559a
3+
revision: f70fbb9cfba3cae4347369106e950c92a6e33824
44
specs:
55
uc3-ssm (1.0.3)
66

@@ -103,24 +103,24 @@ GEM
103103
autoprefixer-rails (10.4.21.0)
104104
execjs (~> 2)
105105
aws-eventstream (1.4.0)
106-
aws-partitions (1.1170.0)
107-
aws-sdk-core (3.233.0)
106+
aws-partitions (1.1177.0)
107+
aws-sdk-core (3.235.0)
108108
aws-eventstream (~> 1, >= 1.3.0)
109109
aws-partitions (~> 1, >= 1.992.0)
110110
aws-sigv4 (~> 1.9)
111111
base64
112112
bigdecimal
113113
jmespath (~> 1, >= 1.6.1)
114114
logger
115-
aws-sdk-kms (1.113.0)
116-
aws-sdk-core (~> 3, >= 3.231.0)
115+
aws-sdk-kms (1.115.0)
116+
aws-sdk-core (~> 3, >= 3.234.0)
117117
aws-sigv4 (~> 1.5)
118-
aws-sdk-s3 (1.199.1)
119-
aws-sdk-core (~> 3, >= 3.231.0)
118+
aws-sdk-s3 (1.201.0)
119+
aws-sdk-core (~> 3, >= 3.234.0)
120120
aws-sdk-kms (~> 1)
121121
aws-sigv4 (~> 1.5)
122-
aws-sdk-ssm (1.203.0)
123-
aws-sdk-core (~> 3, >= 3.231.0)
122+
aws-sdk-ssm (1.205.0)
123+
aws-sdk-core (~> 3, >= 3.234.0)
124124
aws-sigv4 (~> 1.5)
125125
aws-sigv4 (1.12.1)
126126
aws-eventstream (~> 1, >= 1.0.2)
@@ -129,7 +129,7 @@ GEM
129129
bcrypt_pbkdf (1.1.1)
130130
bcrypt_pbkdf (1.1.1-arm64-darwin)
131131
bcrypt_pbkdf (1.1.1-x86_64-darwin)
132-
benchmark (0.4.1)
132+
benchmark (0.5.0)
133133
better_errors (2.10.1)
134134
erubi (>= 1.0.0)
135135
rack (>= 0.9.0)
@@ -138,7 +138,7 @@ GEM
138138
latex-decode (~> 0.0)
139139
logger (~> 1.7)
140140
racc (~> 1.7)
141-
bigdecimal (3.3.0)
141+
bigdecimal (3.3.1)
142142
bindex (0.8.1)
143143
binding_of_caller (1.0.1)
144144
debug_inspector (>= 1.2.0)
@@ -147,7 +147,7 @@ GEM
147147
brakeman (7.1.0)
148148
racc
149149
builder (3.3.0)
150-
bullet (8.0.8)
150+
bullet (8.1.0)
151151
activesupport (>= 3.0.0)
152152
uniform_notifier (~> 1.11)
153153
bundle-audit (0.1.0)
@@ -200,7 +200,7 @@ GEM
200200
rails (>= 4.2.0)
201201
cork (0.3.0)
202202
colored2 (~> 3.1)
203-
crack (1.0.0)
203+
crack (1.0.1)
204204
bigdecimal
205205
rexml
206206
crass (1.0.6)
@@ -263,12 +263,12 @@ GEM
263263
fog-aws
264264
drb (2.2.3)
265265
ed25519 (1.4.0)
266-
erb (5.0.3)
266+
erb (5.1.3)
267267
erubi (1.13.1)
268268
excon (1.3.0)
269269
logger
270270
execjs (2.10.0)
271-
factory_bot (6.5.5)
271+
factory_bot (6.5.6)
272272
activesupport (>= 6.1.0)
273273
factory_bot_rails (6.5.1)
274274
factory_bot (~> 6.5)
@@ -366,7 +366,7 @@ GEM
366366
jmespath (1.6.2)
367367
jsbundling-rails (1.3.1)
368368
railties (>= 6.0.0)
369-
json (2.15.1)
369+
json (2.15.2)
370370
json_schemer (2.4.0)
371371
bigdecimal
372372
hana (~> 1.3)
@@ -410,7 +410,8 @@ GEM
410410
crass (~> 1.0.2)
411411
nokogiri (>= 1.12.0)
412412
lumberjack (1.4.2)
413-
mail (2.8.1)
413+
mail (2.9.0)
414+
logger
414415
mini_mime (>= 0.1.1)
415416
net-imap
416417
net-pop
@@ -512,7 +513,7 @@ GEM
512513
orm_adapter (0.5.0)
513514
ostruct (0.6.3)
514515
parallel (1.27.0)
515-
parser (3.3.9.0)
516+
parser (3.3.10.0)
516517
ast (~> 2.4.1)
517518
racc
518519
pp (0.6.3)
@@ -521,7 +522,7 @@ GEM
521522
prime (0.1.4)
522523
forwardable
523524
singleton
524-
prism (1.5.1)
525+
prism (1.6.0)
525526
process_executer (1.3.0)
526527
progress_bar (1.3.4)
527528
highline (>= 1.6)
@@ -534,7 +535,7 @@ GEM
534535
date
535536
stringio
536537
public_suffix (6.0.2)
537-
puma (7.0.4)
538+
puma (7.1.0)
538539
nio4r (~> 2.0)
539540
pundit (2.5.2)
540541
activesupport (>= 3.0.0)
@@ -544,15 +545,15 @@ GEM
544545
rspec-mocks (~> 3.12)
545546
rspec-support (~> 3.12)
546547
racc (1.8.1)
547-
rack (3.1.17)
548-
rack-attack (6.7.0)
548+
rack (3.1.18)
549+
rack-attack (6.8.0)
549550
rack (>= 1.0, < 4)
550551
rack-cors (3.0.0)
551552
logger
552553
rack (>= 3.0.14)
553554
rack-mini-profiler (4.0.1)
554555
rack (>= 1.2.0)
555-
rack-protection (4.2.0)
556+
rack-protection (4.2.1)
556557
base64 (>= 0.1.0)
557558
logger (>= 1.6.0)
558559
rack (>= 3.0.0, < 4)
@@ -612,20 +613,20 @@ GEM
612613
io-console (~> 0.5)
613614
request_store (1.7.0)
614615
rack (>= 1.4)
615-
responders (3.1.1)
616-
actionpack (>= 5.2)
617-
railties (>= 5.2)
616+
responders (3.2.0)
617+
actionpack (>= 7.0)
618+
railties (>= 7.0)
618619
rexml (3.4.4)
619620
rollbar (3.6.2)
620621
rouge (4.6.1)
621622
rspec-collection_matchers (1.2.1)
622623
rspec-expectations (>= 2.99.0.beta1)
623-
rspec-core (3.13.5)
624+
rspec-core (3.13.6)
624625
rspec-support (~> 3.13.0)
625626
rspec-expectations (3.13.5)
626627
diff-lcs (>= 1.2.0, < 2.0)
627628
rspec-support (~> 3.13.0)
628-
rspec-mocks (3.13.5)
629+
rspec-mocks (3.13.6)
629630
diff-lcs (>= 1.2.0, < 2.0)
630631
rspec-support (~> 3.13.0)
631632
rspec-rails (8.0.2)
@@ -639,7 +640,7 @@ GEM
639640
rspec-support (3.13.6)
640641
rss (0.3.1)
641642
rexml
642-
rubocop (1.81.1)
643+
rubocop (1.81.6)
643644
json (~> 2.3)
644645
language_server-protocol (~> 3.17.0.2)
645646
lint_roller (~> 1.1.0)
@@ -653,10 +654,10 @@ GEM
653654
rubocop-ast (1.47.1)
654655
parser (>= 3.3.7.2)
655656
prism (~> 1.4)
656-
rubocop-performance (1.26.0)
657+
rubocop-performance (1.26.1)
657658
lint_roller (~> 1.1)
658659
rubocop (>= 1.75.0, < 2.0)
659-
rubocop-ast (>= 1.44.0, < 2.0)
660+
rubocop-ast (>= 1.47.1, < 2.0)
660661
rubocop-rails (2.33.4)
661662
activesupport (>= 4.2.0)
662663
lint_roller (~> 1.1)
@@ -670,10 +671,10 @@ GEM
670671
ruby-progressbar (1.13.0)
671672
ruby2_keywords (0.0.5)
672673
ruby_dig (0.0.2)
673-
rubyzip (3.1.1)
674+
rubyzip (3.2.1)
674675
sassc (2.4.0)
675676
ffi (~> 1.9)
676-
sawyer (0.9.2)
677+
sawyer (0.9.3)
677678
addressable (>= 2.3.5)
678679
faraday (>= 0.17.3, < 3)
679680
securerandom (0.4.1)
@@ -755,7 +756,7 @@ GEM
755756
nokogiri (~> 1.6)
756757
rubyzip (>= 1.3.0)
757758
selenium-webdriver (~> 4.0, < 4.11)
758-
webmock (3.25.1)
759+
webmock (3.26.0)
759760
addressable (>= 2.8.0)
760761
crack (>= 0.3.2)
761762
hashdiff (>= 0.4.0, < 2.0.0)
@@ -881,7 +882,7 @@ DEPENDENCIES
881882
zaru
882883

883884
RUBY VERSION
884-
ruby 3.2.2p53
885+
ruby 3.3.9p170
885886

886887
BUNDLED WITH
887888
2.6.9

0 commit comments

Comments
 (0)