From 254b1ffb9044efad79046947ba51e11e0c1958ab Mon Sep 17 00:00:00 2001
From: Reid Hewitt <sam.hew.r@gmail.com>
Date: Thu, 13 Jun 2024 20:59:15 -0600
Subject: [PATCH 1/3] update mdtranslator depend

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

diff --git a/Gemfile b/Gemfile
index 98c45ee..d379270 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,9 @@ gem 'puma', '~> 4.1'
 # downgrade psych in response to https://stackoverflow.com/questions/68802089/rails-couldnt-infer-whether-you-are-using-multiple-databases-from-your-database
 gem 'psych', '< 4.0.0'
 
-gem 'adiwg-mdtranslator', '~> 2.18'
+gem 'adiwg-mdtranslator',
+    git: 'https://github.com/GSA/mdTranslator.git',
+    branch: 'feature/DCAT-US-v1'
 
 # Use Active Storage variant
 # gem 'image_processing', '~> 1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index cd7b9d1..8eeb9e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,21 @@
+GIT
+  remote: https://github.com/GSA/mdTranslator.git
+  revision: 9b4540f1433261761ff04814fe9d777e2fa55ca9
+  branch: feature/DCAT-US-v1
+  specs:
+    adiwg-mdtranslator (2.20.0.pre.beta.5)
+      adiwg-mdcodes (= 2.10.0)
+      adiwg-mdjson_schemas (= 2.9.5)
+      builder (~> 3.2)
+      coderay (~> 1.1)
+      jbuilder (~> 2.5)
+      json (~> 2.0)
+      json-schema (~> 2.7)
+      kramdown (>= 1.13, < 3.0)
+      nokogiri (~> 1.15)
+      thor (~> 0.19)
+      uuidtools (~> 2.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -58,21 +76,9 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    adiwg-mdcodes (2.8.4)
-      json (~> 2.0)
-    adiwg-mdjson_schemas (2.8.1)
-    adiwg-mdtranslator (2.18.4)
-      adiwg-mdcodes (= 2.8.4)
-      adiwg-mdjson_schemas (= 2.8.1)
-      builder (~> 3.2)
-      coderay (~> 1.1)
-      jbuilder (~> 2.5)
+    adiwg-mdcodes (2.10.0)
       json (~> 2.0)
-      json-schema (~> 2.7)
-      kramdown (>= 1.13, < 3.0)
-      nokogiri (~> 1.7)
-      thor (~> 0.19)
-      uuidtools (~> 2.1)
+    adiwg-mdjson_schemas (2.9.5)
     ast (2.4.2)
     bootsnap (1.17.0)
       msgpack (~> 1.2)
@@ -88,7 +94,7 @@ GEM
       activesupport (>= 5.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.5)
+    jbuilder (2.12.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     json (2.7.1)
@@ -133,7 +139,7 @@ GEM
       racc
     prettier_print (1.2.1)
     psych (3.3.4)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (4.3.12)
       nio4r (~> 2.0)
     racc (1.7.3)
@@ -226,7 +232,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  adiwg-mdtranslator (~> 2.18)
+  adiwg-mdtranslator!
   bootsnap (>= 1.4.2)
   byebug
   listen (~> 3.2)

From bdd7eebbd62e9999bcacb9e701087c8906eeeb8d Mon Sep 17 00:00:00 2001
From: Reid Hewitt <sam.hew.r@gmail.com>
Date: Wed, 19 Jun 2024 09:40:35 -0600
Subject: [PATCH 2/3] ignore vendor dir

---
 .gitignore   | 6 ++++++
 vendor/.keep | 0
 2 files changed, 6 insertions(+)
 delete mode 100644 vendor/.keep

diff --git a/.gitignore b/.gitignore
index e3eaab1..b03967d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,9 @@
 # Ignore bundler config.
 /.bundle
 
+# Local gems
+vendor/
+
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /db/*.sqlite3-journal
@@ -30,3 +33,6 @@
 
 # Ignore master key for decrypting credentials and more.
 /config/master.key
+
+# mac system files
+.DS_STORE
\ No newline at end of file
diff --git a/vendor/.keep b/vendor/.keep
deleted file mode 100644
index e69de29..0000000

From b543623cd3203b02148f35ed4b3b73be8141cdc6 Mon Sep 17 00:00:00 2001
From: Reid Hewitt <sam.hew.r@gmail.com>
Date: Wed, 19 Jun 2024 09:40:49 -0600
Subject: [PATCH 3/3] update mdtranslator depen branch

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d379270..9f3aec9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ gem 'psych', '< 4.0.0'
 
 gem 'adiwg-mdtranslator',
     git: 'https://github.com/GSA/mdTranslator.git',
-    branch: 'feature/DCAT-US-v1'
+    branch: 'datagov'
 
 # Use Active Storage variant
 # gem 'image_processing', '~> 1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8eeb9e2..4b453b4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/GSA/mdTranslator.git
-  revision: 9b4540f1433261761ff04814fe9d777e2fa55ca9
-  branch: feature/DCAT-US-v1
+  revision: fe10f1d66171757f87be54e3053e0c09821500b4
+  branch: datagov
   specs:
     adiwg-mdtranslator (2.20.0.pre.beta.5)
       adiwg-mdcodes (= 2.10.0)