diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 709d30cb3..4e25e8866 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index a1f0bd629..ca5c080f4 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index cd9004bc7..6fc801c00 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index b750ea8c9..cdec8e7ac 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 3cd4f7870..d0500fb3c 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 93272d655..18a98caea 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 0c80a7a86..75e868e4c 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java index 0082d4578..ee08c40aa 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/AdditionalBindingsRenderer.java @@ -259,7 +259,8 @@ public class AdditionalBindingsRenderer { if (binding.compare!=null && binding.valueSet.equals(binding.compare.valueSet)) valueset.style(STYLE_UNCHANGED); if (br.url != null) { - XhtmlNode a = valueset.ah(determineUrl(br.url), br.uri).tx(br.display); + XhtmlNode a = valueset.ah(determineUrl(br.url), br.uri); + a.tx(br.display); if (br.external) { a.tx(" "); a.img("external.png", null); diff --git a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/version.ctl b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/version.ctl index e440e5c84..bf0d87ab1 100644 --- a/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/version.ctl +++ b/org.hl7.fhir.r5/src/test/resources/txCache/org.hl7.fhir.r5/version.ctl @@ -1 +1 @@ -3 \ No newline at end of file +4 \ No newline at end of file diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index ecb53a8fc..626fcdb1b 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index cf41d0b15..066a41e45 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 2b5c71af0..616f8e45b 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 049ac38c4..babf330e5 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json index d01076756..524134a31 100644 --- a/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json +++ b/org.hl7.fhir.validation/src/test/resources/txCache/org.hl7.fhir.r5/vs-externals.json @@ -2,5 +2,7 @@ "http://somewhere/something-else" : null, "http://loinc.org/vs/LL715-4" : null, "http://hl7.org/fhir/us/vrdr/ValueSet/vrdr-PlaceOfDeath" : null, - "http://somewhere/something" : null + "http://somewhere/something" : null, + "https://fhir.infoway-inforoute.ca/ValueSet/issuetype|20190415" : null, + "https://fhir.infoway-inforoute.ca/ValueSet/issueseverity|20190415" : null } diff --git a/pom.xml b/pom.xml index 0dd17f120..22c45d355 100644 --- a/pom.xml +++ b/pom.xml @@ -14,13 +14,13 @@ HAPI FHIR --> org.hl7.fhir.core - 6.2.14-SNAPSHOT + 6.2.15-SNAPSHOT pom 32.0.1-jre 6.4.1 - 1.4.26 + 1.4.27 2.16.0 5.9.2 1.8.2