Skip to content

Commit

Permalink
Script and dependency fixes for v1.1.0 content updates (#1874)
Browse files Browse the repository at this point in the history
* Correct relative path to previous Maven POM dep file

Add this back as part of sprint work to build new Makefile(s) and recreate profile resolution tooling for local and GHA CI/CD for usnistgov/oscal-content#204.

* Add back pom.xml for Maven deps

This was removed in site migration work and did not appear to be relocated, as determined during the course of usnistgov/oscal-content#204. We can rely on the metaschema-xslt project, but given OSCAL has the profile resolver tool committed in its repo tree, it stands to reason to rely on its own independent Maven POM file, even if now redundant, as they may diverge in the future.
  • Loading branch information
aj-stein-nist authored Aug 7, 2023
1 parent 05ee674 commit 64e130f
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 1 deletion.
65 changes: 65 additions & 0 deletions build/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<project>
<modelVersion>4.0.0</modelVersion>

<groupId>gov.nist.secauto.oscal.tools.core</groupId>
<artifactId>oscal-support</artifactId>
<version>1.0.0</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<packaging>pom</packaging>

<!--
Required for transitive deps of xmlcalabash. If not specified, expect
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.talend.com</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>11.5</version>
</dependency>
<dependency>
<groupId>com.xmlcalabash</groupId>
<artifactId>xmlcalabash</artifactId>
<version>1.5.3-110</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration/>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion src/utils/resolver-pipeline/oscal-profile-resolve.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ OUTPUT_BASELINE=$2
ADDITIONAL_ARGS=$(shift 2; echo $@)

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
OSCAL_DIR="${SCRIPT_DIR}/../../../.."
OSCAL_DIR="${SCRIPT_DIR}/../../.."
POM_FILE="${OSCAL_DIR}/build/pom.xml"
ENTRY_STYLESHEET="${SCRIPT_DIR}/oscal-profile-RESOLVE.xsl"

Expand Down

0 comments on commit 64e130f

Please sign in to comment.