From 802efba67daa9042a3699007703d6c77e1b15c05 Mon Sep 17 00:00:00 2001
From: David Czulada <dczulada@mitre.org>
Date: Mon, 6 May 2024 12:13:12 -0400
Subject: [PATCH 1/3] use gem versions

---
 Gemfile      |  4 ++--
 Gemfile.lock | 40 ++++++++++++++--------------------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6dbe637c6..aa21dae57 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,9 +16,9 @@ gem 'bson'
 gem 'mustache'
 gem 'os'
 
-gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models', branch: 'rails_7_mongoid_8_dsc'
+gem 'cqm-models', '~> 4.2.0'
 gem 'cqm-parsers', git: 'https://github.com/projecttacoma/cqm-parsers', branch: 'mongoid8'
-gem 'cqm-reports', git: 'https://github.com/projecttacoma/cqm-reports', branch: 'master'
+gem 'cqm-reports', '~> 4.1.0'
 gem 'cqm-validators', '~> 4.0.5'
 
 # # Use faker to generate addresses
diff --git a/Gemfile.lock b/Gemfile.lock
index ced08b4e1..5e78264fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,13 +6,6 @@ GIT
     jquery-ui-rails (7.0.0)
       railties (>= 3.2.16)
 
-GIT
-  remote: https://github.com/projecttacoma/cqm-models
-  revision: 27575d388eec04910470c05405ea2629b184f0ec
-  branch: rails_7_mongoid_8_dsc
-  specs:
-    cqm-models (4.2.0)
-
 GIT
   remote: https://github.com/projecttacoma/cqm-parsers
   revision: 2c4642e363417ec1995ced80aa1cdaf19f982b47
@@ -35,23 +28,6 @@ GIT
       uuid (~> 2.3.7)
       zip-zip (~> 0.3)
 
-GIT
-  remote: https://github.com/projecttacoma/cqm-reports
-  revision: 983af8a2b099071eee6b0db40568afba74d975c4
-  branch: master
-  specs:
-    cqm-reports (4.1.0)
-      cqm-models (~> 4.0)
-      cqm-validators (~> 4.0)
-      erubis (~> 2.7)
-      log4r (~> 1.1)
-      memoist (~> 0.9)
-      mongoid-tree (> 2.0)
-      mustache
-      nokogiri (>= 1.16.2)
-      uuid (~> 2.3)
-      zip-zip (~> 0.3)
-
 GIT
   remote: https://github.com/turbolinks/turbolinks-classic
   revision: 80216ce9d89920bf073709405e3fce6d0a3ccd9a
@@ -205,6 +181,18 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.2.3)
+    cqm-models (4.2.0)
+    cqm-reports (4.1.1)
+      cqm-models (~> 4.0)
+      cqm-validators (~> 4.0)
+      erubis (~> 2.7)
+      log4r (~> 1.1)
+      memoist (~> 0.9)
+      mongoid-tree (> 2.0)
+      mustache
+      nokogiri (>= 1.16.2)
+      uuid (~> 2.3)
+      zip-zip (~> 0.3)
     cqm-validators (4.0.5)
       nokogiri (>= 1.16.2)
     crack (0.4.5)
@@ -622,9 +610,9 @@ DEPENDENCIES
   carrierwave (~> 2.2.5)
   carrierwave-mongoid
   codecov
-  cqm-models!
+  cqm-models (~> 4.2.0)
   cqm-parsers!
-  cqm-reports!
+  cqm-reports (~> 4.1.0)
   cqm-validators (~> 4.0.5)
   cucumber-rails
   daemons

From d026dd65ec459814f22329d07bb01c2426836d8d Mon Sep 17 00:00:00 2001
From: David Czulada <dczulada@mitre.org>
Date: Mon, 6 May 2024 12:25:08 -0400
Subject: [PATCH 2/3] update carrierwave version

---
 Gemfile.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5e78264fd..fc1665c32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -152,7 +152,7 @@ GEM
       xpath (~> 3.2)
     capybara-accessible (0.3.0)
       capybara (>= 3.12.0)
-    carrierwave (2.2.5)
+    carrierwave (2.2.6)
       activemodel (>= 5.0.0)
       activesupport (>= 5.0.0)
       addressable (~> 2.6)
@@ -281,7 +281,7 @@ GEM
     highline (1.7.10)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     image_processing (1.12.2)
@@ -325,7 +325,7 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.3)
+    marcel (1.0.4)
     matrix (0.4.2)
     memoist (0.9.3)
     method_source (1.0.0)
@@ -335,7 +335,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     minitest-rails (7.0.0)
       minitest (~> 5.10)
       railties (~> 7.0.0)
@@ -396,7 +396,7 @@ GEM
       method_source (~> 1.0)
     pry-nav (1.0.0)
       pry (>= 0.9.10, < 0.15)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     racc (1.7.3)
     rack (2.2.8.1)
     rack-test (2.1.0)
@@ -489,7 +489,7 @@ GEM
       rubocop (~> 1.33)
     ruby-prof (0.17.0)
     ruby-progressbar (1.13.0)
-    ruby-vips (2.2.0)
+    ruby-vips (2.2.1)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (1.3.0)

From 4b572f704d9f92e7840c2cbb8f853d80da11a3f0 Mon Sep 17 00:00:00 2001
From: David Czulada <dczulada@mitre.org>
Date: Mon, 6 May 2024 14:52:57 -0400
Subject: [PATCH 3/3] peg eslint version to 8.57.0

---
 .github/workflows/ruby.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 500d73a38..396017324 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -68,7 +68,7 @@ jobs:
       run: |
         git config --global user.email "travis@travis.ci"
         git config --global user.name "Travis CI"
-        sudo npm install -g eslint
+        sudo npm install -g eslint@8.57.0
         bundle exec overcommit --sign
         bundle exec overcommit --run
   cucumber-1: