Release new version

This commit is contained in:
Grahame Grieve 2019-08-16 07:23:55 +10:00
parent 55259ab8dc
commit fe9c99f906
12 changed files with 16 additions and 13 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3913,6 +3913,9 @@ public class FHIRPathEngine {
throw new PathEngineException("No type provided in BuildToolPathEvaluator.getChildTypesByName");
if (type.equals("http://hl7.org/fhir/StructureDefinition/xhtml"))
return;
if (type.startsWith("http://hl7.org/fhir/StructureDefinition/System."))
return;
if (type.equals(TypeDetails.FP_SimpleTypeInfo)) {
getSimpleTypeChildTypesByName(name, result);
} else if (type.equals(TypeDetails.FP_ClassInfo)) {
@ -4004,7 +4007,7 @@ public class FHIRPathEngine {
else
for (TypeRefComponent t : ed.getDefinition().getType()) {
if (Utilities.noString(t.getCode())) {
if (Utilities.existsInList(ed.getDefinition().getId(), "Element.id", "Extension.url"))
if (Utilities.existsInList(ed.getDefinition().getId(), "Element.id", "Extension.url") || Utilities.existsInList(ed.getDefinition().getBase().getPath(), "Resource.id", "Element.id", "Extension.url"))
result.addType(TypeDetails.FP_NS, "string");
break; // throw new PathEngineException("Illegal reference to primitive value attribute @ "+path);
}

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
@echo off
set oldver=3.8.23
set newver=3.8.24
set oldver=3.8.24
set newver=3.8.25
echo ..
echo =====================================================================