Skip to content

Commit

Permalink
Version bumping and other minor release prep activities (#1923)
Browse files Browse the repository at this point in the history
* Bump schema versions for release

Bump from 1.1.0 to 1.1.1 before Arminta and team release.

* Adjust gitignore for any generated folder

Adjust the filter for the gitignore for not just generated but any directory
prefixed with the word generated.
  • Loading branch information
aj-stein-nist committed Sep 12, 2023
1 parent 0e05e18 commit 4f48e6f
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 12 deletions.
3 changes: 2 additions & 1 deletion build/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/node_modules/
/generated/
# Ignore all variations of generated_* directories
/generated*/
/out/
2 changes: 1 addition & 1 deletion src/metaschema/oscal_assessment-common_metaschema.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="yes">
<schema-name>OSCAL Assessment Layer Format -- Common Modules</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-assessment-common</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_assessment-plan_metaschema.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
<schema-name>OSCAL Assessment Plan Model</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-ap</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_assessment-results_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../build/metaschema-xslt/support/metaschema/schema/xml/metaschema.xsd">
<schema-name>OSCAL Assessment Results Model</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-ar</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_catalog_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<?xml-stylesheet type="text/css" href="metaschema-author.css"?>
<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
<schema-name>OSCAL Control Catalog Model</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-catalog</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_complete_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
]>
<METASCHEMA xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
<schema-name>OSCAL Unified Model of Models</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-complete</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal/1.0</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_component_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../build/metaschema-xslt/support/metaschema/schema/xml/metaschema.xsd">
<schema-name>OSCAL Component Definition Model</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-component-definition</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_implementation-common_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../build/metaschema-xslt/support/metaschema/schema/xml/metaschema.xsd" abstract="yes">
<schema-name>OSCAL Implementation Common Information</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-implementation-common</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_metadata_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" abstract="yes">
<schema-name>OSCAL Document Metadata Description</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-metadata</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_poam_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../build/metaschema-xslt/support/metaschema/schema/xml/metaschema.xsd">
<schema-name>OSCAL Plan of Action and Milestones (POA&amp;M) Model</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-poam</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_profile_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0">
<schema-name>OSCAL Profile Model</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-profile</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down
2 changes: 1 addition & 1 deletion src/metaschema/oscal_ssp_metaschema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<METASCHEMA xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://csrc.nist.gov/ns/oscal/metaschema/1.0" xsi:schemaLocation="http://csrc.nist.gov/ns/oscal/metaschema/1.0 ../../build/metaschema-xslt/support/metaschema/schema/xml/metaschema.xsd">
<schema-name>OSCAL System Security Plan (SSP) Model</schema-name>
<schema-version>1.1.0</schema-version>
<schema-version>1.1.1</schema-version>
<short-name>oscal-ssp</short-name>
<namespace>http://csrc.nist.gov/ns/oscal/1.0</namespace>
<json-base-uri>http://csrc.nist.gov/ns/oscal</json-base-uri>
Expand Down

0 comments on commit 4f48e6f

Please sign in to comment.