Rel 6 2 mergeback (#4257)

* jm wrong bundle entry url (#4213) * Bug test * here you go * Generate relative URIs for bundle entry.request.url, as specified * Point jira issue in changelog * Adjust tests to fixes Co-authored-by: juan.marchionatto <[email protected]> Co-authored-by: Tadgh <[email protected]> * improved logging (#4217) Co-authored-by: Ken Stevens <[email protected]> * Rel 6 1 3 mergeback (#4215) * Bump for CVE (#3856) * Bump for CVE * Bump spring-data version * Fix compile * Cut over to spring bom * Bump to RC1 * remove RC * do not contrain reindex for common SP updates (#3876) * only fast-track jobs with exactly one chunk (#3879) * Fix illegalstateexception when an exception is thrown during stream response (#3882) * Finish up changelog, minor refactor * reset buffer only * Hack for some replacements * Failure handling * wip * Fixed the issue (#3845) * Fixed the issue * Changelog modification * Changelog modification * Implemented seventh character extended code and the corresponding dis… (#3709) * Implemented seventh character extended code and the corresponding display * Modifications * Changes on previous test according to modifications made in ICD10-CM XML file * Subscription sending delete events being skipped (#3888) * fixed bug and added test * refactor * Update for CVE (#3895) * updated pointcuts to work as intended (#3903) * updated pointcuts to work as intended * added changelog * review fixes Co-authored-by: leif stawnyczy <[email protected]> * 3904 during $delete expunge job hibernate search indexed documents are left orphaned (#3905) * Add test and implementation * Add changelog * 3899 code in limits (#3901) * Add implementation, changelog, test * Update hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java Co-authored-by: Ken Stevens <[email protected]> Co-authored-by: Ken Stevens <[email protected]> * 3884 overlapping searchparameter undetected rel 6 1 (#3909) * Applying all changes from previous dev branch to current one pointing to rel_6_1 * Fixing merge conflict related to Msg.code value. * Fixing Msg.code value. * Making checkstyle happy. * Making sure that all tests are passing. * Passing all tests after fixing Msg.code * Passing all tests. Co-authored-by: peartree <[email protected]> * 3745 - fixed NPE for bundle with duplicate conditional create resourc… (#3746) * 3745 - fixed NPE for bundle with duplicate conditional create resources and a conditional delete * created unit test for skip of delete operation while processing duplicating create entries * moved unit test to FhirSystemDaoR4Test * 3379 mdm fixes (#3906) * added MdmLinkCreateSvcimplTest * fixed creating mdm-link not setting the resource type correctly * fixed a bug where ResourcePersistenceId was being duplicated instead of passed on * Update hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/svc/MdmLinkCreateSvcImplTest.java Change order of tests such that assertEquals takes expected value then actual value Co-authored-by: jdar8 <[email protected]> * added changelog, also changed a setup function in test to beforeeach Co-authored-by: Long Ma <[email protected]> Co-authored-by: jdar8 <[email protected]> * Fix to the issue (#3855) * Fix to the issue * Progress * fixed the issue * Addressing suggestions * add response status code to MethodOutcome * Addressing suggestions Co-authored-by: Ken Stevens <[email protected]> * Fix for caching appearing broken in batch2 for bulkexport jobs (#3912) * Respect caching in bullk export, fix bug with completed date on empty jobs * add changelog * Add impl * Add breaking test * Complete failing test * more broken tests * Fix more tests' * Fix paging bug * Fix another brittle test * 3915 do not collapse rules with filters (#3916) * do not attempt to merge compartment permissions with filters * changelog * Rename to IT for concurrency problems Co-authored-by: Tadgh <[email protected]> * Version bump * fix $mdm-submit output (#3917) Co-authored-by: Ken Stevens <[email protected]> * Gl3407 bundle offset size (#3918) * begin with failing test * fixed * change log * rollback default count change and corresponding comments Co-authored-by: Ken Stevens <[email protected]> * Offset interceptor now only works for external calls * Initialize some beans (esp interceptors) later in the boot process so they don't slow down startup. * do not reindex searchparam jobs on startup * Fix oracle non-enterprise attempting online index add (#3925) * 3922 delete expunge large dataset (#3923) * lower batchsize of delete requests so that we do not get sql exceptions * blah * fix test * updated tests to not fail Co-authored-by: leif stawnyczy <[email protected]> * add index * Fix up colun grab * Revert offset mode change * Revert fix for null/system request details checks for reindex purposes * Fix bug and add test for SP Validating Interceptor (#3930) * wip * Fix uptests * Fix index online test * Fix SP validating interceptor logic * Updating version to: 6.1.1 post release. * fix compile error * Deploy to sonatype (#3934) * adding sonatype profile to checkstyle module * adding sonatype profile to tinder module * adding sonatype profile to base pom * adding final deployToSonatype profile * wip * Revert version enum * Updating version to: 6.1.1 post release. * Add test, changelog, and implementation * Add backport info * Create failing test * Implemented the fix, fixed existing unit tests * added changelog * added test case for no filter, exclude 1 patient * wip * Add backport info * Add info of new version * Updating version to: 6.1.2 post release. * bump info and backport for 6.1.2 * Bump for hapi * Implement bug fixes, add new tests (#4022) * Implement bug fixes, add new tests * tidy * Tidy * refactor for cleaning * More tidying * Lower logging * Split into nested tests, rename, add todos * Typo * Code review * add backport info * Updating version to: 6.1.3 post release. * Updating version to: 6.1.3 post release. * removed duplicate mention of ver 6.1.3 in versionEnum * backport pr 4101 * mdm message key (#4111) * begin with failing test * fixed 2 tests * fix tests * fix tests * change log Co-authored-by: Ken Stevens <[email protected]> * backport 6.1.3 docs changes * fixed typo on doc backport message * fix test breaking * Updating version to: 6.1.4 post release. * wip Co-authored-by: JasonRoberts-smile <[email protected]> Co-authored-by: Qingyixia <[email protected]> Co-authored-by: TipzCM <[email protected]> Co-authored-by: leif stawnyczy <[email protected]> Co-authored-by: Ken Stevens <[email protected]> Co-authored-by: Etienne Poirier <[email protected]> Co-authored-by: peartree <[email protected]> Co-authored-by: kateryna-mironova <[email protected]> Co-authored-by: longma1 <[email protected]> Co-authored-by: Long Ma <[email protected]> Co-authored-by: jdar8 <[email protected]> Co-authored-by: Ken Stevens <[email protected]> Co-authored-by: markiantorno <[email protected]> Co-authored-by: Steven Li <[email protected]> * pin okio-jvm for kotlin vuln (#4216) * Fix UrlUtil.unescape() by not escaping "+" to " " if this is an "application/..." _outputFormat. (#4220) * First commit: Failing unit test and a TODO with a vague idea of where the bug happens. * Don't escape "+" in a URL GET parameter if it starts with "application". * Remove unnecessary TODO. * Add changelog. * Code review feedback on naming. Also, make logic more robust by putting plus and should escape boolean && in parens. * Ks 20221031 migration lock (#4224) * started design * complete with tests * changelog * cleanup * tyop Co-authored-by: Ken Stevens <[email protected]> * 4207-getpagesoffset-set-to-total-number-of-resources-results-in-inconsistent-amount-of-entries-when-requests-are-sent-consecutively (#4209) * Added test * Added solution * Changelog * Changes made based on comments * Fix bug with MDM submit * fix * Version bump * 4234 consent in conjunction with versionedapiconverterinterceptor fails (#4236) * Add constant for interceptor * add test, changelog * Allow Batch2 transition from ERRORED to COMPLETE (#4242) * Allow Batch2 transition from ERRORED to COMPLETE * Add changelog * Test fix Co-authored-by: James Agnew <[email protected]> * 3685 When bulk exporting, if no resource type param is provided, defa… (#4233) * 3685 When bulk exporting, if no resource type param is provided, default to all registered types. * Update test case. * Cleaned up changelog. * Added test case for multiple resource types. * Added failing test case for not returning Binary resource. * Refactor solution. Co-authored-by: kylejule <[email protected]> * Add next version * bulk export permanently reusing cached results (#4249) * Add test, fix bug, add changelog * minor refactor * Fix * Bump HAPI version * Remove jetbrains * Fix broken test Co-authored-by: jmarchionatto <[email protected]> Co-authored-by: juan.marchionatto <[email protected]> Co-authored-by: Ken Stevens <[email protected]> Co-authored-by: Ken Stevens <[email protected]> Co-authored-by: JasonRoberts-smile <[email protected]> Co-authored-by: Qingyixia <[email protected]> Co-authored-by: TipzCM <[email protected]> Co-authored-by: leif stawnyczy <[email protected]> Co-authored-by: Etienne Poirier <[email protected]> Co-authored-by: peartree <[email protected]> Co-authored-by: kateryna-mironova <[email protected]> Co-authored-by: longma1 <[email protected]> Co-authored-by: Long Ma <[email protected]> Co-authored-by: jdar8 <[email protected]> Co-authored-by: markiantorno <[email protected]> Co-authored-by: Steven Li <[email protected]> Co-authored-by: Luke deGruchy <[email protected]> Co-authored-by: karneet1212 <[email protected]> Co-authored-by: James Agnew <[email protected]> Co-authored-by: James Agnew <[email protected]> Co-authored-by: KGJ-software <[email protected]> Co-authored-by: kylejule <[email protected]>
hapifhir · Nov 7, 2022 · d3367cf · d3367cf
1 parent 6c9fe71
commit d3367cf
Show file tree

Hide file tree

Showing 117 changed files with 696 additions and 147 deletions.
diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/context/FhirContext.java
@@ -24,7 +24,6 @@
 import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.client.api.IRestfulClient;
 import ca.uhn.fhir.rest.client.api.IRestfulClientFactory;
-import ca.uhn.fhir.tls.TlsAuthentication;
 import ca.uhn.fhir.util.FhirTerser;
 import ca.uhn.fhir.util.ReflectionUtil;
 import ca.uhn.fhir.util.VersionUtil;

diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/UrlUtil.java
@@ -488,9 +488,12 @@ public static String unescape(String theString) {
  if (theString == null) {
  return null;
  }
+ // If the user passes "_outputFormat" as a GET request parameter directly in the URL:
+ final boolean shouldEscapePlus = !theString.startsWith("application/");
+
  for (int i = 0; i < theString.length(); i++) {
  char nextChar = theString.charAt(i);
- if (nextChar == '%' || nextChar == '+') {
+ if (nextChar == '%' || (nextChar == '+' && shouldEscapePlus)) {
  try {
  // Yes it would be nice to not use a string "UTF-8" but the equivalent
  // method that takes Charset is JDK10+ only... sigh....

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
@@ -103,8 +103,10 @@ public enum VersionEnum {
  V6_1_0,
  V6_1_1,
  V6_1_2,
+ V6_1_3,
+ V6_1_4,
  V6_2_0,
- V6_3_0,
+ V6_3_0
  ;
 
  public static VersionEnum latestVersion() {

diff --git a/hapi-fhir-base/src/test/java/ca/uhn/fhir/util/UrlUtilTest.java b/hapi-fhir-base/src/test/java/ca/uhn/fhir/util/UrlUtilTest.java
@@ -1,10 +1,12 @@
 package ca.uhn.fhir.util;
 
+import ca.uhn.fhir.rest.api.Constants;
 import org.apache.http.message.BasicNameValuePair;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -45,6 +47,20 @@ public void testEscape() {
  assertEquals("A%2BB", UrlUtil.escapeUrlParam("A+B"));
  }
 
+ @Test
+ public void testUnescape() {
+ assertAll(
+ () -> assertEquals(Constants.CT_JSON, UrlUtil.unescape(Constants.CT_JSON)),
+ () -> assertEquals(Constants.CT_NDJSON, UrlUtil.unescape(Constants.CT_NDJSON)),
+ () -> assertEquals(Constants.CT_XML, UrlUtil.unescape(Constants.CT_XML)),
+ () -> assertEquals(Constants.CT_XML_PATCH, UrlUtil.unescape(Constants.CT_XML_PATCH)),
+ () -> assertEquals(Constants.CT_APPLICATION_GZIP, UrlUtil.unescape(Constants.CT_APPLICATION_GZIP)),
+ () -> assertEquals(Constants.CT_RDF_TURTLE, UrlUtil.unescape(Constants.CT_RDF_TURTLE)),
+ () -> assertEquals(Constants.CT_FHIR_JSON, UrlUtil.unescape(Constants.CT_FHIR_JSON)),
+ () -> assertEquals(Constants.CT_FHIR_NDJSON, UrlUtil.unescape(Constants.CT_FHIR_NDJSON))
+ );
+ }
+
  @Test
  public void testIsValid() {
  assertTrue(UrlUtil.isValid("http:https://foo"));

diff --git a/hapi-fhir-batch/pom.xml b/hapi-fhir-batch/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-bom/pom.xml b/hapi-fhir-bom/pom.xml
@@ -3,14 +3,14 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-bom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <packaging>pom</packaging>
  <name>HAPI FHIR BOM</name>
 
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-checkstyle/pom.xml b/hapi-fhir-checkstyle/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-cli</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-jpaserver/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../../hapi-deployable-pom</relativePath>
  </parent>
 

diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java b/hapi-fhir-client/src/main/java/ca/uhn/fhir/rest/client/impl/GenericClient.java
@@ -2234,7 +2234,6 @@ public ITransactionTyped<List<IBaseResource>> withResources(List<? extends IBase
 
  return new TransactionExecutable<>(theResources);
  }
-
  }
 
  private class UpdateInternal extends BaseSearch<IUpdateExecutable, IUpdateWithQueryTyped, MethodOutcome>

diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/...nverter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java b/...nverter/src/main/java/ca/uhn/hapi/converters/server/VersionedApiConverterInterceptor.java
@@ -23,13 +23,15 @@
 import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.interceptor.api.Interceptor;
 import ca.uhn.fhir.model.api.IResource;
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
 import ca.uhn.fhir.rest.api.server.ResponseDetails;
 import ca.uhn.fhir.rest.server.exceptions.AuthenticationException;
 import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
 import ca.uhn.fhir.rest.server.interceptor.InterceptorAdapter;
+import ca.uhn.fhir.rest.server.interceptor.auth.AuthorizationConstants;
 import org.hl7.fhir.converter.NullVersionConverterAdvisor10_30;
 import org.hl7.fhir.converter.NullVersionConverterAdvisor10_40;
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_10_30;
@@ -54,6 +56,8 @@
  * Versioned API features.
  * </p>
  */
+
+@Interceptor(order = AuthorizationConstants.ORDER_CONVERTER_INTERCEPTOR)
 public class VersionedApiConverterInterceptor extends InterceptorAdapter {
  private final FhirContext myCtxDstu2;
  private final FhirContext myCtxDstu2Hl7Org;

diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-docs/pom.xml b/hapi-fhir-docs/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_3/upgrade.md b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_3/upgrade.md
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_3/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_1_3/version.yaml
@@ -0,0 +1,3 @@
+---
+release-date: "2022-10-06"
+codename: "Unicorn"
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/4111-mdm-message-key.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/4111-mdm-message-key.yaml
@@ -1,5 +1,6 @@
 ---
 type: fix
 issue: 4111
+backport: 6.1.3
 title: "MDM messages were using the resource id as a message key when it should be using the EID as a partition hash key.
 This could lead to duplicate golden resources on systems using Kafka as a message broker."
diff --git a/...urces-results-in-inconsistent-amount-of-entries-when-requests-are-sent-consecutively.yaml b/...urces-results-in-inconsistent-amount-of-entries-when-requests-are-sent-consecutively.yaml
@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 4207
+title: "Previously to improve performance, if the total number of resources was less than the _getpageoffset, 
+ the results would default to last resource offset. This is especially evident when requests are consecutive 
+ resulting in one entry being displayed in some requests. This issue is now fixed."
diff --git a/...s/ca/uhn/hapi/fhir/changelog/6_2_0/4210-wrong-bundle-entry-uri-in-transaction-bundle.yaml b/...s/ca/uhn/hapi/fhir/changelog/6_2_0/4210-wrong-bundle-entry-uri-in-transaction-bundle.yaml
@@ -0,0 +1,5 @@
+---
+type: fix
+issue: 4210
+jira: SMILE-4685
+title: "Generating Bundle with resources was setting `entry.request.url` as absolute url when it should be relative. This has been fixed"
diff --git a/...pi/fhir/changelog/6_2_0/4218-bulk-export-get-output-format-param-string-escape-issue.yaml b/...pi/fhir/changelog/6_2_0/4218-bulk-export-get-output-format-param-string-escape-issue.yaml
@@ -0,0 +1,4 @@
+---
+type: fix
+issue: 4218
+title: "Performing a bulk export with an _outputParam value encoded in a GET request URL that contains a '+' (ex: 'application/fhir+ndjson') will result in a 400 because the '+' is replaced with a ' '. After this fix the '+' will remain in the parameter value."
diff --git a/...r-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/4224-migration-lock-clear.yaml b/...r-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/4224-migration-lock-clear.yaml
@@ -0,0 +1,4 @@
+---
+type: add
+issue: 4224
+title: "Added new System Property called 'CLEAR_LOCK_TABLE_WITH_DESCRIPTION' that when set to the uuid of a lock record, will clear that lock record before attempting to insert a new one."
diff --git a/.../hapi/fhir/changelog/6_2_0/4232-default-export-bulk-to-all-registered-resource-types.yaml b/.../hapi/fhir/changelog/6_2_0/4232-default-export-bulk-to-all-registered-resource-types.yaml
@@ -0,0 +1,4 @@
+---
+type: fix
+issue: 4232
+title: "Previously during Bulk Export, if no `_type` parameter was provided, an error would be thrown. This has been changed, and if the `_type` parameter is omitted, Bulk Export will default to all registered types."
diff --git a/...r-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/4234-consent-with-convert.yaml b/...r-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/4234-consent-with-convert.yaml
@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 4234
+jira: SMILE-4765
+title: "Fixed a bug which caused a failure when combining a Consent Interceptor with version conversion via the `Accept` header."
+
diff --git a/...-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/4247-bulk-export-job-reuse.yaml b/...-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/4247-bulk-export-job-reuse.yaml
@@ -0,0 +1,4 @@
+---
+type: fix
+issue: 4247
+title: "Previously, Bulk Export jobs were always reused, even if completed. Now, jobs are only reused if an identical job is already running, and has not yet completed or failed."
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_2_0/version.yaml
@@ -1,3 +1,3 @@
 ---
 release-date: "2022-11-18"
-codename: "TBD"
+codename: "Vishwa"
diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_3_0/version.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_3_0/version.yaml
@@ -1,3 +1,3 @@
 ---
-release-date: "TBD"
+release-date: "2022-02-18"
 codename: "TBD"
diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml
@@ -11,7 +11,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpa/pom.xml b/hapi-fhir-jpa/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>

diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImpl.java
@@ -35,6 +35,7 @@
 import ca.uhn.fhir.jpa.entity.Batch2WorkChunkEntity;
 import ca.uhn.fhir.jpa.util.JobInstanceUtil;
 import ca.uhn.fhir.model.api.PagingIterator;
+import ca.uhn.fhir.narrative.BaseThymeleafNarrativeGenerator;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.Validate;
 import org.slf4j.Logger;

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirResourceDao.java
@@ -160,6 +160,7 @@ public abstract class BaseHapiFhirResourceDao<T extends IBaseResource> extends B
 
  public static final String BASE_RESOURCE_NAME = "resource";
  private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(BaseHapiFhirResourceDao.class);
+
  @Autowired
  protected PlatformTransactionManager myPlatformTransactionManager;
  @Autowired(required = false)

diff --git a/hapi-fhir-jpaserver-cql/pom.xml b/hapi-fhir-jpaserver-cql/pom.xml
@@ -7,7 +7,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml b/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-mdm/pom.xml b/hapi-fhir-jpaserver-mdm/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>
 

diff --git a/hapi-fhir-jpaserver-model/pom.xml b/hapi-fhir-jpaserver-model/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>6.3.0-PRE2-SNAPSHOT</version>
+ <version>6.3.0-PRE3-SNAPSHOT</version>
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>