Merge pull request #1525 from hapifhir/2023-12-gg-tx-word

2023 12 gg tx work

org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR2.java

@@ -211,8 +211,14 @@ public class TerminologyClientR2 implements ITerminologyClient {
   }
 
   @Override
-  public ITerminologyClient setLanguage(String lang) {
-    client.setLanguage(lang);
+  public ITerminologyClient setAcceptLanguage(String lang) {
+    client.setAcceptLanguage(lang);
+    return this;
+  }
+  
+  @Override
+  public ITerminologyClient setContentLanguage(String lang) {
+    client.setContentLanguage(lang);
     return this;
   }
 }

org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR3.java

@@ -213,8 +213,14 @@ public class TerminologyClientR3 implements ITerminologyClient {
   }
 
   @Override
-  public ITerminologyClient setLanguage(String lang) {
-    client.setLanguage(lang);
+  public ITerminologyClient setAcceptLanguage(String lang) {
+    client.setAcceptLanguage(lang);
+    return this;
+  }
+  
+  @Override
+  public ITerminologyClient setContentLanguage(String lang) {
+    client.setContentLanguage(lang);
     return this;
   }
 }

org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR4.java

@@ -223,9 +223,16 @@ public class TerminologyClientR4 implements ITerminologyClient {
     return client.getServerVersion();
   }
 
+
   @Override
-  public ITerminologyClient setLanguage(String lang) {
-    client.setLanguage(lang);
+  public ITerminologyClient setAcceptLanguage(String lang) {
+    client.setAcceptLanguage(lang);
+    return this;
+  }
+  
+  @Override
+  public ITerminologyClient setContentLanguage(String lang) {
+    client.setContentLanguage(lang);
     return this;
   }
 }

org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/txClient/TerminologyClientR5.java

@@ -201,8 +201,14 @@ public class TerminologyClientR5 implements ITerminologyClient {
   }
 
   @Override
-  public ITerminologyClient setLanguage(String lang) {
-    client.setLanguage(lang);
+  public ITerminologyClient setAcceptLanguage(String lang) {
+    client.setAcceptLanguage(lang);
+    return this;
+  }
+  
+  @Override
+  public ITerminologyClient setContentLanguage(String lang) {
+    client.setContentLanguage(lang);
     return this;
   }
 }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/ClientUtils.java

@@ -106,6 +106,7 @@ public class ClientUtils {
   private int retryCount;
   private String userAgent;
   private String acceptLang;
+  private String contentLang;
 
   public HttpHost getProxy() {
     return proxy;
@@ -298,6 +299,9 @@ public class ClientUtils {
     if (!Utilities.noString(acceptLang)) {
       request.addHeader("Accept-Language", acceptLang);
     }
+    if (!Utilities.noString(contentLang)) {
+      request.addHeader("Content-Language", acceptLang);
+    }
 
     if (format != null) {
       request.addHeader("Accept", format);
@@ -726,7 +730,10 @@ public class ClientUtils {
     this.userAgent = userAgent;
   }
 
-  public void setLanguage(String language) {
+  public void setAcceptLanguage(String language) {
     this.acceptLang = language;
   }
+  public void setContentLanguage(String language) {
+    this.contentLang = language;
+  }
 }

org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/client/FHIRToolingClient.java

@@ -894,8 +894,12 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
     return conf == null ? null : conf.getSoftware().getVersion();
   }
 
-  public void setLanguage(String lang) {
-    utils.setLanguage(lang);
+  public void setContentLanguage(String lang) {
+    utils.setContentLanguage(lang);
+  }
+
+  public void setAcceptLanguage(String lang) {
+    utils.setAcceptLanguage(lang);
   }
 
 }

org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/client/FHIRToolingClient.java

@@ -78,6 +78,7 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
   private String userAgent;
   private EnumSet<FhirPublication> allowedVersions;
   private String acceptLang;
+  private String contentLang;
 
   //Pass endpoint for client - URI
   public FHIRToolingClient(String baseServiceUrl, String userAgent) throws URISyntaxException {
@@ -593,6 +594,9 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
     if (!Utilities.noString(acceptLang)) {
       builder.add("Accept-Language: "+acceptLang);
     }
+    if (!Utilities.noString(contentLang)) {
+      builder.add("Content-Language: "+contentLang);
+    }
     return builder.build();
   }
 
@@ -619,8 +623,11 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
     return capabilities == null ? null : capabilities.getSoftware().getVersion();
   }
 
-  public void setLanguage(String lang) {
+  public void setAcceptLanguage(String lang) {
     this.acceptLang = lang;
   }
+  public void setContentLanguage(String lang) {
+    this.contentLang = lang;
+  }
 }
 

org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/FHIRToolingClient.java

@@ -79,6 +79,7 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
   private String password;
   private String userAgent;
   private String acceptLang;
+  private String contentLang;
 
   // Pass endpoint for client - URI
   public FHIRToolingClient(String baseServiceUrl, String userAgent) throws URISyntaxException {
@@ -579,6 +580,9 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
     if (!Utilities.noString(acceptLang)) {
       builder.add("Accept-Language: "+acceptLang);
     }
+    if (!Utilities.noString(contentLang)) {
+      builder.add("Content-Language: "+contentLang);
+    }
     
     return builder.build();
   }
@@ -606,7 +610,11 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
     return capabilities == null ? null : capabilities.getSoftware().getVersion();
   }
 
-  public void setLanguage(String lang) {
+  public void setAcceptLanguage(String lang) {
+    this.acceptLang = lang;
+  }
+
+  public void setContentLanguage(String lang) {
     this.acceptLang = lang;
   }
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/profile/ProfileUtilities.java

@@ -263,6 +263,7 @@ public class ProfileUtilities extends TranslatingUtilities {
       "http://hl7.org/fhir/tools/StructureDefinition/type-specifier",
       "http://hl7.org/fhir/tools/StructureDefinition/xml-choice-group",
       ToolingExtensions.EXT_XML_NAMESPACE, ToolingExtensions.EXT_XML_NAMESPACE_DEPRECATED,
+      ToolingExtensions.EXT_XML_NAME, ToolingExtensions.EXT_XML_NAME_DEPRECATED,
       "http://hl7.org/fhir/StructureDefinition/elementdefinition-defaulttype"
       );
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java

@@ -1685,24 +1685,29 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
           err = TerminologyServiceErrorClass.CODESYSTEM_UNSUPPORTED;
           unknownSystems.add(((PrimitiveType<?>) p.getValue()).asStringValue());      
         } else if (p.getName().equals("warning-withdrawn")) {
+          String msg = ((PrimitiveType<?>) p.getValue()).asStringValue();
           OperationOutcomeIssueComponent iss = new OperationOutcomeIssueComponent(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.INFORMATION, org.hl7.fhir.r5.model.OperationOutcome.IssueType.BUSINESSRULE);
-          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_WITHDRAWN : I18nConstants.MSG_WITHDRAWN_SRC, ((PrimitiveType<?>) p.getValue()).asStringValue(), vs));              
+          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_WITHDRAWN : I18nConstants.MSG_WITHDRAWN_SRC, msg, vs, impliedType(msg)));              
           issues.add(iss);
         } else if (p.getName().equals("warning-deprecated")) {
+          String msg = ((PrimitiveType<?>) p.getValue()).asStringValue();
           OperationOutcomeIssueComponent iss = new OperationOutcomeIssueComponent(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.INFORMATION, org.hl7.fhir.r5.model.OperationOutcome.IssueType.BUSINESSRULE);
-          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_DEPRECATED : I18nConstants.MSG_DEPRECATED_SRC, ((PrimitiveType<?>) p.getValue()).asStringValue(), vs));              
+          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_DEPRECATED : I18nConstants.MSG_DEPRECATED_SRC, msg, vs, impliedType(msg)));              
           issues.add(iss);
         } else if (p.getName().equals("warning-retired")) {
+          String msg = ((PrimitiveType<?>) p.getValue()).asStringValue();
           OperationOutcomeIssueComponent iss = new OperationOutcomeIssueComponent(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.INFORMATION, org.hl7.fhir.r5.model.OperationOutcome.IssueType.BUSINESSRULE);
-          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_RETIRED : I18nConstants.MSG_RETIRED_SRC, ((PrimitiveType<?>) p.getValue()).asStringValue(), vs));              
+          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_RETIRED : I18nConstants.MSG_RETIRED_SRC, msg, vs, impliedType(msg)));              
           issues.add(iss);
         } else if (p.getName().equals("warning-experimental")) {
+          String msg = ((PrimitiveType<?>) p.getValue()).asStringValue();
           OperationOutcomeIssueComponent iss = new OperationOutcomeIssueComponent(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.INFORMATION, org.hl7.fhir.r5.model.OperationOutcome.IssueType.BUSINESSRULE);
-          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_EXPERIMENTAL : I18nConstants.MSG_EXPERIMENTAL_SRC, ((PrimitiveType<?>) p.getValue()).asStringValue(), vs));              
+          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_EXPERIMENTAL : I18nConstants.MSG_EXPERIMENTAL_SRC, msg, vs, impliedType(msg)));              
           issues.add(iss);
         } else if (p.getName().equals("warning-draft")) {
+          String msg = ((PrimitiveType<?>) p.getValue()).asStringValue();
           OperationOutcomeIssueComponent iss = new OperationOutcomeIssueComponent(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.INFORMATION, org.hl7.fhir.r5.model.OperationOutcome.IssueType.BUSINESSRULE);
-          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_DRAFT : I18nConstants.MSG_DRAFT_SRC, ((PrimitiveType<?>) p.getValue()).asStringValue(), vs));              
+          iss.getDetails().setText(formatMessage(vs == null ? I18nConstants.MSG_DRAFT : I18nConstants.MSG_DRAFT_SRC, msg, vs, impliedType(msg)));              
           issues.add(iss);
         } else if (p.getName().equals("cause")) {
           try {
@@ -1739,6 +1744,16 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
 
   // --------------------------------------------------------------------------------------------------------------------------------------------------------
   
+  private Object impliedType(String msg) {
+    if (msg.contains("/CodeSystem")) {
+      return "CodeSystem";
+    }
+    if (msg.contains("/ValueSet")) {
+      return "ValueSet";
+    }
+    return "item";
+  }
+
   protected void initTS(String cachePath) throws IOException {
     if (cachePath != null && !new File(cachePath).exists()) {
       Utilities.createDirectory(cachePath);

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/formats/JsonParserBase.java

@@ -176,6 +176,17 @@ public abstract class JsonParserBase extends ParserBase implements IParser {
     return (JsonArray) j;
   }
   
+  protected JsonObject getJsonObjectFromArray(JsonArray array, int i) throws IOException {
+    JsonElement e = array.get(i);
+    if (e.isJsonObject()) {
+      return (JsonObject) e;
+    }
+    if (e.isJsonNull()) {
+      return new JsonObject();
+    }
+    throw new IOException("Array item "+i+" is a "+e.getClass()+" looking for an Object");
+  }
+  
   /**
    * Compose a resource to a stream, possibly using pretty presentation for a human reader (used in the spec, for example, but not normally in production)
    * @throws IOException 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/ips/IPSBuilder.java

@@ -0,0 +1,440 @@
+package org.hl7.fhir.r5.ips;
+
+import java.util.Date;
+import java.util.List;
+
+import org.hl7.fhir.r5.ips.IPSBuilder.TypeAndId;
+import org.hl7.fhir.r5.model.Age;
+import org.hl7.fhir.r5.model.Annotation;
+import org.hl7.fhir.r5.model.Bundle;
+import org.hl7.fhir.r5.model.Bundle.BundleEntryComponent;
+import org.hl7.fhir.r5.model.Bundle.BundleType;
+import org.hl7.fhir.r5.model.CodeableConcept;
+import org.hl7.fhir.r5.model.CodeableReference;
+import org.hl7.fhir.r5.model.Coding;
+import org.hl7.fhir.r5.model.Composition;
+import org.hl7.fhir.r5.model.Patient;
+import org.hl7.fhir.r5.model.Period;
+import org.hl7.fhir.r5.model.Quantity;
+import org.hl7.fhir.r5.model.Range;
+import org.hl7.fhir.r5.model.Reference;
+import org.hl7.fhir.r5.model.Composition.SectionComponent;
+import org.hl7.fhir.r5.model.Condition;
+import org.hl7.fhir.r5.model.Condition.ConditionParticipantComponent;
+import org.hl7.fhir.r5.model.DataType;
+import org.hl7.fhir.r5.model.Device;
+import org.hl7.fhir.r5.model.DomainResource;
+import org.hl7.fhir.r5.model.Dosage;
+import org.hl7.fhir.r5.model.Enumerations.CompositionStatus;
+import org.hl7.fhir.r5.model.Identifier;
+import org.hl7.fhir.r5.model.Medication;
+import org.hl7.fhir.r5.model.MedicationStatement;
+import org.hl7.fhir.r5.model.Narrative.NarrativeStatus;
+import org.hl7.fhir.r5.utils.client.FHIRToolingClient;
+import org.hl7.fhir.utilities.Utilities;
+import org.hl7.fhir.utilities.VersionUtil;
+import org.hl7.fhir.utilities.xhtml.XhtmlNode;
+
+public class IPSBuilder {
+
+  public static class TypeAndId {
+    private String type;
+    private String id;
+    protected TypeAndId(String type, String id) {
+      super();
+      this.type = type;
+      this.id = id;
+    }
+    public String getType() {
+      return type;
+    }
+    public String getId() {
+      return id;
+    }
+  }
+
+  public static Bundle generateIPS(FHIRToolingClient server, String patientId) {
+    Patient pat = server.fetchResource(Patient.class, patientId);
+    Bundle bnd = initBundle();
+    Composition cmp = initComposition(bnd, server.getAddress(), pat);
+    pat = processPatient(bnd, server.getAddress(), pat);
+//    addMedications(bnd, cmp, server, patientId);
+    addConditions(bnd, cmp, server, patientId);
+    return bnd;
+  }
+
+  private static Bundle initBundle() {
+    Bundle bnd = new Bundle();
+    bnd.getIdentifier().setSystem("urn:ietf:rfc:3986");
+    bnd.getIdentifier().setValue(Utilities.makeUuidUrn());
+    bnd.setType(BundleType.DOCUMENT);
+    bnd.setTimestamp(new Date());
+    return bnd;
+  }
+  
+  private static Composition initComposition(Bundle bnd, String url, Patient pat) {
+    Composition cmp = new Composition();
+    cmp.setIdBase(Utilities.makeUuidLC());
+    cmp.setStatus(CompositionStatus.FINAL);
+    cmp.getType().addCoding().setSystem("http://loinc.org").setCode("60591-5");
+    cmp.setDate(new Date());
+    cmp.setTitle("International Patient Summary");
+    cmp.addSubject().setReference("Patient/"+pat.getIdBase());
+    cmp.addAuthor().setReference("Device/java");
+    bnd.addEntry().setResource(cmp).setFullUrl(Utilities.pathURL(url, "Composition", cmp.getIdBase()));
+    Device dev = new Device();
+    dev.setId("java");
+    dev.addName().setValue("Java Core Library");
+    dev.addVersion().setValue(VersionUtil.getVersion());
+    bnd.addEntry().setResource(dev).setFullUrl(Utilities.pathURL(url, "Device", dev.getIdBase()));
+    return cmp;
+  }
+
+  private static Patient processPatient(Bundle bnd,  String url, Patient pat) {
+    bnd.addEntry().setResource(pat).setFullUrl(Utilities.pathURL(url, "Patient", pat.getIdBase()));
+    return pat;
+  }
+  
+  private static void addMedications(Bundle bnd, Composition cmp, FHIRToolingClient server, String patientId) {
+    Bundle sb = server.search("MedicationStatement", "?patient="+patientId+"&_include=MedicationStatement:medication&_include=MedicationStatement:source");
+    SectionComponent sct = cmp.addSection();
+    sct.setTitle("Medications");
+    sct.getCode().addCoding().setSystem("http://loinc.org").setCode("10160-0");
+    sct.getText().setStatus(NarrativeStatus.GENERATED);
+    var x = sct.getText().getDiv();
+    var tbl = x.table("grid");
+    var tr = tbl.tr();
+    tr.th().tx("Medication");
+    tr.th().tx("Category");
+    tr.th().tx("Status");
+    tr.th().tx("When");
+    tr.th().tx("Dosage");
+    tr.th().tx("Reason");
+    tr.th().tx("Source");
+    tr.th().tx("Notes");
+
+    boolean ok = false;
+    for (BundleEntryComponent be : sb.getEntry()) {
+      if (be.hasResource() && be.getResource() instanceof MedicationStatement) {
+        MedicationStatement mdstmt = (MedicationStatement) be.getResource();
+        ok = true;
+        bnd.addEntry().setResource(mdstmt).setFullUrl(Utilities.pathURL(server.getAddress(), "MedicationStatement", mdstmt.getIdBase()));
+        sct.addEntry().setReference("MedicationStatement/"+mdstmt.getIdBase());
+        tr = tbl.tr();
+        if (mdstmt.hasMedication() && mdstmt.getMedication().hasReference()) {
+          Medication med = findMedication(sb, server, mdstmt, mdstmt.getMedication().getReference());
+          if (med == null) {
+            tr.td().b().tx("Unknown?");
+          } else {
+            tr.td().tx(summarise(med));
+            bnd.addEntry().setResource(med).setFullUrl(Utilities.pathURL(server.getAddress(), "Medication", med.getIdBase()));
+          }
+        } else {
+          tr.td().tx(genCC(mdstmt.getMedication().getConcept()));
+        }
+        tr.td().tx(genCC(mdstmt.getCategory()));
+        var td = tr.td();
+        td.tx(mdstmt.getStatus().getDisplay());
+        if (mdstmt.hasReason()) {
+          td.tx(" (");
+          for (CodeableReference cc : mdstmt.getReason()) {
+            if (cc.hasConcept()) {
+              td.tx(genCC(cc.getConcept()));
+            } else {
+              td.tx(genReference(mdstmt, cc.getReference(), bnd, sb, server));              
+            }
+          }
+          td.tx(")");
+        }
+        tr.td().tx(genDT(mdstmt.getEffective()));
+        genDosages(tr.td(), mdstmt.getDosage());
+        for (Reference is : mdstmt.getInformationSource()) {
+          tr.td().tx(genReference(mdstmt, is, bnd, sb, server));
+        }
+        genNotes(tr.td(), mdstmt.getNote());
+      }
+    }
+    if (!ok) {
+      Condition cnd = new Condition();
+      cnd.setId(Utilities.makeUuidLC());
+
+      cnd.getText().setStatus(NarrativeStatus.GENERATED);
+      var rx = cnd.getText().getDiv();
+      rx.tx("No information is provided about the patient's medical problems");
+      tr = tbl.tr();
+      tr.td().colspan(7).tx("No information is provided about the patient's medical problems");
+      cnd.getClinicalStatus().addCoding().setSystem("http://terminology.hl7.org/CodeSystem/condition-clinical").setCode("active").setDisplay("Active");
+      cnd.getCode().addCoding().setSystem("http://hl7.org/fhir/uv/ips/CodeSystem/absent-unknown-uv-ips").setCode("no-problem-info").setDisplay("No information about current problems");
+      cnd.getSubject().setReference("Patient/"+patientId);
+    }
+  }
+
+
+  private static void genDosages(XhtmlNode x, List<Dosage> dosages) {
+    if (dosages == null || dosages.size() == 0) {
+      
+    } else if (dosages.size() == 1) {
+      genDosage(x, dosages.get(0));
+    } else {
+      var ul = x.ul();
+      for (Dosage d : dosages) {
+        genDosage(ul.li(), d);
+      }
+    } 
+  }
+
+  private static void genDosage(XhtmlNode x, Dosage dosage) {
+    x.tx(dosage.getText());
+    if (dosage.hasAsNeeded() || dosage.hasAsNeededFor()) {
+      x.nbsp();
+      if (dosage.hasAsNeeded()) {
+        if (dosage.getAsNeeded()) {
+          x.tx(" (as needed)");
+        }
+      } else {
+        for (CodeableConcept cc : dosage.getAsNeededFor()) {
+          x.tx(genDT(cc));
+        }
+      }
+    } else if (dosage.hasTiming()) {
+      x.nbsp();
+      x.tx(genDT(dosage.getTiming()));
+    }
+    if (dosage.hasSite()) {
+      x.tx(". ");
+      x.tx(genDT(dosage.getSite()));
+    }
+    if (dosage.hasRoute()) {
+      x.tx(". ");
+      x.tx(genDT(dosage.getRoute()));
+    }
+  }
+
+  private static Medication findMedication(Bundle sb, FHIRToolingClient server, MedicationStatement mdstmt, Reference ref) {
+    if (ref == null || !ref.hasReference()) {
+      return null;
+    }
+    if (ref.getReference().startsWith("#")) {
+      
+    } else {
+      
+    }
+    return null;
+  }
+
+  private static void addConditions(Bundle bnd, Composition cmp, FHIRToolingClient server, String patientId) {
+    Bundle sb = server.search("Condition", "?patient="+patientId+"&_include=Condition:asserter");
+    SectionComponent sct = cmp.addSection();
+    sct.setTitle("Problems");
+    sct.getCode().addCoding().setSystem("http://loinc.org").setCode("11450-4");
+    sct.getText().setStatus(NarrativeStatus.GENERATED);
+    var x = sct.getText().getDiv();
+    var tbl = x.table("grid");
+    var tr = tbl.tr();
+    tr.th().tx("Code");
+    tr.th().tx("Category");
+    tr.th().tx("Severity");
+    tr.th().tx("Status");
+    tr.th().tx("Onset");
+    tr.th().tx("Abatement");
+    tr.th().tx("Source");
+    tr.th().tx("Notes");
+
+    boolean ok = false;
+    for (BundleEntryComponent be : sb.getEntry()) {
+      if (be.hasResource() && be.getResource() instanceof Condition) {
+        Condition cnd = (Condition) be.getResource();
+        ok = true;
+        bnd.addEntry().setResource(cnd).setFullUrl(Utilities.pathURL(server.getAddress(), "Condition", cnd.getIdBase()));
+        sct.addEntry().setReference("Condition/"+cnd.getIdBase());
+        tr = tbl.tr();
+        tr.td().tx(genCC(cnd.getCode()));
+        tr.td().tx(genCC(cnd.getCategory()));
+        tr.td().tx(genCC(cnd.getSeverity()));
+        tr.td().tx(genStatus(cnd));
+        tr.td().tx(genDT(cnd.getOnset()));
+        tr.td().tx(genDT(cnd.getAbatement()));
+        tr.td().tx(genSource(cnd, bnd, sb, server));
+        genNotes(tr.td(), cnd.getNote());
+
+      }
+    }
+    if (!ok) {
+      Condition cnd = new Condition();
+      cnd.setId(Utilities.makeUuidLC());
+
+      cnd.getText().setStatus(NarrativeStatus.GENERATED);
+      var rx = cnd.getText().getDiv();
+      rx.tx("No information is provided about the patient's medical problems");
+      tr = tbl.tr();
+      tr.td().colspan(7).tx("No information is provided about the patient's medical problems");
+      cnd.getClinicalStatus().addCoding().setSystem("http://terminology.hl7.org/CodeSystem/condition-clinical").setCode("active").setDisplay("Active");
+      cnd.getCode().addCoding().setSystem("http://hl7.org/fhir/uv/ips/CodeSystem/absent-unknown-uv-ips").setCode("no-problem-info").setDisplay("No information about current problems");
+      cnd.getSubject().setReference("Patient/"+patientId);
+    }
+  }
+
+
+  private static String genReference(DomainResource src, Reference ref, Bundle bnd, Bundle search, FHIRToolingClient server) {
+    if (ref == null || ref.isEmpty()) {
+      return null;
+    }
+    boolean contained = false;
+    DomainResource tgt = null;
+    if (ref.hasReference()) {
+      if (ref.getReference().startsWith("#")) {
+        tgt = (DomainResource) src.getContained(ref.getReference());
+        contained = true;
+      } else {
+        TypeAndId tid = getTypeAndId(server.getAddress(), ref.getReference());
+        if (tid != null) {
+          tgt = findInBundle(bnd, Utilities.pathURL(server.getAddress(), tid.getType(), tid.getId()));
+          if (tgt == null) {
+            tgt = findInBundle(search, Utilities.pathURL(server.getAddress(), tid.getType(), tid.getId()));
+            if (tgt == null) {
+              tgt = (DomainResource) server.read(tid.getType(), tid.getId());
+            }
+          } else {
+            contained = true;
+          }
+        }
+      }
+    }
+    if (tgt != null) {
+      if (!contained) {
+        bnd.addEntry().setResource(tgt).setFullUrl(Utilities.pathURL(server.getAddress(), tgt.fhirType(), tgt.getIdBase()));
+      }
+      return summarise(tgt);
+    } else if (ref.hasDisplay()) {
+      return ref.getDisplay();
+    } else if (ref.hasReference()) {
+      return ref.getReference();
+    } else if (ref.hasIdentifier()) {
+      return genIdentifier(ref.getIdentifier());
+    } else {
+      return "unknown";
+    }
+  }
+
+  
+  private static TypeAndId getTypeAndId(String baseUrl, String url) {
+    if (Utilities.noString(url)) {
+      return null;
+    }
+    if (url.startsWith(baseUrl+"/")) {
+      url = url.substring(baseUrl.length()+1);
+    }
+    String[] p = url.split("\\/");
+    if (p.length > 1) {
+      if ("_history".equals(p[p.length-2]) && p.length > 3) {
+        return new TypeAndId(p[p.length-4], p[p.length-3]);
+      } else {
+        return new TypeAndId(p[p.length-2], p[p.length-1]);
+      }
+    }
+    return null;
+  }
+
+  private static DomainResource findInBundle(Bundle bnd, String url) {
+    for (BundleEntryComponent be : bnd.getEntry()) {
+      if (url.equals(be.getFullUrl()) && be.hasResource() && be.getResource() instanceof DomainResource) {
+        return (DomainResource) be.getResource();
+      }
+    }
+    return null;
+  }
+
+  private static String summarise(DomainResource tgt) {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  private static String genIdentifier(Identifier id) {
+    return id.getValue();
+  }
+
+  private static void genNotes(XhtmlNode td, List<Annotation> notes) {
+    if (notes.size() > 0) {
+      if (notes.size() == 1) {
+        genNote(td, notes.get(0));
+      } else {
+        var ul = td.ul();
+        for (Annotation a : notes) {
+          genNote(ul.li(), a);
+        }
+      }
+    }
+  }
+
+  private static void genNote(XhtmlNode td, Annotation annotation) {
+    td.tx(annotation.getText());    
+  }
+
+  private static String genSource(Condition cnd, Bundle bnd, Bundle sb, FHIRToolingClient server) {
+    for (ConditionParticipantComponent t: cnd.getParticipant()) {
+      return genCC(t.getFunction()) + " : "+genReference(cnd, t.getActor(), bnd, sb, server);
+    }
+    return "";
+  }
+
+  private static String genDT(DataType v) {
+    if (v == null) {
+      return null;
+    }
+    if (v.isPrimitive()) {
+      return v.primitiveValue();
+    }
+    if (v instanceof Age) {
+      return genQty((Age) v);
+    }
+    if (v instanceof Period) {
+      Period p = (Period) v;
+      return genDT(p.getStartElement())+" - "+genDT(p.getStartElement());
+    }
+    if (v instanceof Range) {
+      Range p = (Range) v;
+      return genDT(p.getLow())+" - "+genDT(p.getHigh());
+    }
+    return "not done: "+v.fhirType();
+  }
+
+  private static String genQty(Quantity v) {
+    return v.getValue().toPlainString()+v.getUnit();
+  }
+
+  private static String genStatus(Condition cnd) {
+    if (cnd.hasClinicalStatus() && cnd.hasVerificationStatus()) {
+      return genCC(cnd.getClinicalStatus()) +"/"+genCC(cnd.getVerificationStatus());
+    } else if (cnd.hasClinicalStatus()) {
+      return genCC(cnd.getClinicalStatus());
+    } else if (cnd.hasVerificationStatus()) {
+      return genCC(cnd.getVerificationStatus());      
+    } else {
+      return null;
+    }
+  }
+
+  private static String genCC(List<CodeableConcept> list) {
+    if (list != null && list.size() == 1) {
+      return genCC(list.get(0));
+    } else {
+      return null;
+    }
+  }
+
+  private static String genCC(CodeableConcept code) {
+    if (code.hasText()) {
+      return code.getText();
+    } else if (code.hasCoding()) {
+      Coding c = code.getCodingFirstRep();
+      if (c.hasDisplay()) {
+        return c.getDisplay();
+      } else {
+        return c.getCode();
+      }
+    } else {
+      return null;
+    }
+  }
+
+}

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/ips/IPSRenderer.java

@@ -0,0 +1,100 @@
+package org.hl7.fhir.r5.ips;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.hl7.fhir.r5.ips.IPSRenderer.InternalTemplateEngine;
+import org.hl7.fhir.r5.model.Bundle;
+import org.hl7.fhir.r5.model.Composition;
+import org.hl7.fhir.r5.model.Composition.SectionComponent;
+import org.hl7.fhir.r5.model.DomainResource;
+import org.hl7.fhir.r5.model.Reference;
+import org.hl7.fhir.r5.terminologies.client.ITerminologyClient;
+import org.hl7.fhir.utilities.xhtml.NodeType;
+import org.hl7.fhir.utilities.xhtml.XhtmlComposer;
+import org.hl7.fhir.utilities.xhtml.XhtmlNode;
+
+public class IPSRenderer {
+
+  public class InternalTemplateEngine implements ITemplateImplementer {
+
+    @Override
+    public String buildPage(Map<String, String> headers, String content) {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+  }
+
+  private interface ITemplateImplementer {
+    public String buildPage(Map<String, String> headers, String content);
+  }
+  private ITerminologyClient tx;
+  private String folder; // for images etc
+  private Map<String, byte[]> binaries; // from the pubpack
+  private ITemplateImplementer templater;
+  private Map<String, String> headers;
+
+  public IPSRenderer(ITerminologyClient tx, String folder, Map<String, byte[]> binaries, ITemplateImplementer templater) {
+    super();
+    this.tx = tx;
+    this.folder = folder;
+    this.binaries = binaries;
+    this.templater = templater;
+  }
+  
+  public IPSRenderer(ITerminologyClient tx, String folder, Map<String, byte[]> binaries) {
+    super();
+    this.tx = tx;
+    this.folder = folder;
+    this.binaries = binaries;
+    this.templater = new InternalTemplateEngine();
+  }
+
+  public String render(Bundle document) throws IOException {
+    headers = new HashMap<>();
+    XhtmlNode x = new XhtmlNode(NodeType.Element, "div");
+    generate(x, document);
+    return templater.buildPage(headers, new XhtmlComposer(false, true).compose(x));
+  }
+
+  private void generate(XhtmlNode x, Bundle document) {
+    Composition cmp = (Composition) document.getEntryFirstRep().getResource();
+    int sectionDepth = findSectionDepth(cmp.getSection());
+    XhtmlNode table = x.table("grid");
+    
+    // row 1: header
+    XhtmlNode tr = table.tr();
+    XhtmlNode td = tr.td().colspan(1+sectionDepth);
+    td.b().tx("Provided");
+    td = tr.td().colspan(1+sectionDepth);
+    td.b().tx("Generated");
+    
+    // row 2: Subject
+    DomainResource subject = findResource(document, cmp.getSubjectFirstRep());
+    tr = table.tr();
+    td = tr.td().colspan(1+sectionDepth);
+    // genNarrative("subject", subject, td);
+    td = tr.td().colspan(1+sectionDepth);
+    td.b().tx("Generated");
+    
+    
+    
+    
+  }
+
+  private DomainResource findResource(Bundle document, Reference subject) {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  private int findSectionDepth(List<SectionComponent> list) {
+    int i = 1;
+    for (SectionComponent sect : list) {
+      i = Integer.max(i, 1+findSectionDepth(sect.getSection()));
+    }
+    return i;
+  }
+}

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java

@@ -12029,6 +12029,7 @@ The primary difference between a medicationstatement and a medicationadministrat
          * R6 Formal version (does not exist yet)
          */
         _6_0_0, 
+        _6_0_0_BALLOT1, 
         /**
          * added to help the parsers
          */
@@ -12154,6 +12155,8 @@ The primary difference between a medicationstatement and a medicationadministrat
           return _6_0_0CIBUILD;
         if ("6.0.0".equals(codeString))
           return _6_0_0;
+        if ("6.0.0-ballot1".equals(codeString))
+          return _6_0_0_BALLOT1;
         throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
         }
         public static boolean isValidCode(String codeString) {
@@ -12222,6 +12225,7 @@ The primary difference between a medicationstatement and a medicationadministrat
             case _5_0_0DRAFTFINAL: return "5.0.0-draft-final";
             case _6_0_0CIBUILD: return "6.0.0-cibuild";
             case _6_0_0: return "6.0.0";
+            case _6_0_0_BALLOT1: return "6.0.0-ballot1";
             case NULL: return null;
             default: return "?";
           }
@@ -12287,6 +12291,7 @@ The primary difference between a medicationstatement and a medicationadministrat
             case _5_0_0DRAFTFINAL: return "http://hl7.org/fhir/FHIR-version";
             case _6_0_0CIBUILD: return "http://hl7.org/fhir/FHIR-version";
             case _6_0_0: return "http://hl7.org/fhir/FHIR-version";
+            case _6_0_0_BALLOT1: return "http://hl7.org/fhir/FHIR-version";
             case NULL: return null;
             default: return "?";
           }
@@ -12352,6 +12357,7 @@ The primary difference between a medicationstatement and a medicationadministrat
             case _5_0_0DRAFTFINAL: return "R5 Final QA.";
             case _6_0_0CIBUILD: return "R6 Rolling ci-build.";
             case _6_0_0: return "R6 Final Version.";
+            case _6_0_0_BALLOT1: return "R6 Ballot #1.";
             case NULL: return null;
             default: return "?";
           }
@@ -12417,6 +12423,7 @@ The primary difference between a medicationstatement and a medicationadministrat
             case _5_0_0DRAFTFINAL: return "5.0.0-draft-final";
             case _6_0_0CIBUILD: return "6.0.0-cibuild";
             case _6_0_0: return "6.0.0";
+            case _6_0_0_BALLOT1: return "6.0.0-ballot1";
             case NULL: return null;
             default: return "?";
           }
