Merging master to test

.gitignore

@@ -6,3 +6,10 @@ _site
 .jekyll-cache/*
 node_modules
 .vscode/settings.json
+Gemfile.lock
+.DS_Store
+assets/img
+assets/fonts
+assets/js/uswds.js
+assets/js/uswds.min.js
+assets/js/uswds.min.js.map

.ruby-version

@@ -1 +1 @@
-2.6.6
+3.1.3

404.html

@@ -11,14 +11,14 @@ <h2>Ooops!  The page you’re looking for does not seem to be available.</h2>
       <p>If you would like to try again, below are suggestions that will take you to the primary categories of our site:</p>
 
       <div class="grid-row grid-gap" style="justify-content: center; font-weight: bold;">
-          <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/marketplace1/">MarketPlace</a></div>
+          <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/marketplace/">GovOps MarketPlace</a></div>
           <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/governance/">Governance</a></div>
-          <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/fibf/">Business Standards</a></div>
+          <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/fibf/">Data and Business Standards</a></div>
           <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/qsmo/">QSMO</a></div>
-          <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/m3/">M3 Framework</a></div>
+          <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/m3/">Modernization</a></div>
           <div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/about/">About OSSPI</a></div>
       </div>
-      <h3 style="color: black;">We check our sites regularly for broken links; however, you may find one before we get to it.  If that happens, please send us a note at <a href="mailto:ussmteam@gsa.gov">ussmteam@gsa.gov</a> and we’ll get right on it to correct the problem!  Thank You!</h3>
+      <h3 style="color: black;">We check our sites regularly for broken links; however, you may find one before we get to it.  If that happens, please send us a note at <a href="mailto:OSSPI.SharedServices@gsa.gov">OSSPI.SharedServices@gsa.gov</a> and we’ll get right on it to correct the problem!  Thank You!</h3>
     </div>
   </div>
 </div>

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.6.6
+FROM ruby:3.1.3
 
 RUN apt-get update && \
   apt-get install --reinstall -y locales && \

Gemfile

@@ -1,9 +1,10 @@
-ruby '>= 2.6.6'
+ruby '>= 3.1.3'
 
 source "https://rubygems.org"
 
-gem "jekyll", "~> 3.8"
-
+gem "jekyll", "~> 4.3.3"
+gem "webrick", ">= 1.8.2"
+gem 'jekyll-liquify', "0.0.2"
 # See https://github.com/envygeeks/jekyll-assets/issues/622
 gem "sprockets", "~> 3.7"
 
@@ -13,7 +14,6 @@ group :jekyll_plugins do
   gem 'jekyll-paginate-v2', "3.0.0"  
   gem 'jekyll-sitemap'
   gem 'jekyll-seo-tag'
-  gem "jekyll-assets", "~> 3.0", group: :jekyll_plugins
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -24,4 +24,6 @@ gem "wdm", "~> 0.1.0" if Gem.win_platform?
 
 gem "html-proofer", "~> 3.15"
 
-gem 'jekyll-datapage-generator'
+gem 'jekyll-datapage-generator'
+
+gem 'jekyll-sass-converter', '~> 3.0'

Gemfile.lock

@@ -1,147 +1,129 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.1.6)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.3.4)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
+      http_parser.rb (~> 0)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    eventmachine (1.2.7-x64-mingw32)
-    execjs (2.7.0)
-    extras (0.3.0)
-      forwardable-extended (~> 2.5)
-    fastimage (2.1.7)
-    ffi (1.13.1)
-    ffi (1.13.1-x64-mingw32)
+    ffi (1.17.0-x86_64-linux-gnu)
     forwardable-extended (2.6.0)
-    html-proofer (3.15.3)
+    google-protobuf (4.29.1-x86_64-linux)
+      bigdecimal
+      rake (>= 13)
+    html-proofer (3.19.4)
       addressable (~> 2.3)
       mercenary (~> 0.3)
-      nokogumbo (~> 2.0)
-      parallel (~> 1.3)
+      nokogiri (~> 1.13)
+      parallel (~> 1.10)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
-    http_parser.rb (0.6.0)
-    i18n (0.9.5)
+    http_parser.rb (0.8.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.7)
+    jekyll (4.3.4)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 0.7)
-      jekyll-sass-converter (~> 1.0)
+      i18n (~> 1.0)
+      jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 1.14)
+      kramdown (~> 2.3, >= 2.3.1)
+      kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3.3)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
-      rouge (>= 1.7, < 4)
+      rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
-    jekyll-assets (3.0.12)
-      activesupport (~> 5.0)
-      execjs (~> 2.7)
-      extras (~> 0.2)
-      fastimage (~> 2.0, >= 1.8)
-      jekyll (>= 3.5, < 4.0)
-      jekyll-sanity (~> 1.2)
-      liquid-tag-parser (~> 1.0)
-      nokogiri (~> 1.8)
-      pathutil (~> 0.16)
-      sprockets (>= 3.3, < 4.1.beta)
+      terminal-table (>= 1.8, < 4.0)
+      webrick (~> 1.7)
     jekyll-datapage-generator (1.4.0)
-    jekyll-feed (0.15.0)
+    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
+    jekyll-liquify (0.0.2)
+      liquid (>= 2.5, < 5.0)
+      redcarpet (~> 3.1)
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sanity (1.2.0)
-      jekyll (~> 3.1)
-    jekyll-sass-converter (1.5.2)
-      sass (~> 3.4)
-    jekyll-seo-tag (2.6.1)
-      jekyll (>= 3.3, < 5.0)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
+    jekyll-seo-tag (2.8.0)
+      jekyll (>= 3.8, < 5.0)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (1.17.0)
-    liquid (4.0.3)
-    liquid-tag-parser (1.9.0)
-      extras (~> 0.3)
-      liquid (>= 3.0, < 5.0)
-    listen (3.2.1)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.3.6)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.9-x64-mingw32)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.2)
-      nokogiri (~> 1.8, >= 1.8.4)
-    parallel (1.19.1)
+    mercenary (0.4.0)
+    nokogiri (1.17.0-x86_64-linux)
+      racc (~> 1.4)
+    parallel (1.26.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.5)
-    rack (2.2.3)
-    rainbow (3.0.0)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (2.2.10)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rouge (3.20.0)
+    redcarpet (3.6.0)
+    rexml (3.3.9)
+    rouge (4.5.1)
     safe_yaml (1.0.5)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sprockets (3.7.2)
+    sass-embedded (1.82.0)
+      google-protobuf (~> 4.28)
+      rake (>= 13)
+    sprockets (3.7.5)
+      base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    thread_safe (0.3.6)
-    typhoeus (1.3.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2020.6)
-      tzinfo (>= 1.0.0)
-    wdm (0.1.1)
+    unicode-display_width (2.6.0)
+    webrick (1.9.1)
     yell (2.2.2)
 
 PLATFORMS
-  ruby
-  x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   html-proofer (~> 3.15)
-  jekyll (~> 3.8)
-  jekyll-assets (~> 3.0)
+  jekyll (~> 4.3.3)
   jekyll-datapage-generator
   jekyll-feed (~> 0.15)
+  jekyll-liquify (= 0.0.2)
   jekyll-paginate-v2 (= 3.0.0)
   jekyll-redirect-from
+  jekyll-sass-converter (~> 3.0)
   jekyll-seo-tag
   jekyll-sitemap
   sprockets (~> 3.7)
   tzinfo-data
-  wdm (~> 0.1.0)
+  webrick (>= 1.8.2)
 
 RUBY VERSION
-   ruby 2.6.6p146
+   ruby 3.1.3p185
 
 BUNDLED WITH
-   1.17.3
+   2.4.21

Performance/README.txt

@@ -0,0 +1 @@
+Empty folder

SECURITY.md

@@ -0,0 +1,32 @@
+# Security Policy
+
+As a U.S. Government agency, the General Services Administration (GSA) takes
+seriously our responsibility to protect the public's information, including
+financial and personal information, from unwarranted disclosure.
+
+## Reporting a Vulnerability
+
+Services operated by the U.S. General Services Administration (GSA)
+are covered by the **GSA Vulnerability Disclosure Program (VDP)**.
+
+See the [GSA Vulnerability Disclosure Policy](https://gsa.gov/vulnerability-disclosure-policy)
+at <https://www.gsa.gov/vulnerability-disclosure-policy> for details including:
+
+* How to submit a report if you believe you have discovered a vulnerability.
+* Bug bounty scope.
+* GSA's coordinated disclosure policy.
+* Information on how you may conduct security research on GSA developed
+  software and systems.
+* Important legal and policy guidance.
+
+## Supported Versions
+
+Please note that only certain branches are supported with security updates.
+
+| Version (Branch) | Supported          |
+| ---------------- | ------------------ |
+| main             | :white_check_mark: |
+| other            | :x:                |
+
+When using this code or reporting vulnerabilities please only use supported
+versions.