Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #5

Merged
merged 43 commits into from
Mar 21, 2024
Merged

Develop #5

merged 43 commits into from
Mar 21, 2024

Conversation

iMichaela
Copy link
Owner

Committer Notes

{Please provide a brief description of what this PR accomplishes. Be sure to reference any issues addressed. If the PR is a work-in-progress submitted for early review, please include [WIP] at the beginning of the title or mark the PR as DRAFT.}

All Submissions:

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?
  • Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

dependabot bot and others added 30 commits September 28, 2023 10:47
@dependabot @aj-stein-nist
Bump actions/checkout from 3.6.0 to 4.0.0
8d9ffc9 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@f43a0e5...3df4ab1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@Arminta-Jenkins-NIST @aj-stein-nist
Updated link for profile resolution
96d658b
@dependabot @aj-stein-nist
Bump actions/checkout from 4.0.0 to 4.1.0
31e1664 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@3df4ab1...8ade135)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @aj-stein-nist
Bump build/metaschema-xslt from 034e92b to bd4359a
928ac27 
Bumps [build/metaschema-xslt](https://github.com/usnistgov/metaschema-xslt) from `034e92b` to `bd4359a`.
- [Commits](usnistgov/metaschema-xslt@034e92b...bd4359a)

---
updated-dependencies:
- dependency-name: build/metaschema-xslt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@galtm @aj-stein-nist
Fix expected content of resolving merge-keep_profile.xml
d831a3d 
Based on the content of the catalog whose controls are being
imported, the prop names should be "label" instead of "place"
and the a1 statement paragraph should include <insert>.

Also, remove a debugging message.
@galtm @aj-stein-nist
Bug fix for selected children of unselected parent
651deef 
Unselected parent could have multiple children that
are selected, so data type of template must accommodate
multiple elements.
@galtm @aj-stein-nist
Make schema paths react to directory restructuring
534b12d
@JustKuzya @aj-stein-nist
Added hybrid cloud
1c0d6ae
@aj-stein-nist
Integrate PR feedback and merge updated enum value.
9840b46
@nikitawootten-nist
Implementation Agnostic Testing (usnistgov#1946)
dde71c3 
* Deleted duplicate `metaschema_datatypes` file
* Added spec test adr and prototype spec test file
* Spec test harness and minimal example
@aj-stein-nist
[skip ci] Add ADR-0008 for usnistgov/oscal-content#116.
e309dd5
@aj-stein-nist
[skip ci] Add missing link to oscal-content per review feedback.
fd2ff39 
Thanks for catching this, @nikitawootten-nist.
@aj-stein-nist
[skip ci] Update status, date before merge. Clarify content is still …
1d8a9a0 
…backwards compatible.
@dependabot
Bump actions/github-script from 6.4.1 to 7.0.1 (usnistgov#1961)
1d48aee 
Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.1 to 7.0.1.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@d7906e4...60a0d83)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump actions/setup-node from 3.8.1 to 4.0.0 (usnistgov#1954)
70816d7 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.1 to 4.0.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@5e21ff4...8f152de)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.apache.maven.plugins:maven-dependency-plugin in /build (usni…
b13eeb2 
…stgov#1953)

Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.0 to 3.6.1.
- [Commits](apache/maven-dependency-plugin@maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump actions/checkout from 4.1.0 to 4.1.1 (usnistgov#1950)
90089bf 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@8ade135...b4ffde6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump build/metaschema-xslt from bd4359a to 7d9fbfa (usnistgov#1955)
b9e6a2d 
Bumps [build/metaschema-xslt](https://github.com/usnistgov/metaschema-xslt) from `bd4359a` to `7d9fbfa`.
- [Commits](usnistgov/metaschema-xslt@bd4359a...7d9fbfa)

---
updated-dependencies:
- dependency-name: build/metaschema-xslt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nikitawootten-nist
Add tutorials system lifecycle ADR (usnistgov#1959)
085af23 
This ADR documents the team's decision regarding the simplified system lifecycle to be used in the tutorials.
@nikitawootten-nist
Flatten codeowners (usnistgov#1962)
fe39318 
* Flatten codeowners

* Update CODEOWNERS with feedback from the team
@iMichaela
Catalog constraints added in oscal_catalog_metaschema.xml - see issue u…
290bc84 
…snistgov#1949  (usnistgov#1952)

* Two additional allowed values for catalog/group/part/@name and catalog/group/control/part/@name

* aligned the description of group/part@name='statement' and control/part@name='statement'

* Fixed typo in the oscal_ssp_metaschema and updated controversial constraint for group/part in oscal_catalog_metaschema

* Update src/metaschema/oscal_catalog_metaschema.xml

Fixed grammar.

Co-authored-by: Chris Compton <daniel.compton@nist.gov>

---------

Co-authored-by: Iorga <miorga@pn129618.campus.nist.gov>
Co-authored-by: Chris Compton <daniel.compton@nist.gov>
@iMichaela
Updated version in the release a patch guidance (usnistgov#1964)
f72e27e
@dependabot
Bump actions/setup-java from 3 to 4 (usnistgov#1963)
ee77ab6 
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@aj-stein-nist
Remove with-parent-controls from implementation (usnistgov#1843)
c4a99cc 
* Remove with-parent-controls from XSLT profile resolver for usnistgov#1816.

* Remove profile resolver with-parent-controls tests for usnistgov#1816.
Update oscal metaschema source to version 1.1.2
97a71c1
@wendellpiez
New XSLT emulates resolve-entities.xsl, except using 3.0 features, wi…
45c1fc4 
…th XSpec
@wendellpiez
Improved initial comment on XSLT
f69c55e
@dependabot @iMichaela
Bump actions/setup-node from 4.0.0 to 4.0.1
f246530 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@8f152de...b39b52d)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @iMichaela
Bump actions/setup-node from 4.0.1 to 4.0.2
553bbc2 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@b39b52d...60edb5d)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@iMichaela
Merge branch 'develop' into enhancement-metaschema-normalizer-fixup
1d857dd
iMichaela and others added 13 commits February 20, 2024 12:31
@iMichaela
skipping the linkcheck for OSCAL site on csrc due to very tardy site …
28f801d 
…response.
@iMichaela
Merge branch 'develop' into enhancement-metaschema-normalizer-fixup
ff28491
@galtm @iMichaela
Updates to accommodate CI/CD
674d65e 
Imitate changes in xslt3-functions PR#7.

- CI/CD puts compiled XSpec file somewhere else, so define
  ov:service variable more robustly so that uuid-value.txt
  will be found regardless of where compiled XSpec file is.

- Java UUID class is not found in CI/CD, so conditionalize
  tests that use it. Running XSpec in Oxygen finds the class
  and verifies its results (same as before this change).
@galtm @iMichaela
CI/CD-friendly URIs to new location
f421eac 
- 2nd argument of resolve-uri makes the path relative to the original XSpec file instead of the compiled one, whose location can vary depending on how the test is run

- Remove one ../ from URI to resolve (similar to usnistgov#1945) because of directory reorg
@galtm @iMichaela
Mark include-controls w/ parent scenario pending
fe22cb1 
Temporary change until it's clear whether this feature
is supported and what its expected result should be.
@galtm @iMichaela
Rewrite id() usage
c8b7b54 
`select="id('a1-stmt')"` works in Oxygen but not xspec.bat or CI/CD. Expressing that select attribute a different way.

Also, I fixed a select attribute where the namespace prefix
was missing. The omission caused the test to pass for the wrong
reason (empty context).
@iMichaela
Merge branch 'develop' into enhancement-metaschema-normalizer-fixup
f55bf8d
@dependabot @iMichaela
Bump actions/add-to-project from 0.5.0 to 0.6.0
f358425 
Bumps [actions/add-to-project](https://github.com/actions/add-to-project) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/actions/add-to-project/releases)
- [Commits](actions/add-to-project@31b3f3c...0609a27)

---
updated-dependencies:
- dependency-name: actions/add-to-project
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot @iMichaela
Bump softprops/action-gh-release from 1 to 2
c909b22 
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](softprops/action-gh-release@v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@iMichaela
Merge branch 'develop' into enhancement-metaschema-normalizer-fixup
3f19e58
@iMichaela
Merging manually with no-ff Wendell's PR 1976 into develop due to con…
8988c9b 
…flicts/permissions that prevented the rebase.
@iMichaela
Addressing issue 1958 by updating the description of the property.
e8c00f0
@iMichaela
Updated the PR template to point to the OSCAL website repos.
366d155
@iMichaela iMichaela merged commit 5e71f4d into rc1-shared-responsibility-model Mar 21, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@iMichaela @Arminta-Jenkins-NIST @galtm @JustKuzya @aj-stein-nist @nikitawootten-nist @wendellpiez