diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index dc1e913b5..223855aa3 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 6c8e46783..c5a6d371b 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 47614e805..04df5e7a0 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index f85330c9c..436fc221a 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index fd28cc5c7..163a479ab 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index cdb31f06b..1505ae682 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java index 59341fffd..ec5efe2b3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java @@ -2434,6 +2434,7 @@ public class NarrativeGenerator implements INarrativeGenerator { td.tx(" ("+display+")"); if (comment) tr.td().addText(ccm.getComment()); + addUnmapped(tbl, grp); } } else { XhtmlNode tbl = x.table( "grid"); @@ -2544,6 +2545,7 @@ public class NarrativeGenerator implements INarrativeGenerator { if (comment) tr.td().addText(ccm.getComment()); } + addUnmapped(tbl, grp); } } } @@ -2552,6 +2554,13 @@ public class NarrativeGenerator implements INarrativeGenerator { return true; } + private void addUnmapped(XhtmlNode tbl, ConceptMapGroupComponent grp) { + if (grp.hasUnmapped()) { +// throw new Error("not done yet"); + } + + } + private String presentRelationshipCode(String code) { if ("related-to".equals(code)) { return "is related to"; diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 21e6924e3..f74e39378 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 26b2d0922..00407db0c 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index da1dbaf71..bb1bb36cd 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 - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index bff66d7c6..645ffc474 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. --> - 4.2.10-SNAPSHOT + 4.2.12-SNAPSHOT 4.2.0 diff --git a/release.bat b/release.bat index cf79617cb..ece65a7c3 100644 --- a/release.bat +++ b/release.bat @@ -1,7 +1,7 @@ @echo off -set oldver=4.2.9 -set newver=4.2.10 +set oldver=4.2.11 +set newver=4.2.12 echo .. echo =========================================================================