Skip to content

Commit

Permalink
Datatype regex fixes for #1703 (#1736)
Browse files Browse the repository at this point in the history
* Update metaschema for current datatype regexes for #1703.

* Back-port Metaschema XSD relocation.

As part of the OSCAL build process, we validate the structure of the
metaschema definitions of the OSCAL models themselves against the schema
of Metaschema definitions XSD from the metaschema repo. Recently, a path
update was fixed in the OSCAL develop branch but not in the release-1.0
branch or main because these changes occurred after 1.0.4 publication.
The files were relocated and reorganized. This adjustment must be made
to account for that.

Pull release/main back into develop should be minor and a rebase may not
be necessary. If so, we will adjust accordingly. In develop, see This
commit:

84d2d46

* Workaround maven.restlet.org service cert expiry. (#1602)

This is pulling over workaround as reported in usnistgov/oscal-content#139 with the WIP workaround submodule.

usnistgov/oscal-content@26f0fe1

* Update metaschema submodule again.
  • Loading branch information
aj-stein-nist authored Apr 14, 2023
1 parent 320c607 commit d496014
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build/ci-cd/validate-metaschema.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ fi
metaschema_toolchain="${OSCALDIR}/build/metaschema/toolchains/xslt-M4"
schematron="${metaschema_toolchain}/validate/metaschema-composition-check.sch"
compiled_schematron="${metaschema_toolchain}/validate/metaschema-composition-check-compiled.xsl"
metaschema_xsd="${metaschema_toolchain}/validate/metaschema.xsd"
metaschema_xsd="${OSCALDIR}/build/metaschema/schema/xml/metaschema.xsd"

build_schematron "$schematron" "$compiled_schematron"
cmd_exitcode=$?
Expand Down
2 changes: 1 addition & 1 deletion build/metaschema
Submodule metaschema updated 363 files
7 changes: 6 additions & 1 deletion build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@
the following errors:
The following artifacts could not be resolved: org.restlet.jee:org.restlet:jar:2.2.2 ...
20221230 Workaround: TLS certificates for the restlet.org maven service
expired, see the following GitHub issue for details and status updates
about workaround alternative service and target or maven.restlet.org
redirect. https://github.com/restlet/restlet-framework-java/issues/1390
-->
<repositories>
<repository>
<id>maven.restlet.org</id>
<name>maven.restlet.org</name>
<url>https://maven.restlet.org</url>
<url>https://maven.restlet.talend.com</url>
</repository>
</repositories>

Expand Down

0 comments on commit d496014

Please sign in to comment.