Skip to content

Commit b123c11

Browse files
author
Michaela Iorga
committed
Merging the released patch.
2 parents 4f02dac + 08206e5 commit b123c11

33 files changed

+1261
-253
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ By submitting a pull request, you are agreeing to provide this contribution unde
1919
- [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
2020
- [ ] Have you written new tests for your core changes, as applicable?
2121
- [ ] Have you included examples of how to use your new feature(s)?
22-
- [ ] Have you updated all [OSCAL website](https://pages.nist.gov/OSCAL) 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.
22+
- [ ] Have you updated the [OSCAL website](https://pages.nist.gov/OSCAL) and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the [OSCAL-Pages](https://github.com/usnistgov/OSCAL-Pages) and [OSCAL_Reference](https://github.com/usnistgov/OSCAL-Reference) repositories.

.github/workflows/issue-triage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Add issue to project
1313
runs-on: ubuntu-20.04
1414
steps:
15-
- uses: actions/add-to-project@31b3f3ccdc584546fc445612dec3f38ff5edb41c
15+
- uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e
1616
with:
1717
project-url: https://github.com/orgs/usnistgov/projects/25
1818
github-token: ${{ secrets.COMMIT_TOKEN }}

.github/workflows/periodic.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
# Needed to post comments and issues
1313
issues: write
1414
steps:
15-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1616
with:
1717
submodules: recursive
18-
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
18+
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
1919
with:
2020
node-version-file: "build/.nvmrc"
2121
cache: "npm"

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Package Release
99
runs-on: ubuntu-22.04
1010
steps:
11-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
11+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
1212
with:
1313
submodules: recursive
1414
- uses: actions/setup-java@v4
@@ -21,7 +21,7 @@ jobs:
2121
make -j2 artifacts archives RELEASE=${GITHUB_REF_NAME:1}
2222
working-directory: build
2323
- name: Create release
24-
uses: softprops/action-gh-release@v1
24+
uses: softprops/action-gh-release@v2
2525
with:
2626
token: ${{ secrets.COMMIT_TOKEN }}
2727
draft: true

.github/workflows/status.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ jobs:
1818
name: Status Checks
1919
runs-on: ubuntu-22.04
2020
steps:
21-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
2222
with:
2323
submodules: recursive
2424
- uses: actions/setup-java@v4
2525
with:
2626
distribution: "temurin"
2727
java-version: "17"
28-
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
28+
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
2929
with:
3030
node-version-file: "build/.nvmrc"
3131
cache: "npm"

CONTRIBUTING.md

-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ All requests for changes and enhancements to OSCAL are initiated through the pro
4242
* [Defect Report](../../issues/new?template=bug_report.md&labels=bug): Use to report a problem with an existing OSCAL feature or capability.
4343
* [Question](../../issues/new?labels=question&template=question.md): Use to ask a question about OSCAL.
4444

45-
Issue triage is managed by the core OSCAL project team using a [specialized project board](../../projects/52).
46-
4745
The core OSCAL project team regularly reviews open issues, prioritizes their handling, and updates the issue statuses and comments as needed.
4846

4947
## Communications mechanisms

build/.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16
1+
v20

build/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ $(LINKCHECK_OUTPUT): node_modules $(LINKCHECK_CONFIG)
153153
@mkdir -p $(GENERATED_DIR)
154154
@echo Checking Markdown links...
155155
cd ..; git ls-files -z "*.md" | \
156-
xargs -0 npx --prefix build/ markdown-link-check -c build/$(LINKCHECK_CONFIG) | \
156+
xargs -0n1 npx --prefix build/ markdown-link-check -c build/$(LINKCHECK_CONFIG) | \
157157
tee build/$(LINKCHECK_OUTPUT); \
158158
exit $${PIPESTATUS[1]}
159159

build/markdown-link-check.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
},
1212
{
1313
"pattern": "https://linux.die.net/man/1/xmllint/"
14-
}
14+
},
15+
{
16+
"pattern": "https://csrc.nist.gov/Projects/Open-Security-Controls-Assessment-Language"
17+
}
1518
],
1619
"replacementPatterns": [
1720
{

build/metaschema-xslt

Submodule metaschema-xslt updated 132 files

0 commit comments

Comments
 (0)