@@ -12563,6 +12570,8 @@ The primary difference between a medicationstatement and a medicationadministrat
           return FHIRVersion._6_0_0CIBUILD;
         if ("6.0.0".equals(codeString))
           return FHIRVersion._6_0_0;
+        if ("6.0.0-ballot1".equals(codeString))
+          return FHIRVersion._6_0_0_BALLOT1;
         throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'");
         }
 
@@ -12692,6 +12701,8 @@ The primary difference between a medicationstatement and a medicationadministrat
           return new Enumeration<FHIRVersion>(this, FHIRVersion._6_0_0CIBUILD, code);
         if ("6.0.0".equals(codeString))
           return new Enumeration<FHIRVersion>(this, FHIRVersion._6_0_0, code);
+        if ("6.0.0-ballot1".equals(codeString))
+          return new Enumeration<FHIRVersion>(this, FHIRVersion._6_0_0_BALLOT1, code);
         throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");        
         }
     public String toCode(FHIRVersion code) {
@@ -12813,6 +12824,9 @@ The primary difference between a medicationstatement and a medicationadministrat
         return "6.0.0-cibuild";
       if (code == FHIRVersion._6_0_0)
         return "6.0.0";
+      if (code == FHIRVersion._6_0_0_BALLOT1) {
+        return "6.0.0-ballot1";
+      }
       return "?";
       }
     public String toSystem(FHIRVersion code) {

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/client/ITerminologyClient.java

@@ -65,6 +65,7 @@ public interface ITerminologyClient {
   ClientHeaders getClientHeaders();
   ITerminologyClient setClientHeaders(ClientHeaders clientHeaders);
   ITerminologyClient setUserAgent(String userAgent);
-  ITerminologyClient setLanguage(String lang);
+  ITerminologyClient setAcceptLanguage(String lang);
+  ITerminologyClient setContentLanguage(String lang);
   String getUserAgent();
 }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java

@@ -91,6 +91,7 @@ import org.hl7.fhir.r5.model.CodeType;
 import org.hl7.fhir.r5.model.Coding;
 import org.hl7.fhir.r5.model.DataType;
 import org.hl7.fhir.r5.model.DateTimeType;
+import org.hl7.fhir.r5.model.DecimalType;
 import org.hl7.fhir.r5.model.Enumerations.FilterOperator;
 import org.hl7.fhir.r5.model.Extension;
 import org.hl7.fhir.r5.model.Factory;
@@ -212,10 +213,10 @@ public class ValueSetExpander extends ValueSetProcessBase {
       ValueSetUtilities.addProperty(focus, n, "http://hl7.org/fhir/concept-properties#label", "label", ExtensionsUtils.getExtensionValue(vsExtList, "http://hl7.org/fhir/StructureDefinition/valueset-label"));
     }
     if (ExtensionsUtils.hasExtension(csExtList, "http://hl7.org/fhir/StructureDefinition/codesystem-conceptOrder")) {
-      ValueSetUtilities.addProperty(focus, n, "http://hl7.org/fhir/concept-properties#order", "order", ExtensionsUtils.getExtensionValue(csExtList, "http://hl7.org/fhir/StructureDefinition/codesystem-conceptOrder"));
+      ValueSetUtilities.addProperty(focus, n, "http://hl7.org/fhir/concept-properties#order", "order", convertToDecimal(ExtensionsUtils.getExtensionValue(csExtList, "http://hl7.org/fhir/StructureDefinition/codesystem-conceptOrder")));
     }
     if (ExtensionsUtils.hasExtension(vsExtList, "http://hl7.org/fhir/StructureDefinition/valueset-conceptOrder")) {
-      ValueSetUtilities.addProperty(focus, n, "http://hl7.org/fhir/concept-properties#order", "order", ExtensionsUtils.getExtensionValue(vsExtList, "http://hl7.org/fhir/StructureDefinition/valueset-conceptOrder"));
+      ValueSetUtilities.addProperty(focus, n, "http://hl7.org/fhir/concept-properties#order", "order", convertToDecimal(ExtensionsUtils.getExtensionValue(vsExtList, "http://hl7.org/fhir/StructureDefinition/valueset-conceptOrder")));
     }
     if (ExtensionsUtils.hasExtension(csExtList, "http://hl7.org/fhir/StructureDefinition/itemWeight")) {
       ValueSetUtilities.addProperty(focus, n, "http://hl7.org/fhir/concept-properties#itemWeight", "weight", ExtensionsUtils.getExtensionValue(csExtList, "http://hl7.org/fhir/StructureDefinition/itemWeight"));
@@ -316,6 +317,19 @@ public class ValueSetExpander extends ValueSetProcessBase {
     return n;
   }
 
+  private DataType convertToDecimal(DataType v) {
+    if (v == null) {
+      return null;
+    } 
+    if (v instanceof DecimalType) {
+      return v;
+    } 
+    if (v instanceof IntegerType) {
+      return new DecimalType(((IntegerType) v).asStringValue());
+    }
+    return null;
+  }
+
   private boolean passesDesignationFilter(ConceptDefinitionDesignationComponent d) {
     if (designations.isEmpty()) {
       return true;
@@ -529,16 +543,15 @@ public class ValueSetExpander extends ValueSetProcessBase {
     wc.getExcludeKeys().add(s);
   }
 
-  private void excludeCodes(WorkingContext wc, ConceptSetComponent exc, List<ValueSetExpansionParameterComponent> params, String ctxt) throws FHIRException {
+  private void excludeCodes(WorkingContext wc, ConceptSetComponent exc, Parameters expParams, ValueSetExpansionComponent exp, ValueSet vs) throws FHIRException, FileNotFoundException, ETooCostly, IOException {
     opContext.deadCheck();
     exc.checkNoModifiers("Compose.exclude", "expanding");
     if (exc.hasSystem() && exc.getConcept().size() == 0 && exc.getFilter().size() == 0) {
       wc.getExcludeSystems().add(exc.getSystem());
     }
 
-    if (exc.hasValueSet())
-      throw fail("Processing Value set references in exclude is not yet done in "+ctxt);
-    // importValueSet(imp.getValue(), params, expParams);
+    for (UriType imp : exc.getValueSet())
+      excludeCodes(wc, importValueSetForExclude(wc, imp.getValue(), exp, expParams, false, vs).getExpansion());
 
     CodeSystem cs = context.fetchSupplementedCodeSystem(exc.getSystem());
     if ((cs == null || cs.getContent() != CodeSystemContentMode.COMPLETE) && context.supportsSystem(exc.getSystem(), opContext.getOptions().getFhirVersion())) {
@@ -546,7 +559,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
       ValueSet valueset = vse.getValueset();
       if (valueset == null)
         throw failTSE("Error Expanding ValueSet: "+vse.getError());
-      excludeCodes(wc, valueset.getExpansion(), params);
+      excludeCodes(wc, valueset.getExpansion());
       return;
     }
 
@@ -558,7 +571,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
       throw fail("not done yet - multiple filters");
   }
 
-  private void excludeCodes(WorkingContext wc, ValueSetExpansionComponent expand, List<ValueSetExpansionParameterComponent> params) {
+  private void excludeCodes(WorkingContext wc, ValueSetExpansionComponent expand) {
     opContext.deadCheck();
     for (ValueSetExpansionContainsComponent c : expand.getContains()) {
       excludeCode(wc, c.getSystem(), c.getCode());
@@ -701,6 +714,9 @@ public class ValueSetExpander extends ValueSetProcessBase {
       }
     }
 
+    if (dwc.hasOffset()) {
+      focus.getExpansion().setOffset(dwc.getOffset());
+    }
     if (dwc.getTotal() >= 0) {
       focus.getExpansion().setTotal(dwc.getTotal());
     }
@@ -744,7 +760,7 @@ public class ValueSetExpander extends ValueSetProcessBase {
     compose.checkNoModifiers("ValueSet.compose", "expanding");
     // Exclude comes first because we build up a map of things to exclude
     for (ConceptSetComponent inc : compose.getExclude())
-      excludeCodes(dwc, inc, exp.getParameter(), ctxt);
+      excludeCodes(dwc, inc, expParams, exp, valueSet);
     dwc.setCanBeHeirarchy(!expParams.getParameterBool("excludeNested") && dwc.getExcludeKeys().isEmpty() && dwc.getExcludeSystems().isEmpty() && dwc.getOffset()+dwc.getCount() == 0);
     includeAbstract = !expParams.getParameterBool("excludeNotForUI");
     boolean first = true;
@@ -818,6 +834,40 @@ public class ValueSetExpander extends ValueSetProcessBase {
   }
   
 
+  private ValueSet importValueSetForExclude(WorkingContext wc, String value, ValueSetExpansionComponent exp, Parameters expParams, boolean noInactive, ValueSet valueSet) throws ETooCostly, TerminologyServiceException, FileNotFoundException, IOException, FHIRFormatError {
+    if (value == null)
+      throw fail("unable to find value set with no identity");
+    ValueSet vs = context.fetchResource(ValueSet.class, value, valueSet);
+    if (vs == null) {
+      if (context.fetchResource(CodeSystem.class, value, valueSet) != null) {
+        throw fail("Cannot include value set "+value+" because it's actually a code system");
+      } else {
+        throw fail("Unable to find imported value set " + value);
+      }
+    }
+    checkCanonical(exp, vs, focus);
+    if (noInactive) {
+      expParams = expParams.copy();
+      expParams.addParameter("activeOnly", true);
+    }
+    ValueSetExpansionOutcome vso = new ValueSetExpander(context, opContext.copy(), allErrors).expand(vs, expParams);
+    if (vso.getError() != null) {
+      addErrors(vso.getAllErrors());
+      throw fail("Unable to expand imported value set "+vs.getUrl()+": " + vso.getError());
+    }
+    if (vs.hasVersion() || REPORT_VERSION_ANYWAY) {
+      UriType u = new UriType(vs.getUrl() + (vs.hasVersion() ? "|"+vs.getVersion() : ""));
+      if (!existsInParams(exp.getParameter(), "used-valueset", u))
+        exp.getParameter().add(new ValueSetExpansionParameterComponent().setName("used-valueset").setValue(u));
+    }
+    for (Extension ex : vso.getValueset().getExpansion().getExtension()) {
+      if (ex.getUrl().equals(ToolingExtensions.EXT_EXP_TOOCOSTLY)) {
+        throw fail("Unable to expand imported value set "+vs.getUrl()+" for exclude: too costly");
+      } 
+    }
+    return vso.getValueset();
+  }
+  
   protected boolean isValueSetUnionImports(ValueSet valueSet) {
     PackageInformation p = valueSet.getSourcePackage();
     if (p != null) {

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/WorkingContext.java

@@ -19,6 +19,7 @@ class WorkingContext {
   
   private boolean canBeHeirarchy = true;
   private int offset;
+  private boolean offs;
   private int count;
   private int total;
   
@@ -55,9 +56,14 @@ class WorkingContext {
   }
   
   public void setOffset(int offset) {
+    this.offs = true;
     this.offset = offset;
   }
   
+  public boolean hasOffset() {
+    return offs;
+  }
+  
   public int getCount() {
     return count;
   }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValidationResult.java

@@ -1,6 +1,7 @@
 package org.hl7.fhir.r5.terminologies.utilities;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -8,6 +9,7 @@ import org.hl7.fhir.r5.model.CodeableConcept;
 import org.hl7.fhir.r5.model.Coding;
 import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent;
 import org.hl7.fhir.r5.model.OperationOutcome.OperationOutcomeIssueComponent;
+import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;
 import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity;
 
 public class ValidationResult {
@@ -16,7 +18,7 @@ public class ValidationResult {
   private String system;
   private String version;
   private IssueSeverity severity;
-  private String message;
+  private List<String> messages = new ArrayList<>();
   private TerminologyServiceErrorClass errorClass;
   private String txLink;
   private String diagnostics;
@@ -28,13 +30,15 @@ public class ValidationResult {
   
   @Override
   public String toString() {
-    return "ValidationResult [definition=" + definition + ", system=" + system + ", severity=" + severity + ", message=" + message + ", errorClass="
+    return "ValidationResult [definition=" + definition + ", system=" + system + ", severity=" + severity + ", message=" + getMessage() + ", errorClass="
         + errorClass + ", txLink=" + txLink + "]";
   }
 
   public ValidationResult(IssueSeverity severity, String message, List<OperationOutcomeIssueComponent> issues) {
     this.severity = severity;
-    this.message = message;
+    if (message != null) {
+      this.messages.add(message);
+    }
     if (issues != null) {
       this.issues.addAll(issues);
     }
@@ -49,7 +53,20 @@ public class ValidationResult {
 
   public ValidationResult(IssueSeverity severity, String message, String system, String version, ConceptDefinitionComponent definition, String preferredDisplay, List<OperationOutcomeIssueComponent>  issues) {
     this.severity = severity;
-    this.message = message;
+    if (message != null) {
+      this.messages.add(message);
+    }
+    this.system = system;
+    this.version = version;
+    this.definition = definition;
+    this.preferredDisplay = preferredDisplay;
+    if (issues != null) {
+      this.issues.addAll(issues);
+    }
+  }
+  public ValidationResult(IssueSeverity severity, List<String> messages, String system, String version, ConceptDefinitionComponent definition, String preferredDisplay, List<OperationOutcomeIssueComponent>  issues) {
+    this.severity = severity;
+    this.messages.addAll(messages);
     this.system = system;
     this.version = version;
     this.definition = definition;
@@ -61,7 +78,9 @@ public class ValidationResult {
 
   public ValidationResult(IssueSeverity severity, String message, TerminologyServiceErrorClass errorClass, List<OperationOutcomeIssueComponent>  issues) {
     this.severity = severity;
-    this.message = message;
+    if (message != null) {
+      this.messages.add(message);
+    }
     this.errorClass = errorClass;
     if (issues != null) {
       this.issues.addAll(issues);
@@ -121,7 +140,11 @@ public class ValidationResult {
   }
 
   public String getMessage() {
-    return message;
+    if (messages.size() == 0) {
+      return null;
+    }
+    Collections.sort(messages);
+    return CommaSeparatedStringBuilder.join("; ", messages);
   }
 
   public boolean IsNoService() {
@@ -138,12 +161,17 @@ public class ValidationResult {
   }
 
   public ValidationResult setMessage(String message) {
-    this.message = message;
+    this.messages.clear();
+    if (message != null) {
+      this.messages.add(message);
+    }
     return this;
   }
   
-  public ValidationResult addToMessage(String message) {
-    this.message = this.message == null ? message : this.message +"; "+ message; 
+  public ValidationResult addMessage(String message) {
+    if (message != null) {
+      this.messages.add(message);
+    }
     return this;
   }
   
@@ -162,7 +190,7 @@ public class ValidationResult {
   }
 
   public boolean hasMessage() {
-    return message != null;
+    return !messages.isEmpty();
   }
 
   public String getDiagnostics() {
@@ -256,4 +284,22 @@ public class ValidationResult {
     return this;
   }
 
+  public boolean messageIsInIssues() {
+    // the message is sometimes a summary of the issues that are already tracked. 
+    // this returns true in that case, so that duplication of messages is suppressed
+    
+    for (String s : messages) {
+      boolean found = false;
+      for (OperationOutcomeIssueComponent iss : issues) {
+        if (iss.getSeverity().ordinal() <= getSeverity().ordinal() && s.equals(iss.getDetails().getText())) {
+          found = true;
+        }
+      }
+      if (!found) {
+        return false;
+      }
+    }
+    return true;
+  }
+
 }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/utilities/ValueSetProcessBase.java

@@ -143,7 +143,7 @@ public class ValueSetProcessBase {
   }
 
   private List<OperationOutcomeIssueComponent> makeStatusIssue(String path, String id, String msg, CanonicalResource resource) {
-    List<OperationOutcomeIssueComponent> iss = makeIssue(IssueSeverity.INFORMATION, IssueType.BUSINESSRULE, path, context.formatMessage(msg, resource.getVersionedUrl()));
+    List<OperationOutcomeIssueComponent> iss = makeIssue(IssueSeverity.INFORMATION, IssueType.BUSINESSRULE, null, context.formatMessage(msg, resource.getVersionedUrl(), null, resource.fhirType()));
 
     // this is a testing hack - see TerminologyServiceTests
     iss.get(0).setUserData("status-msg-name", "warning-"+id);

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/validation/ValidationProcessInfo.java

@@ -1,6 +1,7 @@
 package org.hl7.fhir.r5.terminologies.validation;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity;
@@ -41,10 +42,19 @@ public class ValidationProcessInfo {
     return false;
   }
   public String summary() {
-    CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder("; ");
+    List<String> msgs = new ArrayList<>();
     for (OperationOutcomeIssueComponent issue : issues) {
-      b.append(issue.getDetails().getText());
+      msgs.add(issue.getDetails().getText());
     }
-    return b.toString();
+    Collections.sort(msgs);
+    return CommaSeparatedStringBuilder.join("; ", msgs);
+  }
+  public List<String> summaryList() {
+    List<String> msgs = new ArrayList<>();
+    for (OperationOutcomeIssueComponent issue : issues) {
+      msgs.add(issue.getDetails().getText());
+    }
+    Collections.sort(msgs);
+    return msgs;
   }
 }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/validation/ValueSetValidator.java

@@ -239,8 +239,10 @@ public class ValueSetValidator extends ValueSetProcessBase {
     if (valueset != null && options.getValueSetMode() != ValueSetMode.NO_MEMBERSHIP_CHECK) {
       CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(", ");
       
+      int i = 0;
       for (Coding c : code.getCoding()) {
-        b.append("'"+c.getSystem()+(c.hasVersion() ? "|"+c.getVersion() : "")+"#"+c.getCode()+"'");
+        String cs = "'"+c.getSystem()+(c.hasVersion() ? "|"+c.getVersion() : "")+"#"+c.getCode()+"'";
+        b.append(cs);
         Boolean ok = codeInValueSet(path, c.getSystem(), c.getVersion(), c.getCode(), info);
         if (ok == null && result != null && result == false) {
           result = null;
@@ -254,13 +256,23 @@ public class ValueSetValidator extends ValueSetProcessBase {
         if (ok == null || !ok) {
           vcc.removeCoding(c.getSystem(), c.getVersion(), c.getCode());          
         }
+        if (ok != null && !ok) {
+          msg = context.formatMessage(I18nConstants.NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_ONE, null, valueset.getVersionedUrl(), cs);
+          info.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.CODEINVALID, path+".coding["+i+"].code", msg));
+        }
+        i++;
       }
       if (result == null) {
         msg = context.formatMessage(I18nConstants.UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), b.toString());
         info.getIssues().addAll(makeIssue(IssueSeverity.WARNING, unknownSystems.isEmpty() ? IssueType.CODEINVALID : IssueType.NOTFOUND, path, msg));
       } else if (!result) {
-        msg = context.formatMessagePlural(code.getCoding().size(), I18nConstants.NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), b.toString());
-        info.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, code.getCoding().size() == 1 ? path+".coding[0].code" : path, msg));
+        // to match Ontoserver
+        OperationOutcomeIssueComponent iss = new OperationOutcomeIssueComponent(org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity.ERROR, org.hl7.fhir.r5.model.OperationOutcome.IssueType.CODEINVALID);
+        iss.getDetails().setText(context.formatMessage(I18nConstants.TX_GENERAL_CC_ERROR_MESSAGE, valueset.getVersionedUrl()));
+        info.getIssues().add(iss);
+
+//        msg = context.formatMessagePlural(code.getCoding().size(), I18nConstants.NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), b.toString());
+//        info.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, code.getCoding().size() == 1 ? path+".coding[0].code" : path, msg));
       }
     }
     if (vcc.hasCoding() && code.hasText()) {
@@ -289,7 +301,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
       String disp = lookupDisplay(foundCoding);
       ConceptDefinitionComponent cd = new ConceptDefinitionComponent(foundCoding.getCode());
       cd.setDisplay(disp);
-      return new ValidationResult(IssueSeverity.WARNING, info.summary(), foundCoding.getSystem(), getVersion(foundCoding), cd, disp, info.getIssues()).addCodeableConcept(vcc);
+      return new ValidationResult(IssueSeverity.WARNING, info.summaryList(), foundCoding.getSystem(), getVersion(foundCoding), cd, disp, info.getIssues()).addCodeableConcept(vcc);
     } else {
       ConceptDefinitionComponent cd = new ConceptDefinitionComponent(foundCoding.getCode());
       cd.setDisplay(lookupDisplay(foundCoding));
@@ -479,7 +491,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
               // we'll take it on faith
               String disp = getPreferredDisplay(cc);
               res = new ValidationResult(system, cs.getVersion(), new ConceptDefinitionComponent().setCode(cc.getCode()).setDisplay(disp), disp);
-              res.addToMessage("Resolved system "+system+", but the definition is not complete, so assuming value set include is correct");
+              res.addMessage("Resolved system "+system+", but the definition is not complete, so assuming value set include is correct");
               return res;
             }
           }
@@ -492,7 +504,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
         // we just take the value set as face value then
         res = new ValidationResult(system, wv, new ConceptDefinitionComponent().setCode(code.getCode()).setDisplay(code.getDisplay()), code.getDisplay());
         if (!preferServerSide(system)) {
-          res.addToMessage("Code System unknown, so assuming value set expansion is correct ("+warningMessage+")");
+          res.addMessage("Code System unknown, so assuming value set expansion is correct ("+warningMessage+")");
         }
       } else {
         // well, we didn't find a code system - try the expansion? 
@@ -524,7 +536,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
           }
           if (ok == null) {
             String m = "Unable to check whether the code is in the value set "+valueset.getVersionedUrl();
-            res.addToMessage(m);
+            res.addMessage(m);
             res.getIssues().addAll(makeIssue(IssueSeverity.WARNING, IssueType.NOTFOUND, path, m));
             res.setUnknownSystems(unknownSystems);
             res.setSeverity(IssueSeverity.ERROR); // back patching for display logic issue
@@ -536,7 +548,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
 //            } else
 //            {
               String msg = context.formatMessagePlural(1, I18nConstants.NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), "'"+code.toString()+"'");
-              res.addToMessage(msg).setSeverity(IssueSeverity.ERROR);
+              res.addMessage(msg).setSeverity(IssueSeverity.ERROR);
               res.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, path+".code", msg));
               res.setDefinition(null);
               res.setSystem(null);
@@ -558,7 +570,7 @@ public class ValueSetValidator extends ValueSetProcessBase {
         }
       } else if ((res != null && !res.isOk())) {
         String msg = context.formatMessagePlural(1, I18nConstants.NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_, valueset.getVersionedUrl(), "'"+code.toString()+"'");
-        res.setMessage(res.getMessage()+"; "+msg);
+        res.addMessage(msg);
         res.getIssues().addAll(makeIssue(IssueSeverity.ERROR, IssueType.CODEINVALID, path+".code", msg));
       }
     }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/test/utils/CompareUtilities.java

@@ -427,6 +427,8 @@ private boolean isOptional(JsonElement e) {
         if (externals != null) {
           String s = externals.asString(cmd[1]);
           return actualJsonString.equals(s);
+        } else if (cmd.length <= 2) {
+          return true;
         } else {
           List<String> fragments = readChoices(cmd[2]);
           for (String f : fragments) {

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/FHIRToolingClient.java

@@ -3,6 +3,10 @@ package org.hl7.fhir.r5.utils.client;
 import okhttp3.Headers;
 import okhttp3.internal.http2.Header;
 import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r5.model.Bundle;
+import org.hl7.fhir.r5.model.OperationOutcome;
+import org.hl7.fhir.r5.model.Resource;
+import org.hl7.fhir.r5.utils.client.EFhirClientException;
 
 /*
   Copyright (c) 2011+, HL7, Inc.
@@ -100,6 +104,7 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
 
 
   private String acceptLang;
+  private String contentLang;
 
   //Pass endpoint for client - URI
   public FHIRToolingClient(String baseServiceUrl, String userAgent) throws URISyntaxException {
@@ -200,6 +205,23 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
     return capabilities;
   }
 
+  public Resource read(String resourceClass, String id) {// TODO Change this to AddressableResource
+    ResourceRequest<Resource> result = null;
+    try {
+      result = client.issueGetResourceRequest(resourceAddress.resolveGetUriFromResourceClassAndId(resourceClass, id),
+          getPreferredResourceFormat(), generateHeaders(), "Read " + resourceClass + "/" + id,
+          timeoutNormal);
+      if (result.isUnsuccessfulRequest()) {
+        throw new EFhirClientException("Server returned error code " + result.getHttpStatus(),
+            (OperationOutcome) result.getPayload());
+      }
+    } catch (Exception e) {
+      throw new FHIRException(e);
+    }
+    return result.getPayload();
+  }
+
+  
   public <T extends Resource> T read(Class<T> resourceClass, String id) {//TODO Change this to AddressableResource
     ResourceRequest<T> result = null;
     try {
@@ -587,6 +609,10 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
       builder.add("Accept-Language: "+acceptLang);
     }
     
+    if (!Utilities.noString(contentLang)) {
+      builder.add("Content-Language: "+contentLang);
+    }
+    
     return builder.build();
   }
 
@@ -619,10 +645,32 @@ public class FHIRToolingClient extends FHIRBaseToolingClient {
     return capabilities == null ? null : capabilities.getSoftware().getVersion();
   }
 
-  public void setLanguage(String lang) {
+  public void setAcceptLanguage(String lang) {
     this.acceptLang = lang;
   }
+
+  public void setContentLanguage(String lang) {
+    this.contentLang = lang;
+  }
+
+  public Bundle search(String type, String criteria) {
+    return fetchFeed(Utilities.pathURL(base, type+criteria));
+  }
   
+  public <T extends Resource> T fetchResource(Class<T> resourceClass, String id) {
+    org.hl7.fhir.r5.utils.client.network.ResourceRequest<Resource> result = null;
+    try {
+      result = client.issueGetResourceRequest(resourceAddress.resolveGetResource(resourceClass, id),
+          getPreferredResourceFormat(), generateHeaders(), resourceClass.getName()+"/"+id, timeoutNormal);
+    } catch (IOException e) {
+      throw new FHIRException(e);
+    }
+    if (result.isUnsuccessfulRequest()) {
+      throw new EFhirClientException("Server returned error code " + result.getHttpStatus(),
+          (OperationOutcome) result.getPayload());
+    }
+    return (T) result.getPayload();
+  }
   
 }
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/client/ResourceAddress.java

@@ -78,6 +78,15 @@ public class ResourceAddress {
 		return this.baseServiceUri;
 	}
 	
+
+  public URI resolveGetUriFromResourceClassAndId(String resourceClass, String id) {
+    return baseServiceUri.resolve(resourceClass + "/" + id);
+  }
+
+  public <T extends Resource> URI resolveGetResource(Class<T> resourceClass, String id) {
+    return baseServiceUri.resolve(nameForClassWithSlash(resourceClass) + "/" + id);
+  }
+  
 	public <T extends Resource> URI resolveOperationURLFromClass(Class<T> resourceClass, String name, String parameters) {
 		return baseServiceUri.resolve(nameForClassWithSlash(resourceClass) +"$"+name+"?"+ parameters);
 	}

org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache

@@ -9,6 +9,7 @@
   }
 }}####
 e: {
+  "from-server" : true,
   "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
 }
 -------------------------------------------------------------------------------------

org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache

@@ -41,6 +41,7 @@
   }
 }}####
 e: {
+  "from-server" : true,
   "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
 }
 -------------------------------------------------------------------------------------

org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache

@@ -9,6 +9,7 @@
   }
 }}####
 e: {
+  "from-server" : true,
   "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
 }
 -------------------------------------------------------------------------------------

org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache

@@ -93,6 +93,7 @@
   }
 }}####
 e: {
+  "from-server" : true,
   "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
 }
 -------------------------------------------------------------------------------------

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/TextFile.java

@@ -161,7 +161,11 @@ public class TextFile {
   }
   
   public static String fileToString(String src) throws FileNotFoundException, IOException  {
-    FileInputStream fs = new FileInputStream(new CSFile(src));
+    CSFile f = new CSFile(src);
+    if (!f.exists()) {
+      throw new IOException("File "+src+" not found");
+    }
+    FileInputStream fs = new FileInputStream(f);
     try {
       return streamToString(fs);
     } finally {

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/I18nConstants.java

@@ -265,6 +265,7 @@ public class I18nConstants {
   public static final String NEEDS_A_SNAPSHOT = "needs_a_snapshot";
   public static final String NODE_TYPE__IS_NOT_ALLOWED = "Node_type__is_not_allowed";
   public static final String NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_ = "None_of_the_provided_codes_are_in_the_value_set";
+  public static final String NONE_OF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_ONE = "None_of_the_provided_codes_are_in_the_value_set_one";
   public static final String UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_ = "UNABLE_TO_CHECK_IF_THE_PROVIDED_CODES_ARE_IN_THE_VALUE_SET_";
   public static final String NOT_DONE_YET = "Not_done_yet";
   public static final String NOT_DONE_YET_CANT_FETCH_ = "not_done_yet_cant_fetch_";
@@ -1038,6 +1039,7 @@ public class I18nConstants {
   public static final String XHTML_IDREF_NOT_FOUND = "XHTML_IDREF_NOT_FOUND";
   public static final String XHTML_IDREF_NOT_MULTIPLE_MATCHES = "XHTML_IDREF_NOT_MULTIPLE_MATCHES";
   public static final String SD_CONTEXT_SHOULD_NOT_BE_FHIRPATH = "SD_CONTEXT_SHOULD_NOT_BE_FHIRPATH";
+  public static final String TX_GENERAL_CC_ERROR_MESSAGE = "TX_GENERAL_CC_ERROR_MESSAGE";
 }
 
 

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/parser/JsonLexer.java

@@ -49,6 +49,7 @@ public class JsonLexer {
   private boolean allowUnquotedStrings;
   private List<JsonComment> comments = new ArrayList<>();
   private boolean isUnquoted;
+  private String sourceName;
 
   public JsonLexer(String source, boolean allowComments, boolean allowUnquotedStrings) throws IOException {
     this.source = source;
@@ -116,7 +117,7 @@ public class JsonLexer {
   }
 
   public IOException error(String msg) {
-    return new IOException("Error parsing JSON source: "+msg+" at Line "+Integer.toString(location.getLine())+" (path=["+path()+"])");
+    return new IOException("Error parsing JSON source: "+msg+" at Line "+Integer.toString(location.getLine())+" (path=["+path()+"])"+(sourceName == null ? "" : " from '"+sourceName+"'"));
   }
 
   private String path() {
@@ -300,5 +301,13 @@ public class JsonLexer {
     return "JsonLexer [cursor=" + cursor + ", peek=" + peek + ", type=" + type + ", location=" + location.toString() + "]";
   }
 
+  public String getSourceName() {
+    return sourceName;
+  }
+
+  public void setSourceName(String sourceName) {
+    this.sourceName = sourceName;
+  }
+
 
 }

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/json/parser/JsonParser.java

@@ -52,43 +52,46 @@ import org.hl7.fhir.utilities.json.parser.JsonLexer.TokenType;
 public class JsonParser {
 
   public static JsonObject parseObject(InputStream stream) throws IOException, JsonException {
-    return parseObject(TextFile.streamToString(stream));
+    return new JsonParser().parseJsonObject(TextFile.streamToString(stream), false, false);
   }
   
-  public static JsonObject parseObject(byte[] stream) throws IOException, JsonException {
-    return parseObject(TextFile.bytesToString(stream));
+  public static JsonObject parseObject(byte[] content) throws IOException, JsonException {
+    return new JsonParser().parseJsonObject(TextFile.bytesToString(content), false, false);
   }
 
   public static JsonObject parseObject(String source) throws IOException, JsonException {
-    return parseObject(source, false);
+    return new JsonParser().parseJsonObject(source, false, false);
   }
   
   public static JsonObject parseObject(File source) throws IOException, JsonException {
-    return parseObject(TextFile.fileToString(source));
+    if (!source.exists()) {
+      throw new IOException("File "+source+" not found");
+    }
+    return new JsonParser().setSourceName(source.getAbsolutePath()).parseJsonObject(TextFile.fileToString(source), false, false);
   }
   
   public static JsonObject parseObjectFromFile(String source) throws IOException, JsonException {
-    return parseObject(TextFile.fileToString(source));
+    return new JsonParser().setSourceName(source).parseJsonObject(TextFile.fileToString(source), false, false);
   }
   
   public static JsonObject parseObjectFromUrl(String source) throws IOException, JsonException {
-    return parseObject(fetch(source));
+    return new JsonParser().setSourceName(source).parseJsonObject(TextFile.bytesToString(fetch(source)), false, false);
   }
   
   public static JsonObject parseObject(InputStream stream, boolean isJson5) throws IOException, JsonException {
-    return parseObject(TextFile.streamToString(stream), isJson5);
+    return new JsonParser().parseJsonObject(TextFile.streamToString(stream), isJson5, false);
   }
   
-  public static JsonObject parseObject(byte[] stream, boolean isJson5) throws IOException, JsonException {
-    return parseObject(TextFile.bytesToString(stream), isJson5);
+  public static JsonObject parseObject(byte[] content, boolean isJson5) throws IOException, JsonException {
+    return new JsonParser().parseJsonObject(TextFile.bytesToString(content), isJson5, false);
   }
     
   public static JsonObject parseObject(String source, boolean isJson5) throws IOException, JsonException {
-    return parseObject(source, isJson5, false);
+    return new JsonParser().parseJsonObject(source, isJson5, false);
   }
   
   public static JsonObject parseObjectFromUrl(String source, boolean isJson5) throws IOException, JsonException {
-    return parseObject(fetch(source), isJson5);
+    return new JsonParser().setSourceName(source).parseJsonObject(TextFile.bytesToString(fetch(source)), isJson5, false);
   }
   
   public static JsonObject parseObject(InputStream stream, boolean isJson5, boolean allowDuplicates) throws IOException, JsonException {
@@ -98,7 +101,7 @@ public class JsonParser {
   public static JsonObject parseObject(byte[] stream, boolean isJson5, boolean allowDuplicates) throws IOException, JsonException {
     return parseObject(TextFile.bytesToString(stream), isJson5, allowDuplicates);
   }
-    
+
   public static JsonObject parseObject(String source, boolean isJson5, boolean allowDuplicates) throws IOException, JsonException {
     return new JsonParser().parseJsonObject(source, isJson5, allowDuplicates);
   }
@@ -216,6 +219,7 @@ public class JsonParser {
   private boolean allowUnquotedStrings;
   private boolean itemUnquoted;
   private boolean valueUnquoted;
+  private String sourceName;
 
   private JsonObject parseJsonObject(String source, boolean isJson5, boolean allowDuplicates) throws IOException, JsonException {
     this.allowDuplicates = allowDuplicates;
@@ -227,6 +231,7 @@ public class JsonParser {
 
   private JsonObject parseSource(String source) throws IOException, JsonException {
     lexer = new JsonLexer(source, allowComments, allowUnquotedStrings);
+    lexer.setSourceName(sourceName);
     JsonObject result = new JsonObject();
     lexer.takeComments(result);
     result.setStart(lexer.getLastLocationAWS().copy());
@@ -671,4 +676,15 @@ public class JsonParser {
     res.checkThrowException();
     return res.getContent();
   }
+
+  public String getSourceName() {
+    return sourceName;
+  }
+
+  public JsonParser setSourceName(String sourceName) {
+    this.sourceName = sourceName;
+    return this;
+  }
+  
+  
 }

org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/PackageList.java

@@ -351,5 +351,14 @@ public class PackageList {
     return list;
   }
 
+  public boolean hasPath(String pathVer) {
+    for (PackageListEntry t : versions) {
+      if (t.path() != null && t.path().equals(pathVer)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
 
 }

org.hl7.fhir.utilities/src/main/resources/Messages.properties

@@ -1016,16 +1016,16 @@ FHIRPATH_AS_IMPOSSIBLE = The type specified in as() is {1} which is not a possib
 ED_SEARCH_EXPRESSION_ERROR = Error in search expression ''{0}'': {1}
 SD_EXTENSION_URL_MISMATCH = The fixed value for the extension URL is {1} which doesn''t match the canonical URL {0}
 SD_EXTENSION_URL_MISSING = The value of Extension.url is not fixed to the extension URL {0}
-MSG_DEPRECATED = Reference to deprecated item {0} 
-MSG_WITHDRAWN = Reference to withdrawn item {0}
-MSG_RETIRED = Reference to retired item {0} 
-MSG_EXPERIMENTAL = Reference to experimental item {0}
-MSG_DRAFT = Reference to draft item {0}
-MSG_DEPRECATED_SRC = Reference to deprecated item {0} from {1}
-MSG_WITHDRAWN_SRC = Reference to withdrawn item {0} from {1}
-MSG_RETIRED_SRC = Reference to retired item {0} from {1}
-MSG_EXPERIMENTAL_SRC = Reference to experimental item {0} from {1}
-MSG_DRAFT_SRC = Reference to draft item {0} from {1}
+MSG_DEPRECATED = Reference to deprecated {2} {0} 
+MSG_WITHDRAWN = Reference to withdrawn {2} {0}
+MSG_RETIRED = Reference to retired {2} {0} 
+MSG_EXPERIMENTAL = Reference to experimental {2} {0}
+MSG_DRAFT = Reference to draft {2} {0}
+MSG_DEPRECATED_SRC = Reference to deprecated {2} {0} from {1}
+MSG_WITHDRAWN_SRC = Reference to withdrawn {2} {0} from {1}
+MSG_RETIRED_SRC = Reference to retired {2} {0} from {1}
+MSG_EXPERIMENTAL_SRC = Reference to experimental {2} {0} from {1}
+MSG_DRAFT_SRC = Reference to draft {2} {0} from {1}
 STATUS_CODE_WARNING = The code is valid but is {0}
 STATUS_CODE_HINT = The code is {0}
 STATUS_CODE_WARNING_CODE = The code ''{1}'' is valid but is {0}
@@ -1096,4 +1096,4 @@ BUNDLE_BUNDLE_ENTRY_NOTFOUND_FRAGMENT = Can''t find ''{0}'' in the bundle ({1})
 BUNDLE_BUNDLE_ENTRY_FOUND_MULTIPLE_FRAGMENT = Found {0} matches for fragment {2} in resource ''{1}'' in the bundle ({3})
 XHTML_IDREF_NOT_FOUND = The target of the HTML idref attribute ''{0}'' was not found in the resource
 XHTML_IDREF_NOT_MULTIPLE_MATCHES = Multiple matching targets for the HTML idref attribute ''{0}'' were found in the resource
-  
+TX_GENERAL_CC_ERROR_MESSAGE = No valid coding was found for the value set ''{0}''

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java

@@ -1442,7 +1442,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
                         txHint(errors, "2023-07-03", vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, vr.getMessage());
                       } else {
                         checkDisp = false;
-                        txWarning(errors, NO_RULE_DATE, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, vr.getMessage());
+                        if (!vr.messageIsInIssues()) {
+                          txWarning(errors, NO_RULE_DATE, vr.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, false, vr.getMessage());
+                        }
                       }
                     } else {
                       if (binding.getStrength() == BindingStrength.EXTENSIBLE) {
@@ -3258,8 +3260,12 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
   }
 
   private boolean isDefinitionURL(String url) {
-    return Utilities.existsInList(url, "http://hl7.org/fhirpath/System.Boolean", "http://hl7.org/fhirpath/System.String", "http://hl7.org/fhirpath/System.Integer",
-      "http://hl7.org/fhirpath/System.Decimal", "http://hl7.org/fhirpath/System.Date", "http://hl7.org/fhirpath/System.Time", "http://hl7.org/fhirpath/System.DateTime", "http://hl7.org/fhirpath/System.Quantity");
+    return Utilities.existsInList(url,
+        
+        "http://hl7.org/fhirpath/System.Boolean", "http://hl7.org/fhirpath/System.String", "http://hl7.org/fhirpath/System.Integer", "http://hl7.org/fhirpath/System.Decimal", 
+        "http://hl7.org/fhirpath/System.Date", "http://hl7.org/fhirpath/System.Time", "http://hl7.org/fhirpath/System.DateTime", "http://hl7.org/fhirpath/System.Quantity",
+        
+        "http://hl7.org/fhir/SearchParameter/Resource-filter");
   }
 
   private boolean checkInnerNames(List<ValidationMessage> errors, Element e, String path, List<XhtmlNode> list, boolean inPara) {

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/special/TxTester.java

@@ -190,7 +190,7 @@ public class TxTester {
         }
         JsonObject ext = externals == null ? null : externals.getJsonObject(fn);
 
-        String lang = test.asString("Accept-Language");
+        String lang = test.asString("Content-Language");
         String msg = null;
         if (test.asString("operation").equals("expand")) {
           msg = expand(tx, setup, req, resp, fp, lang, profile, ext);
@@ -248,7 +248,7 @@ public class TxTester {
     for (Resource r : setup) {
       p.addParameter().setName("tx-resource").setResource(r);
     }
-    tx.setLanguage(lang);
+    tx.setContentLanguage(lang);
     p.getParameter().addAll(profile.getParameter());
     String vsj;
     try {
@@ -274,7 +274,7 @@ public class TxTester {
       p.addParameter().setName("tx-resource").setResource(r);
     }
     p.getParameter().addAll(profile.getParameter());
-    tx.setLanguage(lang);
+    tx.setContentLanguage(lang);
     String pj;
     try {
       Parameters po = tx.validateVS(p);

org.hl7.fhir.validation/src/test/java/org/hl7/fhir/terminology/tests/TerminologyServiceTests.java

@@ -23,6 +23,7 @@ import org.hl7.fhir.r5.formats.JsonParser;
 import org.hl7.fhir.r5.formats.XmlParser;
 import org.hl7.fhir.r5.model.CanonicalType;
 import org.hl7.fhir.r5.model.CodeType;
+import org.hl7.fhir.r5.model.StringType;
 import org.hl7.fhir.r5.model.CodeableConcept;
 import org.hl7.fhir.r5.model.Coding;
 import org.hl7.fhir.r5.model.Constants;
@@ -142,9 +143,9 @@ public class TerminologyServiceTests {
       engine.getContext().setExpansionProfile((org.hl7.fhir.r5.model.Parameters) loadResource("parameters-default.json"));
     }
     if (setup.test.asString("operation").equals("expand")) {
-      expand(engine, req, resp, setup.test.asString("Accept-Language"), fp, ext);
+      expand(engine, req, resp, setup.test.asString("Content-Language"), fp, ext);
     } else if (setup.test.asString("operation").equals("validate-code")) {
-      validate(engine, setup.test.asString("name"), req, resp, setup.test.asString("Accept-Language"), fp, ext);      
+      validate(engine, setup.test.asString("name"), req, resp, setup.test.asString("Content-Language"), fp, ext);      
     } else {
       Assertions.fail("Unknown Operation "+setup.test.asString("operation"));
     }
@@ -260,13 +261,23 @@ public class TerminologyServiceTests {
       }
     }
     ValidationResult vm;
+    String code = null;
+    String system = null;
+    String version = null;
+    CodeableConcept cc = null;
     if (p.hasParameter("code")) {
+      code = p.getParameterString("code");
+      system = p.getParameterString("system");
+      version = p.getParameterString("systemVersion"); 
       vm = engine.getContext().validateCode(options.withGuessSystem(), p.getParameterString("system"), p.getParameterString("systemVersion"), p.getParameterString("code"), p.getParameterString("display"), vs);
     } else if (p.hasParameter("coding")) {
       Coding coding = (Coding) p.getParameterValue("coding");
+      code = coding.getCode();
+      system = coding.getSystem();
+      version = coding.getVersion();
       vm = engine.getContext().validateCode(options, coding, vs);
     } else if (p.hasParameter("codeableConcept")) {
-      CodeableConcept cc = (CodeableConcept) p.getParameterValue("codeableConcept");
+      cc = (CodeableConcept) p.getParameterValue("codeableConcept");
       vm = engine.getContext().validateCode(options, cc, vs);
     } else {
       throw new Error("validate not done yet for this steup");
@@ -289,9 +300,13 @@ public class TerminologyServiceTests {
       org.hl7.fhir.r5.model.Parameters res = new org.hl7.fhir.r5.model.Parameters();
       if (vm.getSystem() != null) {
         res.addParameter("system", new UriType(vm.getSystem()));
+      } else if (system != null) {
+        res.addParameter("system", new UriType(system));
       }
       if (vm.getCode() != null) {
         res.addParameter("code", new CodeType(vm.getCode()));
+      } else if (code != null) {
+        res.addParameter("code", new CodeType(code));
       }
       if (vm.getSeverity() == org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity.ERROR) {
         res.addParameter("result", false);
@@ -303,13 +318,18 @@ public class TerminologyServiceTests {
       }
       if (vm.getVersion() != null) {
         res.addParameter("version", vm.getVersion());
+      } else if (version != null) {
+        res.addParameter("version", new StringType(version));
       }
       if (vm.getDisplay() != null) {
         res.addParameter("display", vm.getDisplay());
       }
-      if (vm.getCodeableConcept() != null) {
-        res.addParameter("codeableConcept", vm.getCodeableConcept());
-      }
+//      if (vm.getCodeableConcept() != null) {
+//        res.addParameter("codeableConcept", vm.getCodeableConcept());
+//      } else
+      if (cc != null) {
+        res.addParameter("codeableConcept", cc);
+      } 
       if (vm.isInactive()) {
         res.addParameter("inactive", true);
       }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/lang.cache

@@ -9,6 +9,7 @@
   }
 }}####
 e: {
+  "from-server" : true,
   "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
 }
 -------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/loinc.cache

@@ -41,6 +41,7 @@
   }
 }}####
 e: {
+  "from-server" : true,
   "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
 }
 -------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/mimetypes.cache

@@ -9,6 +9,7 @@
   }
 }}####
 e: {
+  "from-server" : true,
   "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
 }
 -------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/ucum.cache

@@ -93,6 +93,7 @@
   }
 }}####
 e: {
+  "from-server" : true,
   "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
 }
 -------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/v3-ObservationInterpretation.cache

@@ -1,31 +0,0 @@
--------------------------------------------------------------------------------------
-{"hierarchical" : false, "valueSet" :{
-  "resourceType" : "ValueSet",
-  "compose" : {
-    "inactive" : true,
-    "include" : [{
-      "system" : "http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation",
-      "concept" : [{
-        "code" : "LL"
-      },
-      {
-        "code" : "HH"
-      },
-      {
-        "code" : "L",
-        "display" : "Extra Low"
-      },
-      {
-        "code" : "H",
-        "display" : "higher"
-      },
-      {
-        "code" : "P"
-      }]
-    }]
-  }
-}}####
-e: {
-  "error" : "Cannot invoke \"org.hl7.fhir.r5.terminologies.client.ITerminologyClient.expandValueset(org.hl7.fhir.r5.model.ValueSet, org.hl7.fhir.r5.model.Parameters, java.util.Map)\" because the return value of \"org.hl7.fhir.r5.terminologies.client.TerminologyClientContext.getClient()\" is null"
-}
--------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/.capabilityStatement.cache

@@ -12,11 +12,11 @@
     "url" : "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown",
     "valueCode" : "both"
   }],
-  "url" : "http://localhost/r2/metadata",
+  "url" : "http://tx-dev.fhir.org/r2/metadata",
   "version" : "1.0.2-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:40.282Z",
+  "date" : "2023-12-25T11:43:01.643Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -31,8 +31,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r2",
-    "url" : "http://localhost/r2"
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r2",
+    "url" : "http://tx-dev.fhir.org/r2"
   },
   "fhirVersion" : "1.0.2",
   "format" : ["application/xml+fhir",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/.terminologyCapabilities.cache

@@ -141,6 +141,9 @@
   {
     "uri" : "http://hl7.org/fhir/concept-map-equivalence"
   },
+  {
+    "uri" : "http://hl7.org/fhir/conditional-delete-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/condition-category"
   },
@@ -153,9 +156,6 @@
   {
     "uri" : "http://hl7.org/fhir/condition-ver-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/conditional-delete-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/conformance-expectation"
   },
@@ -168,15 +168,15 @@
   {
     "uri" : "http://hl7.org/fhir/constraint-severity"
   },
+  {
+    "uri" : "http://hl7.org/fhir/contactentity-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/contact-point-system"
   },
   {
     "uri" : "http://hl7.org/fhir/contact-point-use"
   },
-  {
-    "uri" : "http://hl7.org/fhir/contactentity-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/content-type"
   },
@@ -199,10 +199,10 @@
     "uri" : "http://hl7.org/fhir/data-absent-reason"
   },
   {
-    "uri" : "http://hl7.org/fhir/data-types"
+    "uri" : "http://hl7.org/fhir/dataelement-stringency"
   },
   {
-    "uri" : "http://hl7.org/fhir/dataelement-stringency"
+    "uri" : "http://hl7.org/fhir/data-types"
   },
   {
     "uri" : "http://hl7.org/fhir/days-of-week"
@@ -213,15 +213,15 @@
   {
     "uri" : "http://hl7.org/fhir/device-action"
   },
+  {
+    "uri" : "http://hl7.org/fhir/devicestatus"
+  },
   {
     "uri" : "http://hl7.org/fhir/device-use-request-priority"
   },
   {
     "uri" : "http://hl7.org/fhir/device-use-request-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/devicestatus"
-  },
   {
     "uri" : "http://hl7.org/fhir/diagnostic-order-priority"
   },
@@ -273,6 +273,9 @@
   {
     "uri" : "http://hl7.org/fhir/episode-of-care-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/exception"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-fdi"
   },
@@ -288,6 +291,9 @@
   {
     "uri" : "http://hl7.org/fhir/ex-surface"
   },
+  {
+    "uri" : "http://hl7.org/fhir/extension-context"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-udi"
   },
@@ -297,18 +303,15 @@
   {
     "uri" : "http://hl7.org/fhir/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://hl7.org/fhir/exception"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/extension-context"
-  },
   {
     "uri" : "http://hl7.org/fhir/FDI-surface"
   },
   {
     "uri" : "http://hl7.org/fhir/filter-operator"
   },
+  {
+    "uri" : "http://hl7.org/fhir/flagCategory"
+  },
   {
     "uri" : "http://hl7.org/fhir/flag-category"
   },
@@ -318,9 +321,6 @@
   {
     "uri" : "http://hl7.org/fhir/flag-status"
   },
-  {
-    "uri" : "http://hl7.org/fhir/flagCategory"
-  },
   {
     "uri" : "http://hl7.org/fhir/fm-conditions"
   },
@@ -507,9 +507,6 @@
   {
     "uri" : "http://hl7.org/fhir/object-type"
   },
-  {
-    "uri" : "http://hl7.org/fhir/obs-kind"
-  },
   {
     "uri" : "http://hl7.org/fhir/observation-category"
   },
@@ -519,6 +516,9 @@
   {
     "uri" : "http://hl7.org/fhir/observation-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/obs-kind"
+  },
   {
     "uri" : "http://hl7.org/fhir/operation-kind"
   },
@@ -534,15 +534,15 @@
   {
     "uri" : "http://hl7.org/fhir/organization-type"
   },
-  {
-    "uri" : "http://hl7.org/fhir/participant-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/participantrequired"
   },
   {
     "uri" : "http://hl7.org/fhir/participantstatus"
   },
+  {
+    "uri" : "http://hl7.org/fhir/participant-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/participationstatus"
   },
@@ -556,10 +556,10 @@
     "uri" : "http://hl7.org/fhir/payeetype"
   },
   {
-    "uri" : "http://hl7.org/fhir/payment-type"
+    "uri" : "http://hl7.org/fhir/paymentstatus"
   },
   {
-    "uri" : "http://hl7.org/fhir/paymentstatus"
+    "uri" : "http://hl7.org/fhir/payment-type"
   },
   {
     "uri" : "http://hl7.org/fhir/practitioner-role"
@@ -738,15 +738,15 @@
   {
     "uri" : "http://hl7.org/fhir/substance-category"
   },
+  {
+    "uri" : "http://hl7.org/fhir/supplydelivery-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/supply-item-type"
   },
   {
     "uri" : "http://hl7.org/fhir/supply-kind"
   },
-  {
-    "uri" : "http://hl7.org/fhir/supplydelivery-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/supplyrequest-reason"
   },

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/loinc.cache

@@ -3,7 +3,7 @@
   "system" : "http://loinc.org",
   "code" : "3141-9",
   "display" : "Weight Measured"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
     "name" : "profile-url",
@@ -25,7 +25,7 @@ v: {
   "system" : "http://loinc.org",
   "code" : "3141-9",
   "display" : "Weight Measured"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
     "name" : "profile-url",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/snomed.cache

@@ -1,26 +1,4 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://snomed.info/sct",
-  "code" : "27113001",
-  "display" : "Body weight"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Body weight",
-  "code" : "27113001",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://snomed.info/sct",
   "code" : "27113001",
@@ -36,7 +14,29 @@ v: {
   "display" : "Body weight",
   "code" : "27113001",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://snomed.info/sct",
+  "code" : "27113001",
+  "display" : "Body weight"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Body weight",
+  "code" : "27113001",
+  "system" : "http://snomed.info/sct",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.0.2/ucum.cache

@@ -2,7 +2,7 @@
 {"code" : {
   "system" : "http://unitsofmeasure.org",
   "code" : "[lb_av]"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
     "name" : "profile-url",
@@ -23,7 +23,7 @@ v: {
 {"code" : {
   "system" : "http://unitsofmeasure.org",
   "code" : "[lb_av]"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
     "name" : "profile-url",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/.capabilityStatement.cache

@@ -12,11 +12,11 @@
     "url" : "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown",
     "valueCode" : "both"
   }],
-  "url" : "http://localhost/r3/metadata",
+  "url" : "http://tx-dev.fhir.org/r3/metadata",
   "version" : "3.0.2-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:41.790Z",
+  "date" : "2023-12-25T11:43:07.830Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -31,8 +31,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r3",
-    "url" : "http://localhost/r3"
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r3",
+    "url" : "http://tx-dev.fhir.org/r3"
   },
   "fhirVersion" : "3.0.2",
   "format" : ["application/fhir+xml",
@@ -64,7 +64,7 @@
     },
     {
       "name" : "versions",
-      "definition" : "http://localhost/r3/OperationDefinition/fso-versions"
+      "definition" : "http://tx-dev.fhir.org/r3/OperationDefinition/fso-versions"
     }]
   }]
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/1.4.0/all-systems.cache

@@ -10,7 +10,7 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "The CodeSystem http://canadapost.ca/CodeSystem/ProvinceCodes is unknown; The provided code 'http://canadapost.ca/CodeSystem/ProvinceCodes#Foo' is not in the value set 'https://fhir.infoway-inforoute.ca/ValueSet/canadianjurisdiction|20170626' (from Tx-Server)",
+  "error" : "The code system http://canadapost.ca/CodeSystem/ProvinceCodes could not be found; The provided code 'http://canadapost.ca/CodeSystem/ProvinceCodes#Foo' was not found in the value set 'https://fhir.infoway-inforoute.ca/ValueSet/canadianjurisdiction|20170626' (from Tx-Server)",
   "class" : "CODESYSTEM_UNSUPPORTED",
   "unknown-systems" : "http://canadapost.ca/CodeSystem/ProvinceCodes",
   "issues" : {

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/.capabilityStatement.cache

@@ -12,11 +12,11 @@
     "url" : "http://hl7.org/fhir/3.0/StructureDefinition/extension-CapabilityStatement.acceptUnknown",
     "valueCode" : "both"
   }],
-  "url" : "http://localhost/r3/metadata",
+  "url" : "http://tx-dev.fhir.org/r3/metadata",
   "version" : "3.0.2-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:44.270Z",
+  "date" : "2023-12-25T11:43:12.314Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -31,8 +31,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r3",
-    "url" : "http://localhost/r3"
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r3",
+    "url" : "http://tx-dev.fhir.org/r3"
   },
   "fhirVersion" : "3.0.2",
   "format" : ["application/fhir+xml",
@@ -64,7 +64,7 @@
     },
     {
       "name" : "versions",
-      "definition" : "http://localhost/r3/OperationDefinition/fso-versions"
+      "definition" : "http://tx-dev.fhir.org/r3/OperationDefinition/fso-versions"
     }]
   }]
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/all-systems.cache

@@ -9,6 +9,7 @@
   }]
 }}####
 v: {
+  "display" : "Finnish",
   "code" : "fi",
   "system" : "urn:ietf:bcp:47",
   "unknown-systems" : "",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/iso3166.cache

@@ -14,6 +14,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -36,6 +37,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -58,6 +60,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -79,6 +82,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -100,6 +104,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -122,6 +127,7 @@ v: {
   "code" : "NL",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -143,6 +149,7 @@ v: {
   "code" : "US",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -159,28 +166,6 @@ v: {
     "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
   }]
 }}####
-v: {
-  "display" : "United States of America",
-  "code" : "US",
-  "system" : "urn:iso:std:iso:3166",
-  "version" : "2018",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:iso:std:iso:3166",
-  "code" : "US",
-  "display" : "United States of America"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
 v: {
   "display" : "United States of America",
   "code" : "US",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/loinc.cache

@@ -1,48 +1,4 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "29463-7",
-  "display" : "Body Weight"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Body weight",
-  "code" : "29463-7",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "3141-9",
-  "display" : "Body weight Measured"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Body weight Measured",
-  "code" : "3141-9",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "19935-6",
@@ -55,6 +11,7 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter",
   "code" : "19935-6",
   "system" : "http://loinc.org",
   "version" : "2.74",
@@ -97,6 +54,7 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter",
   "code" : "19935-6",
   "system" : "http://loinc.org",
   "version" : "2.74",
@@ -117,6 +75,7 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Maximum expiratory gas flow Respiratory system airway by Peak flow meter",
   "code" : "19935-6",
   "system" : "http://loinc.org",
   "version" : "2.74",
@@ -646,9 +605,9 @@ v: {
 -------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://loinc.org",
-  "code" : "18842-5",
-  "display" : "Discharge Summary"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "code" : "29463-7",
+  "display" : "Body Weight"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
     "name" : "profile-url",
@@ -656,8 +615,31 @@ v: {
   }]
 }}####
 v: {
-  "display" : "Discharge summary",
-  "code" : "18842-5",
+  "display" : "Body weight",
+  "code" : "29463-7",
+  "system" : "http://loinc.org",
+  "version" : "2.74",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "3141-9",
+  "display" : "Body weight Measured"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Body weight Measured",
+  "code" : "3141-9",
   "system" : "http://loinc.org",
   "version" : "2.74",
   "unknown-systems" : "",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/snomed.cache

@@ -1,26 +1,4 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://snomed.info/sct",
-  "code" : "27113001",
-  "display" : "Body weight"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Body weight",
-  "code" : "27113001",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://snomed.info/sct",
   "code" : "66493003"
@@ -35,8 +13,7 @@ v: {
   "display" : "Product containing theophylline (medicinal product)",
   "code" : "66493003",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -58,8 +35,7 @@ v: {
   "display" : "Oral administration of treatment",
   "code" : "394899003",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -81,7 +57,6 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'Laboratory test finding (finding)' for http://snomed.info/sct#118246004 - should be one of 4 choices: 'Laboratory test finding', 'Laboratory test observations', 'Laboratory test result' or 'Laboratory test finding (navigational concept)' (for the language(s) '--') (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -103,7 +78,6 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'Chemistry' for http://snomed.info/sct#275711006 - should be one of 2 choices: 'Serum chemistry test' or 'Serum chemistry test (procedure)' (for the language(s) '--') (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -125,8 +99,7 @@ v: {
   "display" : "Above reference range",
   "code" : "281302008",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -148,8 +121,7 @@ v: {
   "display" : "Record artifact (record artifact)",
   "code" : "419891008",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -171,8 +143,7 @@ v: {
   "display" : "Clinical procedure report",
   "code" : "371525003",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -194,8 +165,7 @@ v: {
   "display" : "Normal",
   "code" : "17621005",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -217,8 +187,7 @@ v: {
   "display" : "Military health institution (environment)",
   "code" : "722172003",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -240,8 +209,7 @@ v: {
   "display" : "General surgery (qualifier value)",
   "code" : "394609007",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -263,8 +231,7 @@ v: {
   "display" : "Procedure",
   "code" : "71388002",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -284,9 +251,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 823681000000100 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '823681000000100' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#823681000000100' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#823681000000100' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 823681000000100 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '823681000000100' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -306,9 +272,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 886921000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '886921000000105' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#886921000000105' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#886921000000105' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 886921000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '886921000000105' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -328,9 +293,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 1077881000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '1077881000000105' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#1077881000000105' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#1077881000000105' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 1077881000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '1077881000000105' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -350,9 +314,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 887181000000106 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '887181000000106' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#887181000000106' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#887181000000106' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 887181000000106 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '887181000000106' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -372,9 +335,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 887161000000102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '887161000000102' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#887161000000102' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#887161000000102' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 887161000000102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '887161000000102' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -394,9 +356,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 1052891000000108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '1052891000000108' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#1052891000000108' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#1052891000000108' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 1052891000000108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '1052891000000108' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -416,9 +377,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 715851000000102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '715851000000102' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#715851000000102' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#715851000000102' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 715851000000102 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '715851000000102' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -438,9 +398,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 717121000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '717121000000105' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#717121000000105' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#717121000000105' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 717121000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '717121000000105' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -460,9 +419,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 933361000000108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '933361000000108' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#933361000000108' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#933361000000108' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 933361000000108 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '933361000000108' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -482,9 +440,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 887171000000109 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '887171000000109' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#887171000000109' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#887171000000109' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 887171000000109 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '887171000000109' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -504,9 +461,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 887201000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '887201000000105' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#887201000000105' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#887201000000105' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 887201000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '887201000000105' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -526,9 +482,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 1052951000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '1052951000000105' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#1052951000000105' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#1052951000000105' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 1052951000000105 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '1052951000000105' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -548,9 +503,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 886731000000109 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '886731000000109' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#886731000000109' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#886731000000109' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 886731000000109 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '886731000000109' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -570,9 +524,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 887231000000104 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '887231000000104' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#887231000000104' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#887231000000104' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 887231000000104 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '887231000000104' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -592,9 +545,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 9290701000001101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '9290701000001101' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#9290701000001101' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#9290701000001101' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 9290701000001101 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '9290701000001101' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -616,8 +568,7 @@ v: {
   "display" : "Procedure carried out on subject (situation)",
   "code" : "443938003",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -639,8 +590,7 @@ v: {
   "display" : "Normal",
   "code" : "17621005",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -661,8 +611,7 @@ v: {
   "display" : "Urinalysis",
   "code" : "27171005",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -680,10 +629,10 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Steady",
   "code" : "55011004",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -709,10 +658,10 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Steady",
   "code" : "55011004",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "unknown-systems" : "",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -731,8 +680,30 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unable to find code 11181000146103 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230731); Unknown Code '11181000146103' in the system 'http://snomed.info/sct'; The provided code 'http://snomed.info/sct#11181000146103' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://snomed.info/sct#11181000146103' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unable to find code 11181000146103 in http://snomed.info/sct (version http://snomed.info/sct/900000000000207008/version/20230901); Unknown Code '11181000146103' in the system 'http://snomed.info/sct|http://snomed.info/sct/900000000000207008/version/20230901' (from Tx-Server)",
   "class" : "UNKNOWN",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://snomed.info/sct",
+  "code" : "27113001",
+  "display" : "Body weight"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Body weight",
+  "code" : "27113001",
+  "system" : "http://snomed.info/sct",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/3.0.2/ucum.cache

@@ -1,25 +1,4 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "[lb_av]"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "[lb_av]",
-  "code" : "[lb_av]",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://unitsofmeasure.org",
   "code" : "L/min"
@@ -31,10 +10,10 @@ v: {
   }]
 }}####
 v: {
+  "display" : "L/min",
   "code" : "L/min",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -53,9 +32,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Error processing Unit: '21612-7': Expected \"/\" or \".\" at character 6; Unknown Code '21612-7' in the system 'http://unitsofmeasure.org'; The provided code 'http://unitsofmeasure.org#21612-7' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "Error processing Unit: '21612-7': Expected \"/\" or \".\" at character 6; The provided code 'http://unitsofmeasure.org#21612-7' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unknown Code '21612-7' in the system 'http://unitsofmeasure.org|2.0.1' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -74,9 +52,8 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Error processing Unit: 'tbl': The unit \"tbl\" is unknown at character 1; Unknown Code 'tbl' in the system 'http://unitsofmeasure.org'; The provided code 'http://unitsofmeasure.org#tbl' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "Error processing Unit: 'tbl': The unit \"tbl\" is unknown at character 1; The provided code 'http://unitsofmeasure.org#tbl' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unknown Code 'tbl' in the system 'http://unitsofmeasure.org|2.0.1' (from Tx-Server)",
   "class" : "UNKNOWN",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -98,6 +75,27 @@ v: {
   "code" : "mmol/L",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "[lb_av]"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "[lb_av]",
+  "code" : "[lb_av]",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.capabilityStatement.cache

@@ -8,11 +8,11 @@
       "display" : "Subsetted"
     }]
   },
-  "url" : "http://localhost/r4/metadata",
+  "url" : "http://tx-dev.fhir.org/r4/metadata",
   "version" : "4.0.1-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:31.629Z",
+  "date" : "2023-12-25T11:43:35.721Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -27,8 +27,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r4",
-    "url" : "http://localhost/r4"
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r4",
+    "url" : "http://tx-dev.fhir.org/r4"
   },
   "fhirVersion" : "4.0.1",
   "format" : ["application/fhir+xml",
@@ -60,7 +60,7 @@
     },
     {
       "name" : "versions",
-      "definition" : "http://localhost/r4/OperationDefinition/fso-versions"
+      "definition" : "http://tx-dev.fhir.org/r4/OperationDefinition/fso-versions"
     }]
   }]
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/.terminologyCapabilities.cache

@@ -1,11 +1,11 @@
 {
   "resourceType" : "TerminologyCapabilities",
   "id" : "FhirServer",
-  "url" : "http://localhost/r4/metadata",
+  "url" : "http://tx-dev.fhir.org/r4/metadata",
   "version" : "2.0.0",
   "name" : "FHIR Reference Server Teminology Capability Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:31.663Z",
+  "date" : "2023-12-25T11:43:35.924Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -112,6 +112,9 @@
   {
     "uri" : "http://hl7.org/fhir/audit-event-action"
   },
+  {
+    "uri" : "http://hl7.org/fhir/audit-event-outcome"
+  },
   {
     "uri" : "http://hl7.org/fhir/binding-strength"
   },
@@ -136,27 +139,21 @@
   {
     "uri" : "http://hl7.org/fhir/code-search-support"
   },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
-  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/example"
   },
-  {
-    "uri" : "http://hl7.org/fhir/CodeSystem/medication-statement-status"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/CodeSystem/medication-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/medicationrequest-intent"
   },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/medicationrequest-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/CodeSystem/medication-statement-status"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/CodeSystem/medication-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/status"
   },
@@ -166,6 +163,12 @@
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/task-code"
   },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
+  },
   {
     "uri" : "http://hl7.org/fhir/compartment-type"
   },
@@ -178,6 +181,9 @@
   {
     "uri" : "http://hl7.org/fhir/concept-map-equivalence"
   },
+  {
+    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
+  },
   {
     "uri" : "http://hl7.org/fhir/concept-properties"
   },
@@ -187,9 +193,6 @@
   {
     "uri" : "http://hl7.org/fhir/concept-subsumption-outcome"
   },
-  {
-    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
-  },
   {
     "uri" : "http://hl7.org/fhir/conditional-delete-status"
   },
@@ -199,15 +202,15 @@
   {
     "uri" : "http://hl7.org/fhir/consent-data-meaning"
   },
+  {
+    "uri" : "http://hl7.org/fhir/consentperformer"
+  },
   {
     "uri" : "http://hl7.org/fhir/consent-provision-type"
   },
   {
     "uri" : "http://hl7.org/fhir/consent-state-codes"
   },
-  {
-    "uri" : "http://hl7.org/fhir/consentperformer"
-  },
   {
     "uri" : "http://hl7.org/fhir/constraint-severity"
   },
@@ -343,6 +346,9 @@
   {
     "uri" : "http://hl7.org/fhir/event-timing"
   },
+  {
+    "uri" : "http://hl7.org/fhir/examplescenario-actor-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-claimitemtype"
   },
@@ -358,18 +364,6 @@
   {
     "uri" : "http://hl7.org/fhir/ex-pharmaservice"
   },
-  {
-    "uri" : "http://hl7.org/fhir/ex-servicemodifier"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/ex-serviceproduct"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/ex-udi"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/examplescenario-actor-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/explanationofbenefit-status"
   },
@@ -379,12 +373,21 @@
   {
     "uri" : "http://hl7.org/fhir/expression-language"
   },
+  {
+    "uri" : "http://hl7.org/fhir/ex-servicemodifier"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/ex-serviceproduct"
+  },
   {
     "uri" : "http://hl7.org/fhir/extension-context-type"
   },
   {
     "uri" : "http://hl7.org/fhir/extra-activity-type"
   },
+  {
+    "uri" : "http://hl7.org/fhir/ex-udi"
+  },
   {
     "uri" : "http://hl7.org/fhir/feeding-device"
   },
@@ -433,6 +436,9 @@
   {
     "uri" : "http://hl7.org/fhir/guide-page-generation"
   },
+  {
+    "uri" : "http://hl7.org/fhir/guide-parameter-code"
+  },
   {
     "uri" : "http://hl7.org/fhir/history-status"
   },
@@ -476,10 +482,10 @@
     "uri" : "http://hl7.org/fhir/language-preference-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/link-type"
+    "uri" : "http://hl7.org/fhir/linkage-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/linkage-type"
+    "uri" : "http://hl7.org/fhir/link-type"
   },
   {
     "uri" : "http://hl7.org/fhir/list-mode"
@@ -524,10 +530,10 @@
     "uri" : "http://hl7.org/fhir/message-events"
   },
   {
-    "uri" : "http://hl7.org/fhir/message-significance-category"
+    "uri" : "http://hl7.org/fhir/messageheader-response-request"
   },
   {
-    "uri" : "http://hl7.org/fhir/messageheader-response-request"
+    "uri" : "http://hl7.org/fhir/message-significance-category"
   },
   {
     "uri" : "http://hl7.org/fhir/metric-calibration-state"
@@ -653,10 +659,10 @@
     "uri" : "http://hl7.org/fhir/related-artifact-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/relation-type"
+    "uri" : "http://hl7.org/fhir/relationship"
   },
   {
-    "uri" : "http://hl7.org/fhir/relationship"
+    "uri" : "http://hl7.org/fhir/relation-type"
   },
   {
     "uri" : "http://hl7.org/fhir/remittance-outcome"
@@ -784,6 +790,9 @@
   {
     "uri" : "http://hl7.org/fhir/structure-definition-kind"
   },
+  {
+    "uri" : "http://hl7.org/fhir/subscription-channel-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/subscription-status"
   },
@@ -1000,18 +1009,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/chromosome-human"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claimcareteamrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claiminformationcategory"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/codesystem-altcode-kind"
   },
@@ -1036,6 +1045,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/conceptdomains"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/condition-category"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/condition-clinical"
   },
@@ -1069,21 +1081,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/container-cap"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractaction"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractactorrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractsignertypecodes"
   },
@@ -1096,6 +1105,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contracttermtypecodes"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/copy-number-event"
   },
@@ -1106,10 +1118,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/coverage-copay-type"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/data-absent-reason"
@@ -1192,6 +1204,12 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-diagnosistype"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-payee-resource-type"
   },
@@ -1219,21 +1237,15 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-tooth"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-USCLS"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/failure-action"
   },
@@ -1283,10 +1295,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/hl7-document-format-codes"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status"
@@ -1372,12 +1384,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medication-admin-status"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/medication-statement-category"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationdispense-performer-function"
   },
@@ -1405,6 +1411,12 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-status-reason"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/medication-statement-category"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/message-reasons-encounter"
   },
@@ -1454,10 +1466,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/payment-adjustment-reason"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
+    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
+    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/plan-definition-type"
@@ -3577,9 +3589,6 @@
   {
     "uri" : "urn:ietf:rfc:3986"
   },
-  {
-    "uri" : "urn:iso-astm:E1762-95:2013"
-  },
   {
     "uri" : "urn:iso:std:iso:11073:10101"
   },
@@ -3592,6 +3601,9 @@
   {
     "uri" : "urn:iso:std:iso:4217"
   },
+  {
+    "uri" : "urn:iso-astm:E1762-95:2013"
+  },
   {
     "uri" : "urn:oid:1.2.36.1.2001.1001.101.104.16592"
   },

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/11073.cache

@@ -0,0 +1,46 @@
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "urn:iso:std:iso:11073:10101",
+  "code" : "150456",
+  "display" : "MDC_PULS_OXIM_SAT_O2"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "MDC_PULS_OXIM_SAT_O2",
+  "code" : "150456",
+  "system" : "urn:iso:std:iso:11073:10101",
+  "version" : "2022-02-04",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "urn:iso:std:iso:11073:10101",
+  "code" : "150456"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "MDC_PULS_OXIM_SAT_O2",
+  "code" : "150456",
+  "system" : "urn:iso:std:iso:11073:10101",
+  "version" : "2022-02-04",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/condition-clinical.cache

@@ -57,7 +57,7 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "The CodeSystem http://terminology.hl7.org/CodeSystem/condition-clinical version 0.5.0 is unknown. Valid versions: [2.0.0] (from Tx-Server)",
+  "error" : "The code system http://terminology.hl7.org/CodeSystem/condition-clinical version 0.5.0 could not be found. Valid versions: [2.0.0,4.0.1] (from Tx-Server)",
   "class" : "CODESYSTEM_UNSUPPORTED",
   "unknown-systems" : "http://terminology.hl7.org/CodeSystem/condition-clinical|0.5.0",
   "issues" : {

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/cvx.cache

@@ -15,6 +15,7 @@ v: {
   "code" : "207",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -36,341 +37,7 @@ v: {
   "severity" : "error",
   "error" : "Wrong Display Name 'X SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose' for http://hl7.org/fhir/sid/cvx#207 - should be 'SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose' (for the language(s) '--') (from Tx-Server)",
   "class" : "UNKNOWN",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "208"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose",
-  "code" : "208",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "208"
-}, "url": "http://hl7.org/fhir/uv/shc-vaccination/ValueSet/vaccine-cvx", "version": "0.6.2", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose",
-  "code" : "208",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "209"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "Unknown Code '209' in the system 'http://hl7.org/fhir/sid/cvx'; The provided code 'http://hl7.org/fhir/sid/cvx#209' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
-  "class" : "UNKNOWN",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "115"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "tetanus toxoid, reduced diphtheria toxoid, and acellular pertussis vaccine, adsorbed",
-  "code" : "115",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "10"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "poliovirus vaccine, inactivated",
-  "code" : "10",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "85"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "hepatitis A vaccine, unspecified formulation",
-  "code" : "85",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "25"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "typhoid vaccine, live, oral",
-  "code" : "25",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "37"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "yellow fever vaccine",
-  "code" : "37",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "185"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Seasonal, quadrivalent, recombinant, injectable influenza vaccine, preservative free",
-  "code" : "185",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "150"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Influenza, injectable, quadrivalent, preservative free",
-  "code" : "150",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "207"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose",
-  "code" : "207",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "171"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Influenza, injectable, Madin Darby Canine Kidney, preservative free, quadrivalent",
-  "code" : "171",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "88"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "influenza virus vaccine, unspecified formulation",
-  "code" : "88",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "210"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, vector non-replicating, recombinant spike protein-ChAdOx1, preservative free, 0.5 mL",
-  "code" : "210",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "210"
-}, "url": "http://hl7.org/fhir/uv/shc-vaccination/ValueSet/vaccine-cvx", "version": "0.6.2", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, vector non-replicating, recombinant spike protein-ChAdOx1, preservative free, 0.5 mL",
-  "code" : "210",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "code" : "207"
-}, "url": "http://hl7.org/fhir/uv/shc-vaccination/ValueSet/vaccine-cvx", "version": "0.6.2", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose",
-  "code" : "207",
-  "system" : "http://hl7.org/fhir/sid/cvx",
-  "version" : "20210406",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -389,9 +56,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose",
   "code" : "208",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -410,9 +79,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Influenza, seasonal, injectable",
   "code" : "141",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -431,9 +102,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "diphtheria, tetanus toxoids and acellular pertussis vaccine",
   "code" : "20",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -452,9 +125,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "tetanus and diphtheria toxoids, not adsorbed, for adult use",
   "code" : "138",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -473,9 +148,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "pneumococcal conjugate vaccine, 13 valent",
   "code" : "133",
   "system" : "http://hl7.org/fhir/sid/cvx",
   "version" : "20210406",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -597,3 +274,156 @@ v: {
 
 }
 -------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "code" : "208"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose",
+  "code" : "208",
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "version" : "20210406",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "code" : "208"
+}, "url": "http://hl7.org/fhir/uv/shc-vaccination/ValueSet/vaccine-cvx", "version": "0.6.2", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 30 mcg/0.3mL dose",
+  "code" : "208",
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "version" : "20210406",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "code" : "209"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "severity" : "error",
+  "error" : "The provided code 'http://hl7.org/fhir/sid/cvx#209' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unknown Code '209' in the system 'http://hl7.org/fhir/sid/cvx|20210406' (from Tx-Server)",
+  "class" : "UNKNOWN",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "code" : "210"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "SARS-COV-2 (COVID-19) vaccine, vector non-replicating, recombinant spike protein-ChAdOx1, preservative free, 0.5 mL",
+  "code" : "210",
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "version" : "20210406",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "code" : "207"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose",
+  "code" : "207",
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "version" : "20210406",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "code" : "210"
+}, "url": "http://hl7.org/fhir/uv/shc-vaccination/ValueSet/vaccine-cvx", "version": "0.6.2", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "SARS-COV-2 (COVID-19) vaccine, vector non-replicating, recombinant spike protein-ChAdOx1, preservative free, 0.5 mL",
+  "code" : "210",
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "version" : "20210406",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "code" : "207"
+}, "url": "http://hl7.org/fhir/uv/shc-vaccination/ValueSet/vaccine-cvx", "version": "0.6.2", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "SARS-COV-2 (COVID-19) vaccine, mRNA, spike protein, LNP, preservative free, 100 mcg/0.5mL dose",
+  "code" : "207",
+  "system" : "http://hl7.org/fhir/sid/cvx",
+  "version" : "20210406",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___something_something.cache

@@ -11,7 +11,7 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "The CodeSystem http://something/something is unknown (from Tx-Server)",
+  "error" : "The code system http://something/something could not be found (from Tx-Server)",
   "class" : "CODESYSTEM_UNSUPPORTED",
   "unknown-systems" : "http://something/something",
   "issues" : {

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___standardterms.edqm.eu.cache

@@ -15,28 +15,6 @@ v: {
   "code" : "20049000",
   "system" : "http://standardterms.edqm.eu",
   "version" : "5 March 2019",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://standardterms.edqm.eu",
-  "code" : "20053000",
-  "display" : "Oral use"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Oral use",
-  "code" : "20053000",
-  "system" : "http://standardterms.edqm.eu",
-  "version" : "5 March 2019",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___varnomen.hgvs.org.cache

@@ -10,9 +10,11 @@
   }]
 }}####
 v: {
-  "severity" : "error",
-  "error" : "Error from server: HGVS is not supported at this time",
-  "class" : "SERVER_ERROR",
+  "display" : "NC_000019.8:g.1171707G>A",
+  "code" : "NC_000019.8:g.1171707G>A",
+  "system" : "http://varnomen.hgvs.org",
+  "version" : "2.0",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -30,9 +32,33 @@ v: {
   }]
 }}####
 v: {
-  "severity" : "error",
-  "error" : "Error from server: HGVS is not supported at this time",
-  "class" : "SERVER_ERROR",
+  "display" : "NC_000019.8:g.1171707G>A",
+  "code" : "NC_000019.8:g.1171707G>A",
+  "system" : "http://varnomen.hgvs.org",
+  "version" : "2.0",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://varnomen.hgvs.org",
+  "code" : "NC_000019.8:g.1171707G>A"
+}, "url": "http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgvs-vs", "version": "1.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "NC_000019.8:g.1171707G>A",
+  "code" : "NC_000019.8:g.1171707G>A",
+  "system" : "http://varnomen.hgvs.org",
+  "version" : "2.0",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -51,8 +77,9 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Error from server: HGVS is not supported at this time",
-  "class" : "SERVER_ERROR",
+  "error" : "The provided code 'http://varnomen.hgvs.org#NC_000019.8:g.1171707G>AXXX' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unknown Code 'NC_000019.8:g.1171707G>AXXX' in the system 'http://varnomen.hgvs.org|2.0' (from Tx-Server)",
+  "class" : "UNKNOWN",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -71,8 +98,9 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "Error from server: HGVS is not supported at this time",
-  "class" : "SERVER_ERROR",
+  "error" : "The provided code 'http://varnomen.hgvs.org#NC_000019.8:g.1171707G>AXXX' was not found in the value set 'http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgvs-vs--0|1.0.0'; Unknown Code 'NC_000019.8:g.1171707G>AXXX' in the system 'http://varnomen.hgvs.org|2.0' (from Tx-Server)",
+  "class" : "UNKNOWN",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.genenames.org_geneId.cache

@@ -11,7 +11,7 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "The CodeSystem http://www.genenames.org/geneId is unknown; Unable to check whether the code is in the value set http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgnc-vs--0|1.0.0 (from Tx-Server)",
+  "error" : "The code system http://www.genenames.org/geneId could not be found; Unable to check whether the code is in the value set http://hl7.org/fhir/us/mcode/ValueSet/mcode-hgnc-vs--0|1.0.0 (from Tx-Server)",
   "class" : "CODESYSTEM_UNSUPPORTED",
   "unknown-systems" : "http://www.genenames.org/geneId",
   "issues" : {

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/http___www.ncbi.nlm.nih.gov_clinvar.cache

@@ -11,7 +11,7 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "The CodeSystem http://www.ncbi.nlm.nih.gov/clinvar is unknown; Unable to check whether the code is in the value set http://hl7.org/fhir/us/mcode/ValueSet/mcode-clinvar-vs--0|1.0.0 (from Tx-Server)",
+  "error" : "The code system http://www.ncbi.nlm.nih.gov/clinvar could not be found; Unable to check whether the code is in the value set http://hl7.org/fhir/us/mcode/ValueSet/mcode-clinvar-vs--0|1.0.0 (from Tx-Server)",
   "class" : "CODESYSTEM_UNSUPPORTED",
   "unknown-systems" : "http://www.ncbi.nlm.nih.gov/clinvar",
   "issues" : {

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/icd-10-cm.cache

@@ -11,7 +11,7 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "Unknown Code 'E10.3211+TT1.2' in the system 'http://hl7.org/fhir/sid/icd-10-cm'; The provided code 'http://hl7.org/fhir/sid/icd-10-cm#E10.3211+TT1.2' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "The provided code 'http://hl7.org/fhir/sid/icd-10-cm#E10.3211+TT1.2' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unknown Code 'E10.3211+TT1.2' in the system 'http://hl7.org/fhir/sid/icd-10-cm|2021' (from Tx-Server)",
   "class" : "UNKNOWN",
   "unknown-systems" : "",
   "issues" : {

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/iso3166.cache

@@ -15,27 +15,7 @@ v: {
   "code" : "NO",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:iso:std:iso:3166",
-  "code" : "US"
-}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction--0", "version": "4.0.1", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "United States of America",
-  "code" : "US",
-  "system" : "urn:iso:std:iso:3166",
-  "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -57,6 +37,7 @@ v: {
   "code" : "CHE",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -78,6 +59,29 @@ v: {
   "code" : "CHE",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "urn:iso:std:iso:3166",
+  "code" : "US"
+}, "url": "http://hl7.org/fhir/ValueSet/jurisdiction--0", "version": "4.0.1", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "United States of America",
+  "code" : "US",
+  "system" : "urn:iso:std:iso:3166",
+  "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -99,6 +103,7 @@ v: {
   "code" : "US",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -120,49 +125,7 @@ v: {
   "code" : "NO",
   "system" : "urn:iso:std:iso:3166",
   "version" : "2018",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:iso:std:iso:3166",
-  "code" : "NO",
-  "display" : "Alderney"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "Wrong Display Name 'Alderney' for urn:iso:std:iso:3166#NO - should be 'Norway' (for the language(s) '--') (from Tx-Server)",
-  "class" : "UNKNOWN",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:iso:std:iso:3166",
-  "code" : "US",
-  "display" : "United States of America"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "United States of America",
-  "code" : "US",
-  "system" : "urn:iso:std:iso:3166",
-  "version" : "2018",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/lang.cache

@@ -13,6 +13,7 @@ v: {
   "display" : "German (Switzerland)",
   "code" : "de-CH",
   "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -34,6 +35,7 @@ v: {
   "display" : "German (Region=Switzerland)",
   "code" : "de-CH",
   "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -54,6 +56,7 @@ v: {
   "display" : "German (Region=Switzerland)",
   "code" : "de-CH",
   "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -74,6 +77,7 @@ v: {
   "display" : "French",
   "code" : "fr",
   "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -95,6 +99,7 @@ v: {
   "display" : "French",
   "code" : "fr",
   "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -115,6 +120,7 @@ v: {
   "display" : "French",
   "code" : "fr",
   "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -135,6 +141,7 @@ v: {
   "display" : "English",
   "code" : "en",
   "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -156,6 +163,7 @@ v: {
   "display" : "English",
   "code" : "en",
   "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -172,71 +180,6 @@ v: {
     "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
   }]
 }}####
-v: {
-  "display" : "English",
-  "code" : "en",
-  "system" : "urn:ietf:bcp:47",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:ietf:bcp:47",
-  "code" : "de-CH",
-  "display" : "German (Region=Switzerland)"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "German (Region=Switzerland)",
-  "code" : "de-CH",
-  "system" : "urn:ietf:bcp:47",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:ietf:bcp:47",
-  "code" : "fr",
-  "display" : "French"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "French",
-  "code" : "fr",
-  "system" : "urn:ietf:bcp:47",
-  "unknown-systems" : "",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:ietf:bcp:47",
-  "code" : "en",
-  "display" : "English"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
 v: {
   "display" : "English",
   "code" : "en",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/rxnorm.cache

@@ -14,7 +14,8 @@ v: {
   "display" : "oxymetazoline hydrochloride 0.5 MG/ML Nasal Spray",
   "code" : "1000990",
   "system" : "http://www.nlm.nih.gov/research/umls/rxnorm",
-  "version" : "??",
+  "version" : "??rx1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -36,7 +37,8 @@ v: {
   "display" : "buprenorphine 2 MG / naloxone 0.5 MG Sublingual Film [Suboxone]",
   "code" : "1010603",
   "system" : "http://www.nlm.nih.gov/research/umls/rxnorm",
-  "version" : "??",
+  "version" : "??rx1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -58,7 +60,8 @@ v: {
   "display" : "flurazepam hydrochloride 15 MG Oral Capsule",
   "code" : "1298088",
   "system" : "http://www.nlm.nih.gov/research/umls/rxnorm",
-  "version" : "??",
+  "version" : "??rx1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -80,7 +83,8 @@ v: {
   "display" : "buprenorphine 2 MG / naloxone 0.5 MG Sublingual Film",
   "code" : "1010600",
   "system" : "http://www.nlm.nih.gov/research/umls/rxnorm",
-  "version" : "??",
+  "version" : "??rx1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -101,28 +105,7 @@ v: {
   "display" : "Mircera",
   "code" : "1591957",
   "system" : "http://www.nlm.nih.gov/research/umls/rxnorm",
-  "version" : "??",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://www.nlm.nih.gov/research/umls/rxnorm",
-  "code" : "617311",
-  "display" : "atorvastatin 40mg Oral Tablet"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "Wrong Display Name 'atorvastatin 40mg Oral Tablet' for http://www.nlm.nih.gov/research/umls/rxnorm#617311 - should be one of 3 choices: 'atorvastatin 40 MG Oral Tablet', 'atorvastatin (as atorvastatin calcium) 40 MG Oral Tablet' or 'atorvastatin calcium 40 MG Oral Tablet' (for the language(s) '--') (from Tx-Server)",
-  "class" : "UNKNOWN",
+  "version" : "??rx1",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/ucum.cache

@@ -14,27 +14,7 @@ v: {
   "code" : "%",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "L/min"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "L/min",
-  "code" : "L/min",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -56,6 +36,29 @@ v: {
   "code" : "%",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "L/min"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "L/min",
+  "code" : "L/min",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -74,8 +77,9 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "The provided code 'http://unitsofmeasure.org#L/min' is not in the value set 'http://hl7.org/fhir/ValueSet/ucum-vitals-common--0|4.0.1' (from Tx-Server)",
+  "error" : "The provided code 'http://unitsofmeasure.org#L/min' was not found in the value set 'http://hl7.org/fhir/ValueSet/ucum-vitals-common--0|4.0.1' (from Tx-Server)",
   "class" : "UNKNOWN",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -97,6 +101,7 @@ v: {
   "code" : "cm",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -115,8 +120,9 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "The provided code 'http://unitsofmeasure.org#cm' is not in the value set 'https://bb/ValueSet/BBDemographicAgeUnit--0|20190731' (from Tx-Server)",
+  "error" : "The provided code 'http://unitsofmeasure.org#cm' was not found in the value set 'https://bb/ValueSet/BBDemographicAgeUnit--0|20190731' (from Tx-Server)",
   "class" : "UNKNOWN",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -138,6 +144,7 @@ v: {
   "code" : "min",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -159,6 +166,7 @@ v: {
   "code" : "mmol/L",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -180,6 +188,7 @@ v: {
   "code" : "kg",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -201,6 +210,7 @@ v: {
   "code" : "kg/m2",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -222,27 +232,7 @@ v: {
   "code" : "mm[Hg]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "wk"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "wk",
-  "code" : "wk",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -264,6 +254,7 @@ v: {
   "code" : "mm[Hg]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -272,7 +263,7 @@ v: {
 -------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://unitsofmeasure.org",
-  "code" : "{capsule}"
+  "code" : "wk"
 }, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
@@ -281,260 +272,11 @@ v: {
   }]
 }}####
 v: {
-  "display" : "{capsule}",
-  "code" : "{capsule}",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "{patch}"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "{patch}",
-  "code" : "{patch}",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "m"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "m",
-  "code" : "m",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "m"
-}, "url": "http://hl7.org/fhir/ValueSet/age-units--0", "version": "4.0.1", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "The provided code 'http://unitsofmeasure.org#m' is not in the value set 'http://hl7.org/fhir/ValueSet/age-units--0|4.0.1' (from Tx-Server)",
-  "class" : "UNKNOWN",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "/min"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "/min",
-  "code" : "/min",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "mg"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "mg",
-  "code" : "mg",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "mm"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "mm",
-  "code" : "mm",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "kg"
-}, "url": "http://fhir.de/ValueSet/UcumVitalsCommonDE--0", "version": "0.9.13", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "kilogram",
-  "code" : "kg",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "Cel"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Cel",
-  "code" : "Cel",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "g"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "g",
-  "code" : "g",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "mm[Hg]{hg}"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "mm[Hg]{hg}",
-  "code" : "mm[Hg]{hg}",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "fmm[Hg]"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "Error processing Unit: 'fmm[Hg]': The unit \"fmm[Hg]\" is unknown at character 1; Unknown Code 'fmm[Hg]' in the system 'http://unitsofmeasure.org'; The provided code 'http://unitsofmeasure.org#fmm[Hg]' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
-  "class" : "UNKNOWN",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "J/C"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "J/C",
-  "code" : "J/C",
+  "display" : "wk",
+  "code" : "wk",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -556,6 +298,7 @@ v: {
   "code" : "h",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -577,6 +320,7 @@ v: {
   "code" : "ar",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -598,6 +342,7 @@ v: {
   "code" : "l",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -606,8 +351,74 @@ v: {
 -------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://unitsofmeasure.org",
-  "code" : "mm[Hg]{hg}"
-}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "4.0.1", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "code" : "{capsule}"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "{capsule}",
+  "code" : "{capsule}",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "{patch}"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "{patch}",
+  "code" : "{patch}",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "m"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "m",
+  "code" : "m",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "m"
+}, "url": "http://hl7.org/fhir/ValueSet/age-units--0", "version": "4.0.1", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
     "name" : "profile-url",
@@ -616,8 +427,9 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "The provided code 'http://unitsofmeasure.org#mm[Hg]{hg}' is not in the value set 'http://hl7.org/fhir/ValueSet/ucum-vitals-common--0|4.0.1' (from Tx-Server)",
+  "error" : "The provided code 'http://unitsofmeasure.org#m' was not found in the value set 'http://hl7.org/fhir/ValueSet/age-units--0|4.0.1' (from Tx-Server)",
   "class" : "UNKNOWN",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -635,9 +447,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "mmol/L",
   "code" : "mmol/L",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -655,9 +469,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "mmol/mol",
   "code" : "mmol/mol",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -675,9 +491,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Cel",
   "code" : "Cel",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -695,9 +513,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "/min",
   "code" : "/min",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -715,9 +535,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "mm[Hg]",
   "code" : "mm[Hg]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -735,9 +557,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "millimeter of mercury",
   "code" : "mm[Hg]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -755,9 +579,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "cm",
   "code" : "cm",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -775,9 +601,11 @@ v: {
   }]
 }}####
 v: {
+  "display" : "kg",
   "code" : "kg",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -806,3 +634,221 @@ v: {
 
 }
 -------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "Cel"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Cel",
+  "code" : "Cel",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "/min"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "/min",
+  "code" : "/min",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "mg"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "mg",
+  "code" : "mg",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "mm"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "mm",
+  "code" : "mm",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "kg"
+}, "url": "http://fhir.de/ValueSet/UcumVitalsCommonDE--0", "version": "0.9.13", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "kilogram",
+  "code" : "kg",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "g"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "g",
+  "code" : "g",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "mm[Hg]{hg}"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "mm[Hg]{hg}",
+  "code" : "mm[Hg]{hg}",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "fmm[Hg]"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "severity" : "error",
+  "error" : "Error processing Unit: 'fmm[Hg]': The unit \"fmm[Hg]\" is unknown at character 1; The provided code 'http://unitsofmeasure.org#fmm[Hg]' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unknown Code 'fmm[Hg]' in the system 'http://unitsofmeasure.org|2.0.1' (from Tx-Server)",
+  "class" : "UNKNOWN",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "mm[Hg]{hg}"
+}, "url": "http://hl7.org/fhir/ValueSet/ucum-vitals-common--0", "version": "4.0.1", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "severity" : "error",
+  "error" : "The provided code 'http://unitsofmeasure.org#mm[Hg]{hg}' was not found in the value set 'http://hl7.org/fhir/ValueSet/ucum-vitals-common--0|4.0.1' (from Tx-Server)",
+  "class" : "UNKNOWN",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "J/C"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "J/C",
+  "code" : "J/C",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/urn_oid_2.16.840.1.113883.5.10588.cache

@@ -1,23 +0,0 @@
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "urn:oid:2.16.840.1.113883.5.10588",
-  "code" : "GIM",
-  "display" : "General internal medicine clinic"
-}, "valueSet" :null, "langs":"en", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "The CodeSystem urn:oid:2.16.840.1.113883.5.10588 is unknown (from Tx-Server)",
-  "class" : "CODESYSTEM_UNSUPPORTED",
-  "unknown-systems" : "urn:oid:2.16.840.1.113883.5.10588",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.0.1/uvsdcCodeSystemCSPHQ9.cache

@@ -10,6 +10,7 @@
   }]
 }}####
 v: {
+  "display" : "Not at all",
   "code" : "Not-at-all",
   "system" : "http://hl7.org/fhir/uv/sdc/CodeSystem/CSPHQ9",
   "version" : "3.0.0",
@@ -31,6 +32,7 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Several days",
   "code" : "Several-days",
   "system" : "http://hl7.org/fhir/uv/sdc/CodeSystem/CSPHQ9",
   "version" : "3.0.0",
@@ -52,6 +54,7 @@ v: {
   }]
 }}####
 v: {
+  "display" : "More than half the days",
   "code" : "More than half the days",
   "system" : "http://hl7.org/fhir/uv/sdc/CodeSystem/CSPHQ9",
   "version" : "3.0.0",
@@ -73,6 +76,7 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Nearly every day",
   "code" : "Nearly every day",
   "system" : "http://hl7.org/fhir/uv/sdc/CodeSystem/CSPHQ9",
   "version" : "3.0.0",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.capabilityStatement.cache

@@ -8,11 +8,11 @@
       "display" : "Subsetted"
     }]
   },
-  "url" : "http://localhost/r4/metadata",
+  "url" : "http://tx-dev.fhir.org/r4/metadata",
   "version" : "4.0.1-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:36.972Z",
+  "date" : "2023-12-25T11:48:12.658Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -27,8 +27,8 @@
     "releaseDate" : "2023-06-19T19:50:55.040Z"
   },
   "implementation" : {
-    "description" : "FHIR Server running at http://localhost/r4",
-    "url" : "http://localhost/r4"
+    "description" : "FHIR Server running at http://tx-dev.fhir.org/r4",
+    "url" : "http://tx-dev.fhir.org/r4"
   },
   "fhirVersion" : "4.0.1",
   "format" : ["application/fhir+xml",
@@ -60,7 +60,7 @@
     },
     {
       "name" : "versions",
-      "definition" : "http://localhost/r4/OperationDefinition/fso-versions"
+      "definition" : "http://tx-dev.fhir.org/r4/OperationDefinition/fso-versions"
     }]
   }]
 }

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/4.3.0/.terminologyCapabilities.cache

@@ -1,11 +1,11 @@
 {
   "resourceType" : "TerminologyCapabilities",
   "id" : "FhirServer",
-  "url" : "http://localhost/r4/metadata",
+  "url" : "http://tx-dev.fhir.org/r4/metadata",
   "version" : "2.0.0",
   "name" : "FHIR Reference Server Teminology Capability Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:36.986Z",
+  "date" : "2023-12-25T11:48:12.861Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -112,6 +112,9 @@
   {
     "uri" : "http://hl7.org/fhir/audit-event-action"
   },
+  {
+    "uri" : "http://hl7.org/fhir/audit-event-outcome"
+  },
   {
     "uri" : "http://hl7.org/fhir/binding-strength"
   },
@@ -136,27 +139,21 @@
   {
     "uri" : "http://hl7.org/fhir/code-search-support"
   },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
-  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/example"
   },
-  {
-    "uri" : "http://hl7.org/fhir/CodeSystem/medication-statement-status"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/CodeSystem/medication-status"
-  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/medicationrequest-intent"
   },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/medicationrequest-status"
   },
+  {
+    "uri" : "http://hl7.org/fhir/CodeSystem/medication-statement-status"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/CodeSystem/medication-status"
+  },
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/status"
   },
@@ -166,6 +163,12 @@
   {
     "uri" : "http://hl7.org/fhir/CodeSystem/task-code"
   },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-content-mode"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/codesystem-hierarchy-meaning"
+  },
   {
     "uri" : "http://hl7.org/fhir/compartment-type"
   },
@@ -178,6 +181,9 @@
   {
     "uri" : "http://hl7.org/fhir/concept-map-equivalence"
   },
+  {
+    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
+  },
   {
     "uri" : "http://hl7.org/fhir/concept-properties"
   },
@@ -187,9 +193,6 @@
   {
     "uri" : "http://hl7.org/fhir/concept-subsumption-outcome"
   },
-  {
-    "uri" : "http://hl7.org/fhir/conceptmap-unmapped-mode"
-  },
   {
     "uri" : "http://hl7.org/fhir/conditional-delete-status"
   },
@@ -199,15 +202,15 @@
   {
     "uri" : "http://hl7.org/fhir/consent-data-meaning"
   },
+  {
+    "uri" : "http://hl7.org/fhir/consentperformer"
+  },
   {
     "uri" : "http://hl7.org/fhir/consent-provision-type"
   },
   {
     "uri" : "http://hl7.org/fhir/consent-state-codes"
   },
-  {
-    "uri" : "http://hl7.org/fhir/consentperformer"
-  },
   {
     "uri" : "http://hl7.org/fhir/constraint-severity"
   },
@@ -343,6 +346,9 @@
   {
     "uri" : "http://hl7.org/fhir/event-timing"
   },
+  {
+    "uri" : "http://hl7.org/fhir/examplescenario-actor-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/ex-claimitemtype"
   },
@@ -358,18 +364,6 @@
   {
     "uri" : "http://hl7.org/fhir/ex-pharmaservice"
   },
-  {
-    "uri" : "http://hl7.org/fhir/ex-servicemodifier"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/ex-serviceproduct"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/ex-udi"
-  },
-  {
-    "uri" : "http://hl7.org/fhir/examplescenario-actor-type"
-  },
   {
     "uri" : "http://hl7.org/fhir/explanationofbenefit-status"
   },
@@ -379,12 +373,21 @@
   {
     "uri" : "http://hl7.org/fhir/expression-language"
   },
+  {
+    "uri" : "http://hl7.org/fhir/ex-servicemodifier"
+  },
+  {
+    "uri" : "http://hl7.org/fhir/ex-serviceproduct"
+  },
   {
     "uri" : "http://hl7.org/fhir/extension-context-type"
   },
   {
     "uri" : "http://hl7.org/fhir/extra-activity-type"
   },
+  {
+    "uri" : "http://hl7.org/fhir/ex-udi"
+  },
   {
     "uri" : "http://hl7.org/fhir/feeding-device"
   },
@@ -433,6 +436,9 @@
   {
     "uri" : "http://hl7.org/fhir/guide-page-generation"
   },
+  {
+    "uri" : "http://hl7.org/fhir/guide-parameter-code"
+  },
   {
     "uri" : "http://hl7.org/fhir/history-status"
   },
@@ -476,10 +482,10 @@
     "uri" : "http://hl7.org/fhir/language-preference-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/link-type"
+    "uri" : "http://hl7.org/fhir/linkage-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/linkage-type"
+    "uri" : "http://hl7.org/fhir/link-type"
   },
   {
     "uri" : "http://hl7.org/fhir/list-mode"
@@ -524,10 +530,10 @@
     "uri" : "http://hl7.org/fhir/message-events"
   },
   {
-    "uri" : "http://hl7.org/fhir/message-significance-category"
+    "uri" : "http://hl7.org/fhir/messageheader-response-request"
   },
   {
-    "uri" : "http://hl7.org/fhir/messageheader-response-request"
+    "uri" : "http://hl7.org/fhir/message-significance-category"
   },
   {
     "uri" : "http://hl7.org/fhir/metric-calibration-state"
@@ -653,10 +659,10 @@
     "uri" : "http://hl7.org/fhir/related-artifact-type"
   },
   {
-    "uri" : "http://hl7.org/fhir/relation-type"
+    "uri" : "http://hl7.org/fhir/relationship"
   },
   {
-    "uri" : "http://hl7.org/fhir/relationship"
+    "uri" : "http://hl7.org/fhir/relation-type"
   },
   {
     "uri" : "http://hl7.org/fhir/remittance-outcome"
@@ -784,6 +790,9 @@
   {
     "uri" : "http://hl7.org/fhir/structure-definition-kind"
   },
+  {
+    "uri" : "http://hl7.org/fhir/subscription-channel-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/subscription-status"
   },
@@ -1000,18 +1009,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/chromosome-human"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claimcareteamrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-exception"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/claiminformationcategory"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/claim-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/codesystem-altcode-kind"
   },
@@ -1036,6 +1045,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/conceptdomains"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/condition-category"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/condition-clinical"
   },
@@ -1069,21 +1081,18 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/container-cap"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractaction"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractactorrole"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-content-derivative"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-data-meaning"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contractsignertypecodes"
   },
@@ -1096,6 +1105,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/contracttermtypecodes"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/contract-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/copy-number-event"
   },
@@ -1106,10 +1118,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/coverage-copay-type"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/coverageeligibilityresponse-ex-auth-support"
+    "uri" : "http://terminology.hl7.org/CodeSystem/coverage-selfpay"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/data-absent-reason"
@@ -1192,6 +1204,12 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-diagnosistype"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-payee-resource-type"
   },
@@ -1219,21 +1237,15 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-tooth"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-USCLS"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/ex-visionprescriptionproduct"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-parameter-source"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/expansion-processing-rule"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/extra-security-role-type"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/failure-action"
   },
@@ -1283,10 +1295,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/hl7-document-format-codes"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/hl7TermMaintInfra"
+    "uri" : "http://terminology.hl7.org/CodeSystem/hl7-work-group"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/immunization-evaluation-dose-status"
@@ -1372,12 +1384,6 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medication-admin-status"
   },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/medication-statement-category"
-  },
-  {
-    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
-  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationdispense-performer-function"
   },
@@ -1405,6 +1411,12 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/medicationrequest-status-reason"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/medication-statement-category"
+  },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/medication-usage-admin-location"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/message-reasons-encounter"
   },
@@ -1454,10 +1466,10 @@
     "uri" : "http://terminology.hl7.org/CodeSystem/payment-adjustment-reason"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
+    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
   },
   {
-    "uri" : "http://terminology.hl7.org/CodeSystem/paymentstatus"
+    "uri" : "http://terminology.hl7.org/CodeSystem/payment-type"
   },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/plan-definition-type"
@@ -3577,9 +3589,6 @@
   {
     "uri" : "urn:ietf:rfc:3986"
   },
-  {
-    "uri" : "urn:iso-astm:E1762-95:2013"
-  },
   {
     "uri" : "urn:iso:std:iso:11073:10101"
   },
@@ -3592,6 +3601,9 @@
   {
     "uri" : "urn:iso:std:iso:4217"
   },
+  {
+    "uri" : "urn:iso-astm:E1762-95:2013"
+  },
   {
     "uri" : "urn:oid:1.2.36.1.2001.1001.101.104.16592"
   },

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.capabilityStatement.cache

@@ -12,7 +12,7 @@
   "version" : "4.0.1-3.0.0",
   "name" : "FHIR Reference Server Conformance Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:12.104Z",
+  "date" : "2023-12-25T11:39:21.018Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/.terminologyCapabilities.cache

@@ -5,7 +5,7 @@
   "version" : "2.0.0",
   "name" : "FHIR Reference Server Teminology Capability Statement",
   "status" : "active",
-  "date" : "2023-08-28T13:43:12.307Z",
+  "date" : "2023-12-25T11:39:21.252Z",
   "contact" : [{
     "telecom" : [{
       "system" : "other",
@@ -112,6 +112,9 @@
   {
     "uri" : "http://hl7.org/fhir/audit-event-action"
   },
+  {
+    "uri" : "http://hl7.org/fhir/audit-event-outcome"
+  },
   {
     "uri" : "http://hl7.org/fhir/binding-strength"
   },
@@ -433,6 +436,9 @@
   {
     "uri" : "http://hl7.org/fhir/guide-page-generation"
   },
+  {
+    "uri" : "http://hl7.org/fhir/guide-parameter-code"
+  },
   {
     "uri" : "http://hl7.org/fhir/history-status"
   },
@@ -784,6 +790,9 @@
   {
     "uri" : "http://hl7.org/fhir/structure-definition-kind"
   },
+  {
+    "uri" : "http://hl7.org/fhir/subscription-channel-type"
+  },
   {
     "uri" : "http://hl7.org/fhir/subscription-status"
   },
@@ -1036,6 +1045,9 @@
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/conceptdomains"
   },
+  {
+    "uri" : "http://terminology.hl7.org/CodeSystem/condition-category"
+  },
   {
     "uri" : "http://terminology.hl7.org/CodeSystem/condition-clinical"
   },

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/all-systems.cache

@@ -1,28 +1,9 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "code" : "fr-CA"
-}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "French (Canada)",
-  "code" : "fr-CA",
-  "system" : "urn:ietf:bcp:47",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://snomed.info/sct",
-  "code" : "439401001",
-  "display" : "Diagnosis"
-}, "url": "http://hl7.org/fhir/ValueSet/condition-category", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "code" : "271649006",
+  "display" : "Systolic blood pressure"
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
     "name" : "profile-url",
@@ -30,30 +11,10 @@ v: {
   }]
 }}####
 v: {
-  "display" : "Diagnosis (observable entity)",
-  "code" : "439401001",
+  "display" : "Systolic blood pressure",
+  "code" : "271649006",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "code" : "d"
-}, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "day",
-  "code" : "d",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -77,28 +38,6 @@ v: {
   "resourceType" : "OperationOutcome"
 }
 
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://snomed.info/sct",
-  "code" : "271649006",
-  "display" : "Systolic blood pressure"
-}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Systolic blood pressure",
-  "code" : "271649006",
-  "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
 }
 -------------------------------------------------------------------------------------
 {"code" : {
@@ -150,6 +89,7 @@ v: {
   }]
 }}####
 v: {
+  "display" : "Dutch (Region=Netherlands)",
   "code" : "nl-NL",
   "system" : "urn:ietf:bcp:47",
   "issues" : {
@@ -168,6 +108,7 @@ v: {
   }]
 }}####
 v: {
+  "display" : "English (Region=Australia)",
   "code" : "en-AU",
   "system" : "urn:ietf:bcp:47",
   "issues" : {
@@ -231,7 +172,7 @@ v: {
   "display" : "Body weight",
   "code" : "27113001",
   "system" : "http://snomed.info/sct",
-  "version" : "http://snomed.info/sct/900000000000207008/version/20230731",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
@@ -260,3 +201,67 @@ v: {
 
 }
 -------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "fr-CA"
+}, "url": "http://hl7.org/fhir/ValueSet/languages", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "French (Canada)",
+  "code" : "fr-CA",
+  "system" : "urn:ietf:bcp:47",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://snomed.info/sct",
+  "code" : "439401001",
+  "display" : "Diagnosis"
+}, "url": "http://hl7.org/fhir/ValueSet/condition-category", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Diagnosis (observable entity)",
+  "code" : "439401001",
+  "system" : "http://snomed.info/sct",
+  "version" : "http://snomed.info/sct/900000000000207008/version/20230901",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "code" : "d"
+}, "url": "http://hl7.org/fhir/ValueSet/units-of-time", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"true", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "day",
+  "code" : "d",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/http___unstats.un.org_unsd_methods_m49_m49.htm.cache

@@ -13,6 +13,7 @@ v: {
   "display" : "World",
   "code" : "001",
   "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -29,27 +30,6 @@ v: {
     "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
   }]
 }}####
-v: {
-  "display" : "World",
-  "code" : "001",
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unstats.un.org/unsd/methods/m49/m49.htm",
-  "code" : "001",
-  "display" : "World"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
 v: {
   "display" : "World",
   "code" : "001",

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/loinc.cache

@@ -1,156 +1,4 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "29463-7",
-  "display" : "Body Weight"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Body weight",
-  "code" : "29463-7",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "3141-9",
-  "display" : "Body weight Measured"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Body weight Measured",
-  "code" : "3141-9",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "LA6724-4",
-  "display" : "Good color all over"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Good color all over",
-  "code" : "LA6724-4",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "LA6718-6",
-  "display" : "At least 100 beats per minute"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "At least 100 beats per minute",
-  "code" : "LA6718-6",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "LA6721-0",
-  "display" : "Grimace and pulling away, cough, or sneeze during suctioning"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Grimace and pulling away, cough, or sneeze during suctioning",
-  "code" : "LA6721-0",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "LA6715-2",
-  "display" : "Active motion "
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "Wrong whitespace in Display Name 'Active motion ' for http://loinc.org#LA6715-2 - should be 'Active motion' (for the language(s) '--') (from Tx-Server)",
-  "class" : "UNKNOWN",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "LA6727-7",
-  "display" : "Good, strong cry; normal rate and effort of breathing    "
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "severity" : "error",
-  "error" : "Wrong whitespace in Display Name 'Good, strong cry; normal rate and effort of breathing    ' for http://loinc.org#LA6727-7 - should be 'Good, strong cry; normal rate and effort of breathing' (for the language(s) '--') (from Tx-Server)",
-  "class" : "UNKNOWN",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://loinc.org",
   "code" : "85354-9",
@@ -691,6 +539,70 @@ v: {
   "resourceType" : "OperationOutcome"
 }
 
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "29463-7"
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Body weight",
+  "code" : "29463-7",
+  "system" : "http://loinc.org",
+  "version" : "2.74",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "29463-7",
+  "display" : "Body Weight"
+}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Body weight",
+  "code" : "29463-7",
+  "system" : "http://loinc.org",
+  "version" : "2.74",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "29463-7"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Body weight",
+  "code" : "29463-7",
+  "system" : "http://loinc.org",
+  "version" : "2.74",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
 }
 -------------------------------------------------------------------------------------
 {"code" : {
@@ -760,32 +672,8 @@ v: {
 -------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://loinc.org",
-  "version" : "2.74",
-  "code" : "56445-0",
-  "display" : "Medication summary Doc"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Medication summary Document",
-  "code" : "56445-0",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "version" : "current",
-  "code" : "56445-0",
-  "display" : "Medication summary Doc"
+  "code" : "29463-7",
+  "display" : "Body Weight"
 }, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
@@ -794,10 +682,11 @@ v: {
   }]
 }}####
 v: {
-  "display" : "Medication summary Document",
-  "code" : "56445-0",
+  "display" : "Body weight",
+  "code" : "29463-7",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -806,8 +695,9 @@ v: {
 -------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://loinc.org",
-  "code" : "29463-7"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
+  "code" : "3141-9",
+  "display" : "Body weight Measured"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
   "resourceType" : "Parameters",
   "parameter" : [{
     "name" : "profile-url",
@@ -815,53 +705,11 @@ v: {
   }]
 }}####
 v: {
-  "display" : "Body weight",
-  "code" : "29463-7",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "29463-7"
-}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"false", "guessSystem":"false", "valueSetMode":"CHECK_MEMERSHIP_ONLY", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Body weight",
-  "code" : "29463-7",
-  "system" : "http://loinc.org",
-  "version" : "2.74",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://loinc.org",
-  "code" : "29463-7",
-  "display" : "Body Weight"
-}, "url": "http://hl7.org/fhir/ValueSet/observation-vitalsignresult", "version": "5.0.0", "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"NO_MEMBERSHIP_CHECK", "displayWarningMode":"false", "versionFlexible":"false", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "Body weight",
-  "code" : "29463-7",
+  "display" : "Body weight Measured",
+  "code" : "3141-9",
   "system" : "http://loinc.org",
   "version" : "2.74",
+  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -902,7 +750,7 @@ v: {
 }}####
 v: {
   "severity" : "error",
-  "error" : "The provided code 'http://loinc.org#3141-9' is not in the value set 'http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0|5.0.0' (from Tx-Server)",
+  "error" : "The provided code 'http://loinc.org#3141-9' was not found in the value set 'http://hl7.org/fhir/ValueSet/observation-vitalsignresult--0|5.0.0' (from Tx-Server)",
   "class" : "UNKNOWN",
   "unknown-systems" : "",
   "issues" : {
@@ -1001,3 +849,116 @@ v: {
 
 }
 -------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "LA6724-4",
+  "display" : "Good color all over"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Good color all over",
+  "code" : "LA6724-4",
+  "system" : "http://loinc.org",
+  "version" : "2.74",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "LA6718-6",
+  "display" : "At least 100 beats per minute"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "At least 100 beats per minute",
+  "code" : "LA6718-6",
+  "system" : "http://loinc.org",
+  "version" : "2.74",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "LA6721-0",
+  "display" : "Grimace and pulling away, cough, or sneeze during suctioning"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "Grimace and pulling away, cough, or sneeze during suctioning",
+  "code" : "LA6721-0",
+  "system" : "http://loinc.org",
+  "version" : "2.74",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "LA6715-2",
+  "display" : "Active motion "
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "severity" : "error",
+  "error" : "Wrong whitespace in Display Name 'Active motion ' for http://loinc.org#LA6715-2 - should be 'Active motion' (for the language(s) '--') (from Tx-Server)",
+  "class" : "UNKNOWN",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://loinc.org",
+  "code" : "LA6727-7",
+  "display" : "Good, strong cry; normal rate and effort of breathing    "
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "severity" : "error",
+  "error" : "Wrong whitespace in Display Name 'Good, strong cry; normal rate and effort of breathing    ' for http://loinc.org#LA6727-7 - should be 'Good, strong cry; normal rate and effort of breathing' (for the language(s) '--') (from Tx-Server)",
+  "class" : "UNKNOWN",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ndc.cache

@@ -12,7 +12,7 @@
 }}####
 v: {
   "severity" : "error",
-  "error" : "Code \"2501-813-16\" not found in NDC; Unknown Code '2501-813-16' in the system 'http://hl7.org/fhir/sid/ndc'; The provided code 'http://hl7.org/fhir/sid/ndc#2501-813-16' is not in the value set 'http://hl7.org/fhir/ValueSet/@all' (from Tx-Server)",
+  "error" : "Code \"2501-813-16\" not found in NDC; The provided code 'http://hl7.org/fhir/sid/ndc#2501-813-16' was not found in the value set 'http://hl7.org/fhir/ValueSet/@all'; Unknown Code '2501-813-16' in the system 'http://hl7.org/fhir/sid/ndc' (from Tx-Server)",
   "class" : "UNKNOWN",
   "unknown-systems" : "",
   "issues" : {

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/rxnorm.cache

@@ -14,7 +14,7 @@ v: {
   "display" : "acetaminophen 325 MG / oxycodone hydrochloride 5 MG Oral Tablet [Percocet]",
   "code" : "1049640",
   "system" : "http://www.nlm.nih.gov/research/umls/rxnorm",
-  "version" : "??",
+  "version" : "??rx1",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.validation/5.0.0/ucum.cache

@@ -1,88 +1,4 @@
 -------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "[lb_av]"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "[lb_av]",
-  "code" : "[lb_av]",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "{score}"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "{score}",
-  "code" : "{score}",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "mL"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "mL",
-  "code" : "mL",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
-{"code" : {
-  "system" : "http://unitsofmeasure.org",
-  "code" : "d"
-}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
-  "resourceType" : "Parameters",
-  "parameter" : [{
-    "name" : "profile-url",
-    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
-  }]
-}}####
-v: {
-  "display" : "d",
-  "code" : "d",
-  "system" : "http://unitsofmeasure.org",
-  "version" : "2.0.1",
-  "issues" : {
-  "resourceType" : "OperationOutcome"
-}
-
-}
--------------------------------------------------------------------------------------
 {"code" : {
   "system" : "http://unitsofmeasure.org",
   "code" : "mm[Hg]"
@@ -98,7 +14,6 @@ v: {
   "code" : "mm[Hg]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -120,7 +35,6 @@ v: {
   "code" : "mm[Hg]",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -142,7 +56,6 @@ v: {
   "code" : "cm",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -164,7 +77,6 @@ v: {
   "code" : "mmol/L",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -186,7 +98,6 @@ v: {
   "code" : "mL",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
-  "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"
 }
@@ -208,6 +119,93 @@ v: {
   "code" : "Cel",
   "system" : "http://unitsofmeasure.org",
   "version" : "2.0.1",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "[lb_av]"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "[lb_av]",
+  "code" : "[lb_av]",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "{score}"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "{score}",
+  "code" : "{score}",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "mL"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "mL",
+  "code" : "mL",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
+  "unknown-systems" : "",
+  "issues" : {
+  "resourceType" : "OperationOutcome"
+}
+
+}
+-------------------------------------------------------------------------------------
+{"code" : {
+  "system" : "http://unitsofmeasure.org",
+  "code" : "d"
+}, "valueSet" :null, "langs":"", "useServer":"true", "useClient":"true", "guessSystem":"false", "valueSetMode":"ALL_CHECKS", "displayWarningMode":"false", "versionFlexible":"true", "profile": {
+  "resourceType" : "Parameters",
+  "parameter" : [{
+    "name" : "profile-url",
+    "valueString" : "http://hl7.org/fhir/ExpansionProfile/dc8fd4bc-091a-424a-8a3b-6198ef146891"
+  }]
+}}####
+v: {
+  "display" : "d",
+  "code" : "d",
+  "system" : "http://unitsofmeasure.org",
+  "version" : "2.0.1",
   "unknown-systems" : "",
   "issues" : {
   "resourceType" : "OperationOutcome"

pom.xml

@@ -20,7 +20,7 @@
     <properties>
         <guava_version>32.0.1-jre</guava_version>
         <hapi_fhir_version>6.4.1</hapi_fhir_version>
-        <validator_test_case_version>1.4.20</validator_test_case_version>
+        <validator_test_case_version>1.4.21-SNAPSHOT</validator_test_case_version>
         <jackson_version>2.16.0</jackson_version>
         <junit_jupiter_version>5.9.2</junit_jupiter_version>
         <junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>