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

Script and dependency fixes for v1.1.0 content updates #1874

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Script and dependency fixes for v1.1.0 content updates #1874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad5a527
Correct relative path to previous Maven POM dep file
aj-stein-nist Aug 6, 2023
012c57d
Add back pom.xml for Maven deps
aj-stein-nist Aug 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions build/pom.xml
View file
Open in desktop
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
View file
Open in desktop
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