From a8461fb3a4a40e83c40e0e9b9a60800ab6e39f3e Mon Sep 17 00:00:00 2001
From: "~ . ~" <paul.n.wand@gsa.gov>
Date: Mon, 2 Dec 2024 11:09:13 -0500
Subject: [PATCH] pin server + update oscal-js version

---
 .tool-versions            | 3 ++-
 package-lock.json         | 8 ++++----
 package.json              | 2 +-
 src/validations/module.mk | 3 ++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.tool-versions b/.tool-versions
index 7e05263d3..c1bdf69c1 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1,2 @@
-oscal-cli 2.4.0
\ No newline at end of file
+oscal-cli 2.4.0
+oscal-server v1.0.0-SNAPSHOT-6363f60-20241202160440
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 698520ddb..60f071366 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,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"
@@ -2694,9 +2694,9 @@
       }
     },
     "node_modules/oscal": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/oscal/-/oscal-2.0.6.tgz",
-      "integrity": "sha512-+hSDqr7Ddi3qqvAaSN8XRsrrgxrsORfvLVZIpgrTz/AzWum0R+PnCFlxQ9+KMuptxXW9kAcfAwyXmhdIjaZV8g==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/oscal/-/oscal-2.0.7.tgz",
+      "integrity": "sha512-V924hmb+QZDuBJGLH63RZui7yzrpVvSQAq9TvWCt2XacrpXqiYwEst0ZyyWza9wrt4zEXJrhAP3wzz1oj38pHA==",
       "license": "MIT",
       "dependencies": {
         "@terascope/fetch-github-release": "^0.8.10",
diff --git a/package.json b/package.json
index 91480fb81..c78d588e4 100644
--- 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
index 96c289f4b..679c12500 100644
--- 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