Fixed UUID issue in resolved profile catalogs. Fixed JSON profiles to…

… point to JSON catalogs instead of XML catalogs.
GSA · Feb 5, 2020 · e8092fd · e8092fd
1 parent bab3e4d
commit e8092fd
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 24 deletions.
diff --git a/baselines/json/FedRAMP_HIGH-baseline-resolved-profile_catalog.json b/baselines/json/FedRAMP_HIGH-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 
   { "catalog" : 
-    { "id" : "3827d9c8-bd61-46f6-9bad-8e2dd990b16b",
+    { "id" : "uuid-87e79dc1-5254-4911-bea0-fed8c9ae957d",
       "metadata" : 
       { "title" : "FedRAMP High Baseline [RESOLVED]",
         "published" : "2020-02-02T00:00:00.000-05:00",
-        "last-modified" : "2020-01-28T14:25:14.000000-05:00",
+        "last-modified" : "2020-02-05T17:00:19.000000-05:00",
         "version" : "1.2",
         "oscal-version" : "1.0.0-milestone2",
         "roles" : 

diff --git a/baselines/json/FedRAMP_HIGH-baseline_profile.json b/baselines/json/FedRAMP_HIGH-baseline_profile.json
@@ -26,7 +26,7 @@
           "contact" : 
           { "party-ids" : "fedramp" } } },
       "imports" : 
-      { "href" : "https:\/\/raw.githubusercontent.com\/usnistgov\/OSCAL\/master\/content\/nist.gov\/SP800-53\/rev4\/xml\/NIST_SP-800-53_rev4_catalog.xml",
+      { "href" : "https:\/\/raw.githubusercontent.com\/usnistgov\/OSCAL\/master\/content\/nist.gov\/SP800-53\/rev4\/json\/NIST_SP-800-53_rev4_catalog.json",
         "include" : 
         { "id-selectors" : 
           [ 
@@ -2869,4 +2869,5 @@
                   "name" : "guidance",
                   "properties" : 
                   { "label" : "Guidance:" },
-                  "prose" : "In accordance with the incident response plan." } } } } ] } } }
+                  "prose" : "In accordance with the incident response plan." } } } } ] } } }
+
diff --git a/baselines/json/FedRAMP_LI-SaaS-baseline-resolved-profile_catalog.json b/baselines/json/FedRAMP_LI-SaaS-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 
   { "catalog" : 
-    { "id" : "0c798736-55c4-4191-8c0a-52759ad32ee8",
+    { "id" : "uuid-63bc0594-54ed-49a1-8c74-5b51f6aeea3d",
       "metadata" : 
       { "title" : "FedRAMP Tailored Low Impact Software as a Service (LI-SaaS) Baseline [RESOLVED]",
         "published" : "2020-02-02T00:00:00.000-05:00",
-        "last-modified" : "2020-01-28T14:26:33.000000-05:00",
+        "last-modified" : "2020-02-05T17:01:50.000000-05:00",
         "version" : "1.2",
         "oscal-version" : "1.0.0-milestone2",
         "roles" : 

diff --git a/baselines/json/FedRAMP_LI-SaaS-baseline_profile.json b/baselines/json/FedRAMP_LI-SaaS-baseline_profile.json
@@ -21,7 +21,7 @@
           { "party-ids" : "fedramp" } },
         "remarks" : "This is a DRAFT OSCAL profile intended to reflect the FedRAMP Tailored Baseline for Low Impact Software as a Service (LI-SaaS). Currently this reflects FedRAMP's parameters, additional requirements\/guidance, and control designations (Fed, NSO, Attest, etc.) Assessment objectives and actions have not been vetted and may not align. This also has not been peer reviewed. Use with caution. FedRAMP is not responsible for inaccuracies resulting from the use of this draft profile." },
       "imports" : 
-      { "href" : "https:\/\/raw.githubusercontent.com\/usnistgov\/OSCAL\/master\/content\/nist.gov\/SP800-53\/rev4\/xml\/NIST_SP-800-53_rev4_catalog.xml",
+      { "href" : "https:\/\/raw.githubusercontent.com\/usnistgov\/OSCAL\/master\/content\/nist.gov\/SP800-53\/rev4\/json\/NIST_SP-800-53_rev4_catalog.json",
         "include" : 
         { "id-selectors" : 
           [ 
@@ -2504,4 +2504,5 @@
               { "name" : "comment",
                 "ns" : "fedramp",
                 "class" : "tailored-designation",
-                "prose" : "Attestation - Specifically related to US-CERT and FedRAMP communications procedures." } } } ] } } }
+                "prose" : "Attestation - Specifically related to US-CERT and FedRAMP communications procedures." } } } ] } } }
+
diff --git a/baselines/json/FedRAMP_LOW-baseline-resolved-profile_catalog.json b/baselines/json/FedRAMP_LOW-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 
   { "catalog" : 
-    { "id" : "eeffbf3f-a798-49f7-9382-c13a7586eb7e",
+    { "id" : "uuid-bab7bf4e-a439-4b18-b633-68f842fc0a47",
       "metadata" : 
       { "title" : "FedRAMP Low Baseline [RESOLVED]",
         "published" : "2020-02-02T00:00:00.000-05:00",
-        "last-modified" : "2020-01-28T14:26:08.000000-05:00",
+        "last-modified" : "2020-02-05T17:01:18.000000-05:00",
         "version" : "1.2",
         "oscal-version" : "1.0.0-milestone2",
         "roles" : 

diff --git a/baselines/json/FedRAMP_LOW-baseline_profile.json b/baselines/json/FedRAMP_LOW-baseline_profile.json
@@ -26,7 +26,7 @@
           "contact" : 
           { "party-ids" : "fedramp" } } },
       "imports" : 
-      { "href" : "https:\/\/raw.githubusercontent.com\/usnistgov\/OSCAL\/master\/content\/nist.gov\/SP800-53\/rev4\/xml\/NIST_SP-800-53_rev4_catalog.xml",
+      { "href" : "https:\/\/raw.githubusercontent.com\/usnistgov\/OSCAL\/master\/content\/nist.gov\/SP800-53\/rev4\/json\/NIST_SP-800-53_rev4_catalog.json",
         "include" : 
         { "id-selectors" : 
           [ 
@@ -1221,4 +1221,5 @@
                   "name" : "guidance",
                   "properties" : 
                   { "label" : "Guidance:" },
-                  "prose" : "See US-CERT Incident Response Reporting Guidelines." } } } } ] } } }
+                  "prose" : "See US-CERT Incident Response Reporting Guidelines." } } } } ] } } }
+
diff --git a/baselines/json/FedRAMP_MODERATE-baseline-resolved-profile_catalog.json b/baselines/json/FedRAMP_MODERATE-baseline-resolved-profile_catalog.json
@@ -1,10 +1,10 @@
 
   { "catalog" : 
-    { "id" : "ab28b535-6379-48c9-b5d6-463a39aa7576",
+    { "id" : "uuid-68008409-ee13-437e-a506-55f778f4ede0",
       "metadata" : 
       { "title" : "FedRAMP Moderate Baseline [RESOLVED]",
         "published" : "2020-02-02T00:00:00.000-05:00",
-        "last-modified" : "2020-01-28T14:25:50.000000-05:00",
+        "last-modified" : "2020-02-05T17:01:01.000000-05:00",
         "version" : "1.2",
         "oscal-version" : "1.0.0-milestone2",
         "roles" : 

diff --git a/baselines/json/FedRAMP_MODERATE-baseline_profile.json b/baselines/json/FedRAMP_MODERATE-baseline_profile.json
@@ -26,7 +26,7 @@
           "contact" : 
           { "party-ids" : "fedramp" } } },
       "imports" : 
-      { "href" : "https:\/\/raw.githubusercontent.com\/usnistgov\/OSCAL\/master\/content\/nist.gov\/SP800-53\/rev4\/xml\/NIST_SP-800-53_rev4_catalog.xml",
+      { "href" : "https:\/\/raw.githubusercontent.com\/usnistgov\/OSCAL\/master\/content\/nist.gov\/SP800-53\/rev4\/json\/NIST_SP-800-53_rev4_catalog.json",
         "include" : 
         { "id-selectors" : 
           [ 
@@ -2427,4 +2427,5 @@
                   "name" : "guidance",
                   "properties" : 
                   { "label" : "Guidance:" },
-                  "prose" : "In accordance with the incident response plan." } } } } ] } } }
+                  "prose" : "In accordance with the incident response plan." } } } } ] } } }
+
diff --git a/baselines/xml/FedRAMP_HIGH-baseline-resolved-profile_catalog.xml b/baselines/xml/FedRAMP_HIGH-baseline-resolved-profile_catalog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="3827d9c8-bd61-46f6-9bad-8e2dd990b16b">
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="uuid-87e79dc1-5254-4911-bea0-fed8c9ae957d">
   <metadata>
     <title>FedRAMP High Baseline [RESOLVED]</title>
     <published>2020-02-02T00:00:00.000-05:00</published>
