honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-01 17:09:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release new version 5.0.6

Browse Source
This commit is contained in:
Grahame Grieve 2020-06-01 17:40:06 +10:00
parent 4df8b557c8
commit a0245ca926
14 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.convertors/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
org.hl7.fhir.dstu2/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
org.hl7.fhir.dstu2016may/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
org.hl7.fhir.dstu3/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
org.hl7.fhir.r4/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
org.hl7.fhir.r5/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

17
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
View File

@ -553,6 +553,15 @@ public class XmlParser extends ParserBase {
return false; 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 { public void compose(Element e, IXMLWriter xml) throws Exception {
xml.start(); xml.start();
@ -596,9 +605,7 @@ public class XmlParser extends ParserBase {
xml.link(linkResolver.resolveProperty(element.getProperty())); xml.link(linkResolver.resolveProperty(element.getProperty()));
xml.text(element.getValue()); xml.text(element.getValue());
} else { } else {
if (isTypeAttr(element.getProperty()) && !Utilities.noString(element.getType())) { setXsiTypeIfIsTypeAttr(xml, element);
xml.attribute("xsi:type", element.getType());
}
if (element.hasValue()) { if (element.hasValue()) {
if (linkResolver != null) if (linkResolver != null)
xml.link(linkResolver.resolveType(element.getType())); xml.link(linkResolver.resolveType(element.getType()));
@ -615,9 +622,7 @@ public class XmlParser extends ParserBase {
xml.element(elementName); xml.element(elementName);
} }
} else { } else {
if (isTypeAttr(element.getProperty()) && !Utilities.noString(element.getType())) { setXsiTypeIfIsTypeAttr(xml, element);
xml.attribute("xsi:type", element.getType());
}
for (Element child : element.getChildren()) { for (Element child : element.getChildren()) {
if (isAttr(child.getProperty())) { if (isAttr(child.getProperty())) {
if (linkResolver != null) if (linkResolver != null)

2
org.hl7.fhir.report/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
org.hl7.fhir.utilities/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
org.hl7.fhir.validation.cli/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
org.hl7.fhir.validation/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>

2
pom.xml
View File

@ -13,7 +13,7 @@
each other. It is fine to bump the point version of this POM without affecting each other. It is fine to bump the point version of this POM without affecting
HAPI FHIR. HAPI FHIR.
--> -->
<version>5.0.5-SNAPSHOT</version> <version>5.0.6-SNAPSHOT</version>
<properties> <properties>
<hapi_fhir_version>5.0.0</hapi_fhir_version> <hapi_fhir_version>5.0.0</hapi_fhir_version>

7
release-notes-validator.md
View File

@ -6,6 +6,11 @@ title: FHIR Validator Release Notes
## Current (not released yet) ## Current (not released yet)
(no changes yet)
## v5.0.6 (2020-06-01)
(no changes yet) (no changes yet)
## v5.0.5 (2020-05-30) ## v5.0.5 (2020-05-30)
@ -215,4 +220,4 @@ title: FHIR Validator Release Notes
## v4.1.60 (2020-02-02) ## v4.1.60 (2020-02-02)
* Th * T

4
release.bat
View File

@ -1,7 +1,7 @@
@echo off @echo off
set oldver=5.0.4 set oldver=5.0.5
set newver=5.0.5 set newver=5.0.6
echo .. echo ..
echo ========================================================================= echo =========================================================================