Merge branch 'master' of github.com:hapifhir/org.hl7.fhir.core

org.hl7.fhir.convertors/pom.xml

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

org.hl7.fhir.dstu2/pom.xml

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

org.hl7.fhir.dstu2016may/pom.xml

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

org.hl7.fhir.dstu3/pom.xml

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

org.hl7.fhir.r4/pom.xml

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

org.hl7.fhir.r5/pom.xml

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

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 "";

org.hl7.fhir.utilities/pom.xml

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

org.hl7.fhir.validation.cli/pom.xml

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

org.hl7.fhir.validation/pom.xml

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

pom.xml

@@ -13,7 +13,7 @@
 	each other. It is fine to bump the point version of this POM without affecting
 	HAPI FHIR.
 	-->
-	<version>4.0.19-SNAPSHOT</version>
+	<version>4.0.20-SNAPSHOT</version>
 
 	<properties>
 		<hapi_fhir_version>4.0.0</hapi_fhir_version>
@@ -140,7 +140,9 @@
 					<target>1.8</target>
 					<forceJavacCompilerUse>false</forceJavacCompilerUse>
 					<encoding>UTF-8</encoding>
-					<fork>false</fork>
+					<fork>true</fork>
+					<meminitial>512m</meminitial>
+					<maxmem>4000m</maxmem>
 					<debug>true</debug>
 				</configuration>
 				<dependencies>
@@ -262,16 +264,6 @@
 					</instructions>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
-				<configuration>
-					<fork>true</fork>
-					<meminitial>512m</meminitial>
-					<maxmem>4000m</maxmem>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>

release.bat

@@ -1,7 +1,7 @@
 @echo off
 
-set oldver=4.0.18
+set oldver=4.0.19
-set newver=4.0.19
+set newver=4.0.20
 
 echo ..
 echo =====================================================================