Profile resolution touchups.

build/Makefile

@@ -11,7 +11,8 @@ GEN_JSON_FILES:=$(subst xml,json,$(GEN_XML_FILES))
 GEN_MIN_JSON_FILES:=$(subst .json,-min.json,$(subst xml,json,$(GEN_XML_FILES)))
 GEN_YAML_FILES:=$(subst xml,yaml,$(GEN_XML_FILES))
 XSLT_RUNNER:=oscal/build/xslt-runner.sh
-PROFILE_RESOLVER_RUNNER:=./oscal/src/utils/resolver-pipeline/oscal-profile-resolve.sh
+PROFILE_RESOLVER_RUNNER:=oscal/src/utils/resolver-pipeline/oscal-profile-resolve.sh
+PROFILE_RESOLVER_ARGS:="hide-source-profile-uri=true" "uuid-method='random-xslt'"
 XML_JSON_CONVERTER_XSLT:=oscal/build/generated/oscal_complete_xml-to-json-converter.xsl
 OSCAL_COMPLETE_XML_SCHEMA:=oscal/build/generated/oscal_complete_schema.xsd
 OSCAL_COMPLETE_JSON_SCHEMA:=oscal/build/generated/oscal_complete_schema.json
@@ -51,8 +52,8 @@ $(GEN_DIR)/%.xml: $(SRC_DIR)/%.xml
 resolve-xml-profiles: $(GEN_XML_PROFILES) ## Resolve OSCAL XML profiles for custom catalogs
 
 $(GEN_DIR)/%-resolved-profile_catalog.xml: $(SRC_DIR)/%_profile.xml
-	@mkdir -p $(@D)
-	$(PROFILE_RESOLVER_RUNNER) $(SRC_DIR)/$*_profile.xml $(GEN_DIR)/$*-resolved-profile_catalog.xml
+	mkdir -p $(@D)
+	$(PROFILE_RESOLVER_RUNNER) $(SRC_DIR)/$*_profile.xml $(GEN_DIR)/$*-resolved-profile_catalog.xml $(PROFILE_RESOLVER_ARGS)
 
 .PHONY: validate-xml-examples
 validate-xml-examples: $(GEN_XML_FILES) ## Validate XML files