pin server + update oscal-js version

GSA · Dec 2, 2024 · 093d5da · 093d5da
1 parent 42ef645
commit 093d5da
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1,2 @@
-oscal-cli 2.4.0
+oscal-cli 2.4.0
+oscal-server v1.0.0-SNAPSHOT-6363f60-20241202160440
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "inquirer": "^10.1.8",
     "js-yaml": "^4.1.0",
     "jsdom": "^25.0.0",
-    "oscal": "2.0.6",
+    "oscal": "2.0.7",
     "ts-node": "^10.9.2",
     "xml-formatter": "^3.6.3",
     "xml2js": "^0.6.2"

diff --git a/src/validations/module.mk b/src/validations/module.mk
@@ -1,6 +1,7 @@
 # Variables
 OSCAL_VERSION = $(shell jq -r .dependencies.oscal package.json)
 OSCAL_CLI_VERSION = $(shell awk '/^oscal-cli/ {print $$2}' .tool-versions)
+OSCAL_SERVER_VERSION = $(shell awk '/^oscal-server/ {print $$2}' .tool-versions)
 OSCAL_CLI = npx oscal@$(OSCAL_VERSION)
 SRC_DIR = ./src
 DIST_DIR = ./dist
@@ -13,7 +14,7 @@ init-validations:
 	@echo "Installing node modules..."
 	npm install
 	$(OSCAL_CLI) use $(OSCAL_CLI_VERSION)
-	$(OSCAL_CLI) server update
+	$(OSCAL_CLI) server update $(OSCAL_SERVER_VERSION)
 
 # Style lint
 .PHONY: lint-style