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

Patching release 1.1.1 #1965

Merged
merged 28 commits into from
Dec 6, 2023
Merged

Patching release 1.1.1 #1965

merged 28 commits into from
Dec 6, 2023

Conversation

Compton-US
Copy link
Contributor

Committer Notes

  • Catalog constraints added in oscal_catalog_metaschema.xml - see issue Catalog constraint relax for CSF Data #1949 OSCAL#1952 into develop.
  • Flatten codeowners OSCAL#1962 into develop.
  • Merge Remove with-parent-controls from implementation OSCAL#1843 into develop.
  • Merge Bump actions/setup-java from 3 to 4 OSCAL#1963 into develop.
  • Merge Updated the format of the version in the patch release guidance OSCAL#1964 into develop.

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.

aj-stein-nist and others added 27 commits September 26, 2023 11:38
@aj-stein-nist
Ignore xmllint man docs on man page mirror for #1926.
6d7efe0
@aj-stein-nist
Update automation to centralized triage board
52d81d6 
The old board (https://github.com/usnistgov/OSCAL/projects/52) has been deprecated and it is time to switch board automation. Repo admins will get emails on every triage automation failure as old board is closed.
@aj-stein-nist
Add transferred issue status
f159b28 
I found this other issue type when reading GitHub's documentation and reviewing it for debugging steps.
@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] <[email protected]>
@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] <[email protected]>
@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] <[email protected]>
@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 (#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 (#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] <[email protected]>
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 (#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump org.apache.maven.plugins:maven-dependency-plugin in /build (#1953)
b13eeb2 
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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump actions/checkout from 4.1.0 to 4.1.1 (#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump build/metaschema-xslt from bd4359a to 7d9fbfa (#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nikitawootten-nist
Add tutorials system lifecycle ADR (#1959)
085af23 
This ADR documents the team's decision regarding the simplified system lifecycle to be used in the tutorials.
@nikitawootten-nist
Flatten codeowners (#1962)
fe39318 
* Flatten codeowners

* Update CODEOWNERS with feedback from the team
@iMichaela
Catalog constraints added in oscal_catalog_metaschema.xml - see issue #…
290bc84 
…1949  (#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 <[email protected]>

---------

Co-authored-by: Iorga <[email protected]>
Co-authored-by: Chris Compton <[email protected]>
@iMichaela
Updated version in the release a patch guidance (#1964)
f72e27e
@dependabot
Bump actions/setup-java from 3 to 4 (#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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@aj-stein-nist
Remove with-parent-controls from implementation (#1843)
c4a99cc 
* Remove with-parent-controls from XSLT profile resolver for #1816.

* Remove profile resolver with-parent-controls tests for #1816.
@Compton-US Compton-US requested a review from a team December 6, 2023 17:05
@Compton-US Compton-US requested a review from a team as a code owner December 6, 2023 17:05
@Compton-US Compton-US merged commit 4c00040 into release-1.1 Dec 6, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikitawootten-nist nikitawootten-nist nikitawootten-nist approved these changes

@wendellpiez wendellpiez Awaiting requested review from wendellpiez

@aj-stein-nist aj-stein-nist Awaiting requested review from aj-stein-nist

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
@Compton-US @nikitawootten-nist @aj-stein-nist @Arminta-Jenkins-NIST @galtm @JustKuzya @iMichaela