From 523fe95820280ac88990b26da5d149fa10529385 Mon Sep 17 00:00:00 2001 From: Tadgh Date: Tue, 5 Apr 2022 15:39:09 -0700 Subject: [PATCH] Rel 5 7 2 mergeback (#3518) * fix handling of common search parameters * Revert "fix handling of common search parameters" This reverts commit 89c45eebdc31c3dd9533570d9c709ecc7ed5a7a6. * Fix implementation, add test (#3378) * Fix implementation, add test * Tighten test * Rip out dead modules * Add changelog * Jr 20220210 handle common search params in contained searches (#3377) * fix handling of common search parameters * add support for reference search parameters with multiple paths * Issue 3357 * Version bump * Fixed null pointer exception for re-loading subscription on cdr restart and when there's no partition id in the request, and added tests * added changelogs for this fix * Fix broken changelog file * Can't specify specific resource type permissions for bulk export (#3376) * deny user from exporting without perms * add unit tests * add changelog Co-authored-by: olivia-you * Make migration donothing as it was added in error * Remove ehcache * Add version.yaml: * Add to sources/javadocs for dist * Fix typo * fix up pom * wip test removing checkstyle plugin from deployable pom * remove test pom changes, instead just dont deploy to sonatype * typo * Version bump * Add implementation, testing, and changelog * Add backport info, make aware of 6_0_0 * add jira ref * Fix test * Add versionenum * Bump dep for spring, add changelog, add versionenum, add changelog folder * Actually do the version bump * remove doubleimport Co-authored-by: Jason Roberts Co-authored-by: JasonRoberts-smile <85363818+JasonRoberts-smile@users.noreply.github.com> Co-authored-by: Mark Iantorno Co-authored-by: Steven Li Co-authored-by: Olivia You <46392181+oliviayou@users.noreply.github.com> Co-authored-by: olivia-you --- .../src/main/java/ca/uhn/fhir/util/VersionEnum.java | 3 ++- .../hapi/fhir/changelog/5_7_2/3514-spring-4-shell-bump.yaml | 4 ++++ .../resources/ca/uhn/hapi/fhir/changelog/5_7_2/version.yaml | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_2/3514-spring-4-shell-bump.yaml create mode 100644 hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_2/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 2eb2fe0a662..d7b124b9256 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 @@ -88,7 +88,8 @@ public enum VersionEnum { V5_6_3, V5_7_0, V5_7_1, - V6_0_0, + V5_7_2, + V6_0_0 ; public static VersionEnum latestVersion() { diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_2/3514-spring-4-shell-bump.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_2/3514-spring-4-shell-bump.yaml new file mode 100644 index 00000000000..400be783d85 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_2/3514-spring-4-shell-bump.yaml @@ -0,0 +1,4 @@ +--- +type: security +issue: 3514 +title: "Bump the version of Spring Core to 5.3.18 to avoid CVE-2022-22963" diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_2/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_2/version.yaml new file mode 100644 index 00000000000..ef4de2d5630 --- /dev/null +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/5_7_2/version.yaml @@ -0,0 +1,3 @@ +--- +release-date: "2022-03-31" +codename: "Sojourner"