From 0246e7dd0eafcb3c6c6dbcac9bd167c3894d3652 Mon Sep 17 00:00:00 2001 From: Kevin Dougan SmileCDR <72025369+KevinDougan-SmileCDR@users.noreply.github.com> Date: Mon, 26 Apr 2021 14:13:42 -0400 Subject: [PATCH] =?UTF-8?q?2572=20-=20Add=20master=20Branch=20changes=20re?= =?UTF-8?q?lated=20to=20backport=20of=20fix=20for=20#2171=E2=80=A6=20(#257?= =?UTF-8?q?4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 2572 - Add master Branch changes related to backport of fix for #2171 for new 5.3.3 release. * 2572 - Added some missing changelog folders for the v5.3.1 and v5.3.2 releases. * 2572 - Added a missing backport changelog entry for the v5.3.1 release. * 2572 - Added a missing VersionEnum entry for the V5_3_1 release. --- hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java | 2 ++ .../resources/ca/uhn/hapi/fhir/changelog/5_3_1/version.yaml | 3 +++ .../resources/ca/uhn/hapi/fhir/changelog/5_3_2/version.yaml | 3 +++ .../resources/ca/uhn/hapi/fhir/changelog/5_3_3/version.yaml | 3 +++ .../5_4_0/2407-allow-partition-date-for-nonpartitionable.yaml | 1 + .../fhir/changelog/5_4_0/2417-avoid-npe-indexing-timing.yaml | 1 + 6 files changed, 13 insertions(+) create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_1/version.yaml create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_2/version.yaml create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_3/version.yaml diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java index 773cc30bd26..903808720d9 100644 --- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java +++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/VersionEnum.java @@ -68,7 +68,9 @@ public enum VersionEnum { V5_2_0, V5_2_1, V5_3_0, + V5_3_1, V5_3_2, + V5_3_3, V5_4_0, ; diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_1/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_1/version.yaml new file mode 100644 index 00000000000..63b20bb11c0 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_1/version.yaml @@ -0,0 +1,3 @@ +--- +release-date: "2021-03-11" +codename: "Odyssey" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_2/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_2/version.yaml new file mode 100644 index 00000000000..2e81becc0e4 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_2/version.yaml @@ -0,0 +1,3 @@ +--- +release-date: "2021-04-14" +codename: "Odyssey" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_3/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_3/version.yaml new file mode 100644 index 00000000000..51a63b4dd11 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_3_3/version.yaml @@ -0,0 +1,3 @@ +--- +release-date: "2021-04-26" +codename: "Odyssey" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_4_0/2407-allow-partition-date-for-nonpartitionable.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_4_0/2407-allow-partition-date-for-nonpartitionable.yaml index b8942a6f558..61e73a7fc9f 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_4_0/2407-allow-partition-date-for-nonpartitionable.yaml +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_4_0/2407-allow-partition-date-for-nonpartitionable.yaml @@ -4,3 +4,4 @@ issue: 2407 title: "When using the JPA server in partitioned mode with a partition interceptor, the interceptor is now called even for resource types that can not be placed in a non-default partition (e.g. SearchParameter, CodeSystem, etc.). The interceptor may return null or default in this case, but can include a non-null partition date if needed." +backport: 5.3.1 diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_4_0/2417-avoid-npe-indexing-timing.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_4_0/2417-avoid-npe-indexing-timing.yaml index c20daca2cca..619928991f6 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_4_0/2417-avoid-npe-indexing-timing.yaml +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_4_0/2417-avoid-npe-indexing-timing.yaml @@ -3,3 +3,4 @@ type: fix issue: 2417 title: "A NullPointerException was corrected when indexing resources containing an indexed Period field that had a start but not an end defined." +backport: 5.3.3