Skip to content

Commit

Permalink
Merge tag 'v3.0.3'
Browse files Browse the repository at this point in the history
[maven-release-plugin] copy for tag v3.0.3
  • Loading branch information
aj-stein-nist committed Feb 1, 2024
2 parents e343972 + bc4c359 commit f2ca876
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
contents: read
security-events: write
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
token: ${{ github.token }}
submodules: recursive
Expand All @@ -35,14 +35,14 @@ jobs:
maven-version: 3.9.3
- name: Set up JDK 11 (build only)
if: ${{ !((github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref_name == 'develop') }}
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 11
distribution: 'temurin'
cache: 'maven'
- name: Set up JDK 11 (deploy)
if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref_name == 'develop'
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 11
distribution: 'temurin'
Expand All @@ -54,7 +54,7 @@ jobs:
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
- name: Initialize CodeQL
if: github.event_name == 'push'
uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4
uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
with:
languages: java
# -------------------------
Expand All @@ -74,7 +74,7 @@ jobs:
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- name: Perform CodeQL Analysis
if: github.event_name == 'push'
uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4
uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923
- name: Test Website
run: |
# this needs to be run as a second build to ensure source is fully generated by the previous step
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
actions: read
contents: write
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
token: ${{ github.token }}
submodules: recursive
Expand All @@ -25,7 +25,7 @@ jobs:
with:
maven-version: 3.9.3
- name: Set up JDK 11
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2
uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
java-version: 11
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion oscal
Submodule oscal updated 41 files
+8 −12 .github/CODEOWNERS
+8 −17 .github/workflows/issue-triage.yml
+3 −3 .github/workflows/periodic.yml
+2 −2 .github/workflows/release.yml
+3 −3 .github/workflows/status.yml
+5 −2 build/markdown-link-check.json
+1 −1 build/metaschema-xslt
+1 −1 build/pom.xml
+80 −0 decisions/0007-implementation-agnostic-tests.md
+65 −0 decisions/0008-oscal-content-management.md
+46 −0 decisions/0009-tutorials-system-lifecycle.md
+1 −1 src/metaschema/oscal_assessment-common_metaschema.xml
+1 −1 src/metaschema/oscal_assessment-plan_metaschema.xml
+1 −1 src/metaschema/oscal_assessment-results_metaschema.xml
+4 −2 src/metaschema/oscal_catalog_metaschema.xml
+1 −1 src/metaschema/oscal_complete_metaschema.xml
+1 −1 src/metaschema/oscal_component_metaschema.xml
+1 −1 src/metaschema/oscal_implementation-common_metaschema.xml
+1 −1 src/metaschema/oscal_metadata_metaschema.xml
+1 −1 src/metaschema/oscal_poam_metaschema.xml
+1 −1 src/metaschema/oscal_profile_metaschema.xml
+3 −1 src/metaschema/oscal_ssp_metaschema.xml
+0 −241 src/specifications/profile-resolution/metaschema-datatypes.xsd
+42 −0 src/specifications/profile-resolution/profile-resolution-examples/catalogs/abc-multiple-children_catalog.xml
+6 −6 ...ecifications/profile-resolution/profile-resolution-examples/output-expected/merge-keep_profile_RESOLVED.xml
+33 −0 ...ications/profile-resolution/profile-resolution-examples/output-expected/without-parent_profile_RESOLVED.xml
+18 −0 src/specifications/profile-resolution/profile-resolution-examples/without-parent_profile.xml
+1 −1 src/specifications/profile-resolution/profile-resolution-specml-requirements.xspec
+2 −2 src/specifications/profile-resolution/profile-resolution-specml.xml
+1 −1 src/specifications/profile-resolution/profile-resolution-unit-tests.xml
+1 −1 src/specifications/profile-resolution/readme.md
+1 −1 src/specifications/profile-resolution/resolution-testing.xml
+472 −0 src/specifications/profile-resolution/spec-tester.py
+17 −0 src/specifications/profile-resolution/spec-tests.json
+1 −1 src/specifications/profile-resolution/unit-tests.xsd
+8 −20 src/utils/resolver-pipeline/select-or-custom-merge.xsl
+1 −1 src/utils/resolver-pipeline/testing/1_selected/resource-media-type.xml
+1 −1 src/utils/resolver-pipeline/testing/1_selected/resource-multiple-rlinks.xml
+14 −200 src/utils/resolver-pipeline/testing/1_selected/select.xspec
+2 −2 src/utils/resolver-pipeline/testing/pathological-profile.xml
+1 −1 versioning-and-branching.md
30 changes: 15 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<parent>
<groupId>gov.nist.secauto</groupId>
<artifactId>oss-parent</artifactId>
<version>26</version>
<version>27</version>
</parent>

<groupId>gov.nist.secauto.oscal</groupId>
<artifactId>liboscal-java</artifactId>
<version>3.0.2</version>
<version>3.0.3</version>
<packaging>jar</packaging>

<name>OSCAL Java Library</name>
Expand All @@ -27,7 +27,7 @@
<url>https://github.com/usnistgov/liboscal-java</url>
<connection>scm:git:[email protected]:usnistgov/liboscal-java.git</connection>
<developerConnection>scm:git:[email protected]:usnistgov/liboscal-java.git</developerConnection>
<tag>v3.0.2</tag>
<tag>v3.0.3</tag>
</scm>

<distributionManagement>
Expand Down Expand Up @@ -124,17 +124,17 @@

<dependency.metaschema-framework.version>0.12.2</dependency.metaschema-framework.version>

<dependency.auto-service.version>1.0.1</dependency.auto-service.version>
<dependency.commons-lang3.version>3.13.0</dependency.commons-lang3.version>
<dependency.auto-service.version>1.1.1</dependency.auto-service.version>
<dependency.commons-lang3.version>3.14.0</dependency.commons-lang3.version>
<dependency.infinispan.version>13.0.10.Final</dependency.infinispan.version>
<dependency.jetbrains-annotation.version>23.0.0</dependency.jetbrains-annotation.version>
<dependency.jmock-junit5.version>2.12.0</dependency.jmock-junit5.version>
<dependency.log4j2.version>2.20.0</dependency.log4j2.version>
<dependency.saxon.version>12.3</dependency.saxon.version>
<dependency.log4j2.version>2.22.0</dependency.log4j2.version>
<dependency.saxon.version>12.4</dependency.saxon.version>
<dependency.spotbugs-annotations.version>4.7.3</dependency.spotbugs-annotations.version>
<dependency.xmlresolver.version>4.6.0</dependency.xmlresolver.version>
<dependency.xmlresolver.version>5.2.3</dependency.xmlresolver.version>

<plugin.cyclonedx.version>2.7.3</plugin.cyclonedx.version>
<plugin.cyclonedx.version>2.7.11</plugin.cyclonedx.version>
<plugin.maven-toolchains.version>3.1.0</plugin.maven-toolchains.version>

<cyclonedx.schema.version>1.3</cyclonedx.schema.version>
Expand Down Expand Up @@ -273,19 +273,19 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<version>3.25.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-assertj3</artifactId>
<version>2.9.0</version>
<version>2.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -398,7 +398,7 @@
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
<version>6.0.0</version>
<version>7.0.0</version>
<configuration>
<useNativeGit>false</useNativeGit>
</configuration>
Expand Down Expand Up @@ -469,7 +469,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>templating-maven-plugin</artifactId>
<version>1.0.0</version>
<version>3.0.0</version>
<executions>
<execution>
<id>filter-src</id>
Expand All @@ -482,7 +482,7 @@
<plugin>
<groupId>com.googlecode.maven-download-plugin</groupId>
<artifactId>download-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.8.0</version>
<configuration>
<skipCache>true</skipCache>
<overwrite>false</overwrite>
Expand Down

0 comments on commit f2ca876

Please sign in to comment.