From 995a1aeec8c6bc94c844abc9528d28edd79a1ede Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 19 Sep 2019 10:05:57 -0400 Subject: [PATCH 1/2] merged duplicated compiler plugin entry --- pom.xml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 496e4f264..ba2d2c51c 100644 --- a/pom.xml +++ b/pom.xml @@ -140,7 +140,9 @@ 1.8 false UTF-8 - false + true + 512m + 4000m true @@ -262,16 +264,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - true - 512m - 4000m - - From e9f3a143ed75e4078264a3c1b3fdca78b0149c18 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 20 Sep 2019 04:42:19 +1000 Subject: [PATCH 2/2] Release new version --- 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 +- .../org/hl7/fhir/r5/conformance/ProfileUtilities.java | 11 ++++++++--- 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.bat | 4 ++-- 12 files changed, 20 insertions(+), 15 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 8ad3f6880..a7bb58e0b 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index 6ef681aab..4f606a0ad 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 0a6a57188..3a5a498e1 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 1d718f60e..17f5c18d0 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 036ea4444..984a50b9b 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 70b2dcbdd..1e49b8b2e 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java index cf25809ae..0c9c5f277 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java @@ -477,7 +477,7 @@ public class ProfileUtilities extends TranslatingUtilities { ((Base) e.getUserData("diff-source")).setUserData(DERIVATION_POINTER, e.getUserData(DERIVATION_POINTER)); } if (!e.hasUserData(GENERATED_IN_SNAPSHOT)) { - System.out.println("Error in snapshot generation: Differential for "+derived.getUrl()+" with " + (e.hasId() ? "id: "+e.getId() : "path: "+e.getPath())+" has an element that is not marked with a snapshot match"); + System.out.println("Error in snapshot generation: Differential for "+derived.getUrl()+" has an element " + (e.hasId() ? "id: "+e.getId() : "path: "+e.getPath())+" that is not marked with a snapshot match - check validity of differential (including order)"); if (exception) throw new DefinitionException("Snapshot for "+derived.getUrl()+" does not contain an element that matches an existing differential element that has "+(e.hasId() ? "id: "+e.getId() : "path: "+e.getPath())); else @@ -658,7 +658,7 @@ public class ProfileUtilities extends TranslatingUtilities { if (!sd.hasSnapshot()) { StructureDefinition sdb = context.fetchResource(StructureDefinition.class, sd.getBaseDefinition()); if (sdb == null) - throw new DefinitionException("no base for "+sd.getBaseDefinition()); + throw new DefinitionException("Unable to find base "+sd.getBaseDefinition()+" for "+sd.getUrl()); generateSnapshot(sdb, sd, sd.getUrl(), (sdb.hasUserData("path")) ? Utilities.extractBaseUrl(sdb.getUserString("path")) : webUrl, sd.getName()); } ElementDefinition src; @@ -4101,7 +4101,7 @@ public class ProfileUtilities extends TranslatingUtilities { b.append("."); String s = paths.get(i); String p = slices[i]; - b.append(s); + b.append(fixChars(s)); if (p != null) { b.append(":"); b.append(p); @@ -4129,6 +4129,11 @@ public class ProfileUtilities extends TranslatingUtilities { } + private Object fixChars(String s) { + return s.replace("_", "-"); + } + + // private String describeExtension(ElementDefinition ed) { // if (!ed.hasType() || !ed.getTypeFirstRep().hasProfile()) // return ""; diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 422c64777..43d9715cf 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 112f560d4..1d9baf764 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 0436bab18..77fc1efd6 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index ba2d2c51c..1a7f444c1 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.0.19-SNAPSHOT + 4.0.20-SNAPSHOT 4.0.0 diff --git a/release.bat b/release.bat index 12de3d7ca..77ea1d2e7 100644 --- a/release.bat +++ b/release.bat @@ -1,7 +1,7 @@ @echo off -set oldver=4.0.18 -set newver=4.0.19 +set oldver=4.0.19 +set newver=4.0.20 echo .. echo =====================================================================