From a0245ca926be9789fbba18e45b87f1ccb529d897 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Mon, 1 Jun 2020 17:40:06 +1000 Subject: [PATCH] Release new version 5.0.6 --- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- .../hl7/fhir/r5/elementmodel/XmlParser.java | 19 ++++++++++++------- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- release-notes-validator.md | 7 ++++++- release.bat | 4 ++-- 14 files changed, 31 insertions(+), 21 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index b1c0dac11..790cd8ef4 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index a4f958c7d..cb8ce861e 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 936174687..4b35e3db5 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 8781b414e..c1024f976 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index d0b7f8f41..29fb76072 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index a3028ecff..51db1595c 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java index cd746adc3..d795fb2a1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java @@ -553,7 +553,16 @@ public class XmlParser extends ParserBase { return false; } - + private void setXsiTypeIfIsTypeAttr(IXMLWriter xml, Element element) throws IOException, FHIRException { + if (isTypeAttr(element.getProperty()) && !Utilities.noString(element.getType())) { + String type = element.getType(); + if (Utilities.isAbsoluteUrl(type)) { + type = type.substring(type.lastIndexOf("/")+1); + } + xml.attribute("xsi:type",type); + } + } + public void compose(Element e, IXMLWriter xml) throws Exception { xml.start(); xml.setDefaultNamespace(e.getProperty().getXmlNamespace()); @@ -596,9 +605,7 @@ public class XmlParser extends ParserBase { xml.link(linkResolver.resolveProperty(element.getProperty())); xml.text(element.getValue()); } else { - if (isTypeAttr(element.getProperty()) && !Utilities.noString(element.getType())) { - xml.attribute("xsi:type", element.getType()); - } + setXsiTypeIfIsTypeAttr(xml, element); if (element.hasValue()) { if (linkResolver != null) xml.link(linkResolver.resolveType(element.getType())); @@ -615,9 +622,7 @@ public class XmlParser extends ParserBase { xml.element(elementName); } } else { - if (isTypeAttr(element.getProperty()) && !Utilities.noString(element.getType())) { - xml.attribute("xsi:type", element.getType()); - } + setXsiTypeIfIsTypeAttr(xml, element); for (Element child : element.getChildren()) { if (isAttr(child.getProperty())) { if (linkResolver != null) diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 78d69358b..7b4849c3a 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 4bc8ef862..7e7935800 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 05f96c9ba..452f855a1 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 3db0b264d..1fd0d94b9 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 - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 4e0890588..1702d654f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ each other. It is fine to bump the point version of this POM without affecting HAPI FHIR. --> - 5.0.5-SNAPSHOT + 5.0.6-SNAPSHOT 5.0.0 diff --git a/release-notes-validator.md b/release-notes-validator.md index fb4a350be..54b330e44 100644 --- a/release-notes-validator.md +++ b/release-notes-validator.md @@ -6,6 +6,11 @@ title: FHIR Validator Release Notes ## Current (not released yet) +(no changes yet) + +## v5.0.6 (2020-06-01) + + (no changes yet) ## v5.0.5 (2020-05-30) @@ -215,4 +220,4 @@ title: FHIR Validator Release Notes ## v4.1.60 (2020-02-02) -* Th \ No newline at end of file +* T \ No newline at end of file diff --git a/release.bat b/release.bat index 738286127..4adbd26eb 100644 --- a/release.bat +++ b/release.bat @@ -1,7 +1,7 @@ @echo off -set oldver=5.0.4 -set newver=5.0.5 +set oldver=5.0.5 +set newver=5.0.6 echo .. echo =========================================================================