resolve conflicts

This commit is contained in:
Grahame Grieve 2021-05-14 06:12:25 +10:00
commit 24152a2f92
12 changed files with 12 additions and 31 deletions

View File

@ -1,19 +0,0 @@
Validator
* Snapshot generator: fix problem checking types on logical models
* Do not flag internal references as suspicious
* Load code systems from known packages on the fly
* better handle invalid v3 dates
* Remove notes about extensible bindings if profile extensible binding is valid
* fix overrun error reading invalid xhtml
Other Code Changes
* Important: Allow more valid schemas for Utilities.isAbsoluteUrl
* Update core R5 code to v4.6.0 (breaking changes to questionnaire, concept map, and other resources that are less important to core)
* Fix compartment definitions of ListResource.source and subject for R3 and R4
* XMLParser allows passing a schema location
* fix for IntegerType.copy() throws a NullPointerException when called for an object with a null value
* Adding Kotlin to the build process
* random cleaning up in convertors
* Adding version option to ignore bundle entry in conversion advisors
* Renderer: Render OperationDefinition.InputProfile and OutputProfile
* fix loading problem on validation test

View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-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>5.3.12-SNAPSHOT</version>
<version>5.3.13-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@ -14,12 +14,12 @@
HAPI FHIR
-->
<artifactId>org.hl7.fhir.core</artifactId>
<version>5.3.12-SNAPSHOT</version>
<version>5.3.13-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<hapi_fhir_version>5.1.0</hapi_fhir_version>
<validator_test_case_version>1.1.63-SNAPSHOT</validator_test_case_version>
<validator_test_case_version>1.1.63</validator_test_case_version>
<junit_jupiter_version>5.7.1</junit_jupiter_version>
<junit_platform_launcher_version>1.7.1</junit_platform_launcher_version>
<maven_surefire_version>3.0.0-M4</maven_surefire_version>