From df0ecc83b5b6e5d2fe4f1c45f1764dc1eaf9d86b Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Thu, 21 Oct 2021 09:52:43 -0400 Subject: [PATCH 1/5] Update RELEASE_NOTES.md --- RELEASE_NOTES.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e69de29bb..6f3b72ffb 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -0,0 +1,11 @@ +* add -output-style parameter +* handle naming system URLs when resolving URLs +* fix profile comparison +* fix tests dependency +* ping build +* more validation for canonical URLs +* fix terminology version management and caching + better error message… … +* Merge pull request #620 from EricLemieux/fix-618 … +* fix json issue, and add tests for it +* Fix Issue 618 | NPE bundle validation … +* Removing pinentry option for gpg as it breaks in ubuntu 20.04 From 0311e1dd8bea598781ca0b8dfa17093c820124eb Mon Sep 17 00:00:00 2001 From: Mark Iantorno Date: Thu, 21 Oct 2021 14:24:24 +0000 Subject: [PATCH 2/5] Updating test case dependency to v1.1.70 ***NO_CI*** --- .../c:\\temp\\payload.json" | 86 +++++++++++++++++++ pom.xml | 2 +- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 "org.hl7.fhir.validation/c:\\temp\\payload.json" diff --git "a/org.hl7.fhir.validation/c:\\temp\\payload.json" "b/org.hl7.fhir.validation/c:\\temp\\payload.json" new file mode 100644 index 000000000..2d9c7d08a --- /dev/null +++ "b/org.hl7.fhir.validation/c:\\temp\\payload.json" @@ -0,0 +1,86 @@ +{ + "iss": "http://local.fhir.org:960/r4/", + "nbf": 1631652279, + "vc": { + "type": [ + "https://smarthealth.cards#health-card", + "https://smarthealth.cards#covid19", + "https://smarthealth.cards#laboratory" + ], + "credentialSubject": { + "fhirVersion": "4.0.1", + "fhirBundle": { + "resourceType": "Bundle", + "type": "collection", + "entry": [ + { + "resource": { + "resourceType": "Patient", + "name": [ + { + "family": "Crout", + "given": [ + "Sidney Stanley" + ] + } + ], + "birthDate": "1956-09-30" + } + }, + { + "resource": { + "resourceType": "Immunization", + "status": "completed", + "vaccineCode": { + "coding": [ + { + "system": "http://hl7.org/fhir/sid/cvx", + "code": "208" + } + ] + }, + "patient": { + "reference": "resource:0" + }, + "occurrenceDateTime": "2021-08-05", + "lotNumber": "FF8871-001", + "performer": [ + { + "actor": { + "display": "NorthCare Pukete Road-Thomas Road" + } + } + ] + } + }, + { + "resource": { + "resourceType": "Immunization", + "status": "completed", + "vaccineCode": { + "coding": [ + { + "system": "http://hl7.org/fhir/sid/cvx", + "code": "208" + } + ] + }, + "patient": { + "reference": "resource:0" + }, + "occurrenceDateTime": "2021-08-27", + "lotNumber": "FE8163-007", + "performer": [ + { + "actor": { + "display": "NorthCare Pukete Road-Thomas Road" + } + } + ] + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 340d9d98f..66ff9a42f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 5.1.0 - 1.1.70-SNAPSHOT + 1.1.70 5.7.1 1.7.1 3.0.0-M4 From 83d73c4aed043d545edf63605b80f7d213df1d6f Mon Sep 17 00:00:00 2001 From: markiantorno Date: Thu, 21 Oct 2021 10:30:32 -0400 Subject: [PATCH 3/5] removing temp file --- .../c:\\temp\\payload.json" | 86 ------------------- 1 file changed, 86 deletions(-) delete mode 100644 "org.hl7.fhir.validation/c:\\temp\\payload.json" diff --git "a/org.hl7.fhir.validation/c:\\temp\\payload.json" "b/org.hl7.fhir.validation/c:\\temp\\payload.json" deleted file mode 100644 index 2d9c7d08a..000000000 --- "a/org.hl7.fhir.validation/c:\\temp\\payload.json" +++ /dev/null @@ -1,86 +0,0 @@ -{ - "iss": "http://local.fhir.org:960/r4/", - "nbf": 1631652279, - "vc": { - "type": [ - "https://smarthealth.cards#health-card", - "https://smarthealth.cards#covid19", - "https://smarthealth.cards#laboratory" - ], - "credentialSubject": { - "fhirVersion": "4.0.1", - "fhirBundle": { - "resourceType": "Bundle", - "type": "collection", - "entry": [ - { - "resource": { - "resourceType": "Patient", - "name": [ - { - "family": "Crout", - "given": [ - "Sidney Stanley" - ] - } - ], - "birthDate": "1956-09-30" - } - }, - { - "resource": { - "resourceType": "Immunization", - "status": "completed", - "vaccineCode": { - "coding": [ - { - "system": "http://hl7.org/fhir/sid/cvx", - "code": "208" - } - ] - }, - "patient": { - "reference": "resource:0" - }, - "occurrenceDateTime": "2021-08-05", - "lotNumber": "FF8871-001", - "performer": [ - { - "actor": { - "display": "NorthCare Pukete Road-Thomas Road" - } - } - ] - } - }, - { - "resource": { - "resourceType": "Immunization", - "status": "completed", - "vaccineCode": { - "coding": [ - { - "system": "http://hl7.org/fhir/sid/cvx", - "code": "208" - } - ] - }, - "patient": { - "reference": "resource:0" - }, - "occurrenceDateTime": "2021-08-27", - "lotNumber": "FE8163-007", - "performer": [ - { - "actor": { - "display": "NorthCare Pukete Road-Thomas Road" - } - } - ] - } - } - ] - } - } - } -} \ No newline at end of file From 7254337c5bb898c54eab8d320ecd86018e1b7549 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 22 Oct 2021 00:52:33 +0000 Subject: [PATCH 4/5] =?UTF-8?q?Release:=20v5.5.8=20*=20add=20-output-style?= =?UTF-8?q?=20parameter=20*=20handle=20naming=20system=20URLs=20when=20res?= =?UTF-8?q?olving=20URLs=20*=20fix=20profile=20comparison=20*=20fix=20test?= =?UTF-8?q?s=20dependency=20*=20ping=20build=20*=20more=20validation=20for?= =?UTF-8?q?=20canonical=20URLs=20*=20fix=20terminology=20version=20managem?= =?UTF-8?q?ent=20and=20caching=20+=20better=20error=20message=E2=80=A6=20?= =?UTF-8?q?=E2=80=A6=20*=20Merge=20pull=20request=20#620=20from=20EricLemi?= =?UTF-8?q?eux/fix-618=20=E2=80=A6=20*=20fix=20json=20issue,=20and=20add?= =?UTF-8?q?=20tests=20for=20it=20*=20Fix=20Issue=20618=20|=20NPE=20bundle?= =?UTF-8?q?=20validation=20=E2=80=A6=20*=20Removing=20pinentry=20option=20?= =?UTF-8?q?for=20gpg=20as=20it=20breaks=20in=20ubuntu=2020.04=20***NO=5FCI?= =?UTF-8?q?***?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 1d1f56e50..c1c1d0e16 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index a16ce6dda..e362b72d5 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 0845a9fbe..dad51bc46 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index d79d5533d..5e13a37d4 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 5d30dfd5c..9333b60f6 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 40a7155ea..6ca8fa8af 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 3b416af6f..4c49decbe 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index c50e366cd..a72f3e24b 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 274530ca2..316f8fde1 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 8150e3fc4..62477ef72 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 ../pom.xml diff --git a/pom.xml b/pom.xml index 66ff9a42f..a30723c20 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.5.8-SNAPSHOT + 5.5.8 pom From 6f32a85d6610d1b401377d28e561a7830281d691 Mon Sep 17 00:00:00 2001 From: markiantorno Date: Fri, 22 Oct 2021 01:16:56 +0000 Subject: [PATCH 5/5] Updating version to: 5.5.9-SNAPSHOT and incrementing test cases dependency. --- RELEASE_NOTES.md | 11 ----------- org.hl7.fhir.convertors/pom.xml | 2 +- org.hl7.fhir.dstu2/pom.xml | 2 +- org.hl7.fhir.dstu2016may/pom.xml | 2 +- org.hl7.fhir.dstu3/pom.xml | 2 +- org.hl7.fhir.r4/pom.xml | 2 +- org.hl7.fhir.r5/pom.xml | 2 +- org.hl7.fhir.report/pom.xml | 2 +- org.hl7.fhir.utilities/pom.xml | 2 +- org.hl7.fhir.validation.cli/pom.xml | 2 +- org.hl7.fhir.validation/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 11 insertions(+), 22 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6f3b72ffb..e69de29bb 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,11 +0,0 @@ -* add -output-style parameter -* handle naming system URLs when resolving URLs -* fix profile comparison -* fix tests dependency -* ping build -* more validation for canonical URLs -* fix terminology version management and caching + better error message… … -* Merge pull request #620 from EricLemieux/fix-618 … -* fix json issue, and add tests for it -* Fix Issue 618 | NPE bundle validation … -* Removing pinentry option for gpg as it breaks in ubuntu 20.04 diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index c1c1d0e16..d25d6d172 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index e362b72d5..e1c054c56 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index dad51bc46..3818069ba 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index 5e13a37d4..a34541771 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index 9333b60f6..02883eade 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 6ca8fa8af..b4414be65 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 4c49decbe..46861a00f 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index a72f3e24b..9a75b9972 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 316f8fde1..16186d207 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 62477ef72..951981aa6 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index a30723c20..5c832cf97 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.5.8 + 5.5.9-SNAPSHOT pom