honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jamesagnew/hapi-fhir

This commit is contained in:
James 2017-10-19 07:40:59 -04:00
parent b79dd75fce 5f5475fb17
commit 2721755f58
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-structures-dstu2/pom.xml
View File

@ -318,8 +318,8 @@
<!--
Removed in HAPI 2.4 as this isn't a real resource
<baseResourceName>supportingdocumentation</baseResourceName>
<baseResourceName>test</baseResourceName>
-->
<baseResourceName>test</baseResourceName>
<baseResourceName>testscript</baseResourceName>
<baseResourceName>user</baseResourceName>
<baseResourceName>valueset</baseResourceName>

1
hapi-tinder-plugin/src/main/resources/ca/uhn/fhir/model/dstu2/fhirversion.properties
View File

@ -91,7 +91,6 @@ resource.Subscription=ca.uhn.fhir.model.dstu2.resource.Subscription
resource.Substance=ca.uhn.fhir.model.dstu2.resource.Substance
resource.SupplyDelivery=ca.uhn.fhir.model.dstu2.resource.SupplyDelivery
resource.SupplyRequest=ca.uhn.fhir.model.dstu2.resource.SupplyRequest
resource.Test=ca.uhn.fhir.model.dstu2.resource.Test
resource.TestScript=ca.uhn.fhir.model.dstu2.resource.TestScript
resource.User=ca.uhn.fhir.model.dstu2.resource.User
resource.ValueSet=ca.uhn.fhir.model.dstu2.resource.ValueSet

5
src/changes/changes.xml
View File

@ -130,6 +130,11 @@
resolved when validating QuestionnaireResponse answers with a type
of "choice" where the choice was bound to a ValueSet.
</action>
<action type="fix">
Remove the fake "Test" resource from DSTU2 structures. This was not
a real resource type, and caused conflicts with the .NET client. Thanks to
Vlad Ignatov for reporting!
</action>
</release>
<release version="3.0.0" date="2017-09-27">
<action type="add">