From 0703c1c2674d64ba0cc21ea24664a542e4efabbb Mon Sep 17 00:00:00 2001
From: galtm <40716346+galtm@users.noreply.github.com>
Date: Mon, 25 Jul 2022 19:08:36 -0400
Subject: [PATCH] Follow keep instruction for back-matter resources (#1378)
If a back-matter resource has a keep instruction, the spec
requirement "req-backmatter-keep" says not to replace the
resource unless a later one also has a keep instruction.
---
.../oscal-profile-resolve-merge.xsl | 14 +-
.../testing/3_merged/merge.xspec | 121 ++++++++++++++++++
2 files changed, 132 insertions(+), 3 deletions(-)
diff --git a/src/utils/util/resolver-pipeline/oscal-profile-resolve-merge.xsl b/src/utils/util/resolver-pipeline/oscal-profile-resolve-merge.xsl
index 89099f6f9f..2cc3b21aa0 100644
--- a/src/utils/util/resolver-pipeline/oscal-profile-resolve-merge.xsl
+++ b/src/utils/util/resolver-pipeline/oscal-profile-resolve-merge.xsl
@@ -110,10 +110,18 @@
+
+
+
-
-
+
+
+
diff --git a/src/utils/util/resolver-pipeline/testing/3_merged/merge.xspec b/src/utils/util/resolver-pipeline/testing/3_merged/merge.xspec
index d9e44c873d..a20f188339 100644
--- a/src/utils/util/resolver-pipeline/testing/3_merged/merge.xspec
+++ b/src/utils/util/resolver-pipeline/testing/3_merged/merge.xspec
@@ -494,6 +494,127 @@
+
+
+
+
+
+ Control X1
+
+
+ Ref BBB, first
+
+
+
+
+
+ Control X2
+
+
+ Ref BBB, second
+
+
+
+
+
+ Ref BBB, third
+
+
+
+
+
+
+
+
+ Ref BBB, first
+
+
+
+ Ref BBB, third
+
+
+
+
+
+
+
+
+ Control X1
+
+
+ Ref BBB, first
+
+
+
+
+
+ Control X2
+
+
+ Ref BBB, second
+
+
+
+
+
+ Ref BBB, third
+
+
+
+
+
+
+
+
+
+ Ref BBB, third
+
+
+
+
+
+
+
+
+
+ Control X1
+
+
+ Ref BBB, first
+
+
+
+
+
+ Control X2
+
+
+ Ref BBB, second
+
+
+
+
+
+
+ Ref BBB, third
+
+
+
+
+
+
+
+
+ Ref BBB, second
+
+
+
+ Ref BBB, third
+
+
+
+
+