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

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

This commit is contained in:
Grahame Grieve 2019-07-30 10:30:00 +10:00
parent a0c245dfdc 5120f63ab0
commit 61e2fa1d39
13 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.convertors/pom.xml
View File

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

2
org.hl7.fhir.dstu2/pom.xml
View File

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

2
org.hl7.fhir.dstu2016may/pom.xml
View File

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

2
org.hl7.fhir.dstu3/pom.xml
View File

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

2
org.hl7.fhir.r4/pom.xml
View File

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

2
org.hl7.fhir.r5/pom.xml
View File

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

104
org.hl7.fhir.r5/src/test/resources/openapi/swagger-base.json
View File

@ -29,12 +29,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -44,12 +44,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/CapabilityStatement"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/CapabilityStatement"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/CapabilityStatement.xsd"
"$ref": "https://hl7.org/fhir/R4/CapabilityStatement.xsd"
}
}
}
@ -83,12 +83,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -98,12 +98,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
"$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
}
}
}
@ -198,12 +198,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Account.xsd"
"$ref": "https://hl7.org/fhir/R4/Account.xsd"
}
}
}
@ -214,12 +214,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -237,12 +237,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Account.xsd"
"$ref": "https://hl7.org/fhir/R4/Account.xsd"
}
}
}
@ -276,12 +276,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -299,12 +299,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Account.xsd"
"$ref": "https://hl7.org/fhir/R4/Account.xsd"
}
}
}
@ -337,12 +337,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Account.xsd"
"$ref": "https://hl7.org/fhir/R4/Account.xsd"
}
}
}
@ -353,12 +353,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -376,12 +376,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Account.xsd"
"$ref": "https://hl7.org/fhir/R4/Account.xsd"
}
}
}
@ -414,12 +414,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -455,12 +455,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -470,12 +470,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
"$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
}
}
}
@ -541,12 +541,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -564,12 +564,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Account"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Account"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Account.xsd"
"$ref": "https://hl7.org/fhir/R4/Account.xsd"
}
}
}
@ -609,12 +609,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -624,12 +624,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
"$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
}
}
}
@ -692,12 +692,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -707,12 +707,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
"$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
}
}
}
@ -775,12 +775,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -790,12 +790,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
"$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
}
}
}
@ -976,12 +976,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
"$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
}
}
}
@ -992,12 +992,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -1007,12 +1007,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/Bundle"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/Bundle"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/Bundle.xsd"
"$ref": "https://hl7.org/fhir/R4/Bundle.xsd"
}
}
}

8
org.hl7.fhir.r5/src/test/resources/openapi/swagger-base2.json
View File

@ -29,12 +29,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/OperationOutcome"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/OperationOutcome"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/OperationOutcome.xsd"
"$ref": "https://hl7.org/fhir/R4/OperationOutcome.xsd"
}
}
}
@ -44,12 +44,12 @@
"content": {
"application/fhir+json": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/fhir.schema.json#/definitions/CapabilityStatement"
"$ref": "https://hl7.org/fhir/R4/fhir.schema.json#/definitions/CapabilityStatement"
}
},
"application/fhir+xml": {
"schema": {
"$ref": "https://hl7.org/fhir/STU3/CapabilityStatement.xsd"
"$ref": "https://hl7.org/fhir/R4/CapabilityStatement.xsd"
}
}
}

2
org.hl7.fhir.utilities/pom.xml
View File

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

2
org.hl7.fhir.validation.cli/pom.xml
View File

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

2
org.hl7.fhir.validation/pom.xml
View File

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

2
pom.xml
View File

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

4
release.bat
View File

@ -1,7 +1,7 @@
@echo off
set oldver=3.8.11
set newver=3.8.12
set oldver=3.8.12
set newver=3.8.13
echo ..
echo =====================================================================