-    <last-modified>2020-01-28T14:25:14.000000-05:00</last-modified>
+    <last-modified>2020-02-05T17:00:19.000000-05:00</last-modified>
     <version>1.2</version>
     <oscal-version>1.0.0-milestone2</oscal-version>
     <role id="creator">

diff --git a/baselines/xml/FedRAMP_LI-SaaS-baseline-resolved-profile_catalog.xml b/baselines/xml/FedRAMP_LI-SaaS-baseline-resolved-profile_catalog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="0c798736-55c4-4191-8c0a-52759ad32ee8">
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="uuid-63bc0594-54ed-49a1-8c74-5b51f6aeea3d">
   <metadata>
     <title>FedRAMP Tailored Low Impact Software as a Service (LI-SaaS) Baseline [RESOLVED]</title>
     <published>2020-02-02T00:00:00.000-05:00</published>
-    <last-modified>2020-01-28T14:26:33.000000-05:00</last-modified>
+    <last-modified>2020-02-05T17:01:50.000000-05:00</last-modified>
     <version>1.2</version>
     <oscal-version>1.0.0-milestone2</oscal-version>
     <role id="author">

diff --git a/baselines/xml/FedRAMP_LOW-baseline-resolved-profile_catalog.xml b/baselines/xml/FedRAMP_LOW-baseline-resolved-profile_catalog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="eeffbf3f-a798-49f7-9382-c13a7586eb7e">
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="uuid-bab7bf4e-a439-4b18-b633-68f842fc0a47">
   <metadata>
     <title>FedRAMP Low Baseline [RESOLVED]</title>
     <published>2020-02-02T00:00:00.000-05:00</published>
-    <last-modified>2020-01-28T14:26:08.000000-05:00</last-modified>
+    <last-modified>2020-02-05T17:01:18.000000-05:00</last-modified>
     <version>1.2</version>
     <oscal-version>1.0.0-milestone2</oscal-version>
     <role id="creator">

diff --git a/baselines/xml/FedRAMP_MODERATE-baseline-resolved-profile_catalog.xml b/baselines/xml/FedRAMP_MODERATE-baseline-resolved-profile_catalog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="ab28b535-6379-48c9-b5d6-463a39aa7576">
+<catalog xmlns="http://csrc.nist.gov/ns/oscal/1.0" id="uuid-68008409-ee13-437e-a506-55f778f4ede0">
   <metadata>
     <title>FedRAMP Moderate Baseline [RESOLVED]</title>
     <published>2020-02-02T00:00:00.000-05:00</published>
-    <last-modified>2020-01-28T14:25:50.000000-05:00</last-modified>
+    <last-modified>2020-02-05T17:01:01.000000-05:00</last-modified>
     <version>1.2</version>
     <oscal-version>1.0.0-milestone2</oscal-version>
     <role id="prepared-by">