Merge fd56f1462f into 8a8291e65d

Rel 7 6 CVE (#6446 )
* Bump commons io * Bump HS and Lucene, and hibernate * Jetty bump for CVE * Resolve CVES * Bump with mismatch lucene * Bump velocity template engine * Revert bom bump * wip * Version bump * move changelog, fix cve * Bump commons-lang * Replace imports * wip * fix HQL break * remove dead code
2024-11-08 05:53:40 -05:00 · 2024-11-08 01:07:42 -08:00 · 2024-11-07 21:52:39 +00:00 · 2024-11-07 19:27:47 +00:00 · 2024-11-07 10:11:07 -07:00
98 changed files with 257 additions and 105 deletions
--- a/hapi-deployable-pom/pom.xml
+++ b/hapi-deployable-pom/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		 <groupId>ca.uhn.hapi.fhir</groupId>
 		 <artifactId>hapi-fhir</artifactId>
-		 <version>7.5.2-SNAPSHOT</version>
+		 <version>7.5.3-SNAPSHOT</version>

 		 <relativePath>../pom.xml</relativePath>
 	 </parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-bom/pom.xml
+++ b/hapi-fhir-bom/pom.xml
@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ca.uhn.hapi.fhir</groupId>
 	<artifactId>hapi-fhir-bom</artifactId>
-	<version>7.5.2-SNAPSHOT</version>
+	<version>7.5.3-SNAPSHOT</version>

 	<packaging>pom</packaging>
 	<name>HAPI FHIR BOM</name>
@ -12,7 +12,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/6403-json-parser-bugs.yaml
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/6403-json-parser-bugs.yaml
--- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/6451-bulk-import-job-status-not-changing-after-activation.yaml
+++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_6_0/6451-bulk-import-job-status-not-changing-after-activation.yaml
@ -0,0 +1,6 @@
+---
+type: fix
+issue: 6451
+jira: SMILE-9089
+title: "Previously, activating `BulkDataImport` job would not change jobs status to `RUNNING`, 
+causing it to be processed multiple times instead of single time. This has been fixed."
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImpl.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportSvcImpl.java
@ -217,6 +217,12 @@ public class BulkDataImportSvcImpl implements IBulkDataImportSvc, IHasScheduledJ
 		String biJobId = null;
 		try {
 			biJobId = processJob(bulkImportJobEntity);
+			// set job status to RUNNING so it would not be processed again
+			myTxTemplate.execute(t -> {
+				bulkImportJobEntity.setStatus(BulkImportJobStatusEnum.RUNNING);
+				myJobDao.save(bulkImportJobEntity);
+				return null;
+			});
 		} catch (Exception e) {
 			ourLog.error("Failure while preparing bulk export extract", e);
 			myTxTemplate.execute(t -> {
@ -256,6 +262,7 @@ public class BulkDataImportSvcImpl implements IBulkDataImportSvc, IHasScheduledJ
 	}

 	@Override
+	@Transactional
 	public JobInfo getJobStatus(String theBiJobId) {
 		BulkImportJobEntity theJob = findJobByBiJobId(theBiJobId);
 		return new JobInfo()
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IBatch2WorkChunkRepository.java
@ -150,6 +150,6 @@ public interface IBatch2WorkChunkRepository
 			@Param("status") WorkChunkStatusEnum theStatus);

 	@Query(
-			"SELECT new ca.uhn.fhir.batch2.model.BatchWorkChunkStatusDTO(e.myTargetStepId, e.myStatus, min(e.myStartTime), max(e.myEndTime), avg(e.myEndTime - e.myStartTime), count(*)) FROM Batch2WorkChunkEntity e WHERE e.myInstanceId=:instanceId GROUP BY e.myTargetStepId, e.myStatus")
+			"SELECT new ca.uhn.fhir.batch2.model.BatchWorkChunkStatusDTO(e.myTargetStepId, e.myStatus, min(e.myStartTime), max(e.myEndTime), avg(cast((e.myEndTime - e.myStartTime) as long)), count(*)) FROM Batch2WorkChunkEntity e WHERE e.myInstanceId=:instanceId GROUP BY e.myTargetStepId, e.myStatus")
 	List<BatchWorkChunkStatusDTO> fetchWorkChunkStatusForInstance(@Param("instanceId") String theInstanceId);
 }
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

--- a/hapi-fhir-jpaserver-hfql/pom.xml
+++ b/hapi-fhir-jpaserver-hfql/pom.xml
@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

--- a/hapi-fhir-jpaserver-ips/pom.xml
+++ b/hapi-fhir-jpaserver-ips/pom.xml
@ -3,7 +3,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

--- 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>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-searchparam/pom.xml
+++ b/hapi-fhir-jpaserver-searchparam/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-subscription/pom.xml
+++ b/hapi-fhir-jpaserver-subscription/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

--- a/hapi-fhir-jpaserver-test-dstu2/pom.xml
+++ b/hapi-fhir-jpaserver-test-dstu2/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-test-dstu3/pom.xml
+++ b/hapi-fhir-jpaserver-test-dstu3/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-test-r4/pom.xml
+++ b/hapi-fhir-jpaserver-test-r4/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java
+++ b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/batch2/JpaJobPersistenceImplTest.java
@ -881,6 +881,11 @@ public class JpaJobPersistenceImplTest extends BaseJpaR4Test {
 	public void testFetchInstanceAndWorkChunkStatus() {
 		// Setup

+		Date date1 = new Date();
+		Date date2 = new Date();
+
+
+
 		List<String> chunkIds = new ArrayList<>();
 		JobInstance instance = createInstance();
 		String instanceId = mySvc.storeNewInstance(instance);
--- a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportR4Test.java
+++ b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/bulk/imprt/svc/BulkDataImportR4Test.java
@ -17,6 +17,7 @@ import ca.uhn.fhir.jpa.bulk.imprt.api.IBulkDataImportSvc;
 import ca.uhn.fhir.jpa.bulk.imprt.model.ActivateJobResult;
 import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobFileJson;
 import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobJson;
+import ca.uhn.fhir.jpa.bulk.imprt.model.BulkImportJobStatusEnum;
 import ca.uhn.fhir.jpa.bulk.imprt.model.JobFileRowProcessingModeEnum;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.jpa.subscription.channel.api.ChannelConsumerSettings;
@ -166,6 +167,8 @@ public class BulkDataImportR4Test extends BaseJpaR4Test implements ITestDataBuil

 		ActivateJobResult activateJobOutcome = mySvc.activateNextReadyJob();
 		assertTrue(activateJobOutcome.isActivated);
+		// validate that job changed status from READY to RUNNING
+		assertEquals(BulkImportJobStatusEnum.RUNNING, mySvc.getJobStatus(jobId).getStatus());

 		JobInstance instance = myBatch2JobHelper.awaitJobCompletion(activateJobOutcome.jobId, 60);
 		assertNotNull(instance);
@ -196,6 +199,8 @@ public class BulkDataImportR4Test extends BaseJpaR4Test implements ITestDataBuil

 			ActivateJobResult activateJobOutcome = mySvc.activateNextReadyJob();
 			assertTrue(activateJobOutcome.isActivated);
+			// validate that job changed status from READY to RUNNING
+			assertEquals(BulkImportJobStatusEnum.RUNNING, mySvc.getJobStatus(jobId).getStatus());

 			JobInstance instance = myBatch2JobHelper.awaitJobCompletion(activateJobOutcome.jobId);
 			assertNotNull(instance);
--- a/hapi-fhir-jpaserver-test-r4b/pom.xml
+++ b/hapi-fhir-jpaserver-test-r4b/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-test-r5/pom.xml
+++ b/hapi-fhir-jpaserver-test-r5/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-test-utilities/pom.xml
+++ b/hapi-fhir-jpaserver-test-utilities/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-jpaserver-test-utilities/src/main/resources/migration/releases/V7_4_0/data/H2_EMBEDDED.sql
+++ b/hapi-fhir-jpaserver-test-utilities/src/main/resources/migration/releases/V7_4_0/data/H2_EMBEDDED.sql
@ -51,3 +51,33 @@ INSERT INTO TRM_CONCEPT_DESIG (
   54,
   150
 );
+
+INSERT INTO HFJ_RES_LINK (
+   PID,
+   PARTITION_DATE,
+   PARTITION_ID,
+   SRC_PATH,
+   SRC_RESOURCE_ID,
+   SOURCE_RESOURCE_TYPE,
+   TARGET_RESOURCE_ID,
+   TARGET_RESOURCE_TYPE,
+   TARGET_RESOURCE_URL,
+   TARGET_RESOURCE_VERSION,
+   SP_UPDATED,
+   TARGET_RES_PARTITION_ID,
+   TARGET_RES_PARTITION_DATE
+) VALUES (
+   702,
+   '2024-11-05',
+   1,
+   'Observation.subject.where(resolve() is Patient)',
+   1656,
+   'Observation',
+   1906,
+   'Patient',
+   'http://localhost:8000/Patient/123',
+   1,
+   '2024-11-01 18:01:12.921',
+   1,
+   '2024-11-05'
+);
--- a/hapi-fhir-jpaserver-test-utilities/src/main/resources/migration/releases/V7_4_0/data/MSSQL_2012.sql
+++ b/hapi-fhir-jpaserver-test-utilities/src/main/resources/migration/releases/V7_4_0/data/MSSQL_2012.sql
@ -51,3 +51,33 @@ INSERT INTO TRM_CONCEPT_DESIG (
   54,
   150
 );
+
+INSERT INTO HFJ_RES_LINK (
+   PID,
+   PARTITION_DATE,
+   PARTITION_ID,
+   SRC_PATH,
+   SRC_RESOURCE_ID,
+   SOURCE_RESOURCE_TYPE,
+   TARGET_RESOURCE_ID,
+   TARGET_RESOURCE_TYPE,
+   TARGET_RESOURCE_URL,
+   TARGET_RESOURCE_VERSION,
+   SP_UPDATED,
+   TARGET_RES_PARTITION_ID,
+   TARGET_RES_PARTITION_DATE
+) VALUES (
+   702,
+   '2024-11-05',
+   1,
+   'Observation.subject.where(resolve() is Patient)',
+   1653,
+   'Observation',
+   1906,
+   'Patient',
+   'http://localhost:8000/Patient/123',
+   1,
+   '2024-11-01 18:01:12.921',
+   1,
+   '2024-11-05'
+);
--- a/hapi-fhir-jpaserver-test-utilities/src/main/resources/migration/releases/V7_4_0/data/ORACLE_12C.sql
+++ b/hapi-fhir-jpaserver-test-utilities/src/main/resources/migration/releases/V7_4_0/data/ORACLE_12C.sql
@ -51,3 +51,33 @@ INSERT INTO TRM_CONCEPT_DESIG (
   54,
   150
 );
+
+INSERT INTO HFJ_RES_LINK (
+   PID,
+   PARTITION_DATE,
+   PARTITION_ID,
+   SRC_PATH,
+   SRC_RESOURCE_ID,
+   SOURCE_RESOURCE_TYPE,
+   TARGET_RESOURCE_ID,
+   TARGET_RESOURCE_TYPE,
+   TARGET_RESOURCE_URL,
+   TARGET_RESOURCE_VERSION,
+   SP_UPDATED,
+   TARGET_RES_PARTITION_ID,
+   TARGET_RES_PARTITION_DATE
+) VALUES (
+   702,
+   SYSDATE,
+   1,
+   'Observation.subject.where(resolve() is Patient)',
+   1653,
+   'Observation',
+   1906,
+   'Patient',
+   'http://localhost:8000/Patient/123',
+   1,
+   SYSDATE,
+   1,
+   SYSDATE
+);
--- a/hapi-fhir-jpaserver-test-utilities/src/main/resources/migration/releases/V7_4_0/data/POSTGRES_9_4.sql
+++ b/hapi-fhir-jpaserver-test-utilities/src/main/resources/migration/releases/V7_4_0/data/POSTGRES_9_4.sql
@ -51,3 +51,33 @@ INSERT INTO TRM_CONCEPT_DESIG (
   54,
   150
 );
+
+INSERT INTO HFJ_RES_LINK (
+   PID,
+   PARTITION_DATE,
+   PARTITION_ID,
+   SRC_PATH,
+   SRC_RESOURCE_ID,
+   SOURCE_RESOURCE_TYPE,
+   TARGET_RESOURCE_ID,
+   TARGET_RESOURCE_TYPE,
+   TARGET_RESOURCE_URL,
+   TARGET_RESOURCE_VERSION,
+   SP_UPDATED,
+   TARGET_RES_PARTITION_ID,
+   TARGET_RES_PARTITION_DATE
+) VALUES (
+   702,
+   '2024-11-05',
+   1,
+   'Observation.subject.where(resolve() is Patient)',
+   1653,
+   'Observation',
+   1906,
+   'Patient',
+   'http://localhost:8000/Patient/123',
+   1,
+   '2024-11-01 18:01:12.921',
+   1,
+   '2024-11-05'
+);
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-server-cds-hooks/pom.xml
+++ b/hapi-fhir-server-cds-hooks/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-server-mdm/pom.xml
+++ b/hapi-fhir-server-mdm/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-server-openapi/pom.xml
+++ b/hapi-fhir-server-openapi/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-server/pom.xml
+++ b/hapi-fhir-server/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

--- a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/pom.xml
+++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>hapi-fhir-serviceloaders</artifactId>
 		<groupId>ca.uhn.hapi.fhir</groupId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/pom.xml
+++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>hapi-fhir-serviceloaders</artifactId>
 		<groupId>ca.uhn.hapi.fhir</groupId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-caching-api</artifactId>
-			<version>7.5.2-SNAPSHOT</version>
+			<version>7.5.3-SNAPSHOT</version>

 		</dependency>
 		<dependency>
--- a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml
+++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>hapi-fhir-serviceloaders</artifactId>
 		<groupId>ca.uhn.hapi.fhir</groupId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-serviceloaders/hapi-fhir-caching-testing/pom.xml
+++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-testing/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>hapi-fhir</artifactId>
 		<groupId>ca.uhn.hapi.fhir</groupId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../../pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-serviceloaders/pom.xml
+++ b/hapi-fhir-serviceloaders/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>hapi-deployable-pom</artifactId>
 		<groupId>ca.uhn.hapi.fhir</groupId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>
 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>

--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir-spring-boot-samples</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>
 	</parent>

 	<artifactId>hapi-fhir-spring-boot-sample-client-apache</artifactId>
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir-spring-boot-samples</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 	</parent>

--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir-spring-boot-samples</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 	</parent>

--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir-spring-boot</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 	</parent>

--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml
@ -5,7 +5,7 @@
   <parent>
      <groupId>ca.uhn.hapi.fhir</groupId>
      <artifactId>hapi-deployable-pom</artifactId>
-      <version>7.5.2-SNAPSHOT</version>
+      <version>7.5.3-SNAPSHOT</version>

      <relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
   </parent>
--- a/hapi-fhir-spring-boot/pom.xml
+++ b/hapi-fhir-spring-boot/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-sql-migrate/pom.xml
+++ b/hapi-fhir-sql-migrate/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-storage-batch2-jobs/pom.xml
+++ b/hapi-fhir-storage-batch2-jobs/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-storage-batch2-test-utilities/pom.xml
+++ b/hapi-fhir-storage-batch2-test-utilities/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-storage-batch2/pom.xml
+++ b/hapi-fhir-storage-batch2/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/BatchWorkChunkStatusDTO.java
+++ b/hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/model/BatchWorkChunkStatusDTO.java
@ -26,6 +26,7 @@ public class BatchWorkChunkStatusDTO {
 	public final WorkChunkStatusEnum status;
 	public final Date start;
 	public final Date stop;
+
 	public final Double avg;
 	public final Long totalChunks;

--- a/hapi-fhir-storage-cr/pom.xml
+++ b/hapi-fhir-storage-cr/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/dstu3/EvaluateOperationConfig.java
+++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/dstu3/EvaluateOperationConfig.java
@ -21,15 +21,20 @@ package ca.uhn.fhir.cr.config.dstu3;

 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.cr.config.CrProcessorConfig;
 import ca.uhn.fhir.cr.config.ProviderLoader;
 import ca.uhn.fhir.cr.config.ProviderSelector;
 import ca.uhn.fhir.rest.server.RestfulServer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;

 import java.util.Arrays;
 import java.util.Map;

+@Configuration
+@Import(CrProcessorConfig.class)
 public class EvaluateOperationConfig {
 	@Bean
 	ca.uhn.fhir.cr.dstu3.library.LibraryEvaluateProvider dstu3LibraryEvaluateProvider() {
--- a/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/r4/EvaluateOperationConfig.java
+++ b/hapi-fhir-storage-cr/src/main/java/ca/uhn/fhir/cr/config/r4/EvaluateOperationConfig.java
@ -21,15 +21,20 @@ package ca.uhn.fhir.cr.config.r4;

 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
+import ca.uhn.fhir.cr.config.CrProcessorConfig;
 import ca.uhn.fhir.cr.config.ProviderLoader;
 import ca.uhn.fhir.cr.config.ProviderSelector;
 import ca.uhn.fhir.rest.server.RestfulServer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;

 import java.util.Arrays;
 import java.util.Map;

+@Configuration
+@Import(CrProcessorConfig.class)
 public class EvaluateOperationConfig {
 	@Bean
 	ca.uhn.fhir.cr.r4.library.LibraryEvaluateProvider r4LibraryEvaluateProvider() {
--- a/hapi-fhir-storage-mdm/pom.xml
+++ b/hapi-fhir-storage-mdm/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-storage-test-utilities/pom.xml
+++ b/hapi-fhir-storage-test-utilities/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-storage/pom.xml
+++ b/hapi-fhir-storage/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-structures-dstu2.1/pom.xml
+++ b/hapi-fhir-structures-dstu2.1/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-structures-dstu2/pom.xml
+++ b/hapi-fhir-structures-dstu2/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-structures-dstu3/pom.xml
+++ b/hapi-fhir-structures-dstu3/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-structures-hl7org-dstu2/pom.xml
+++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-structures-r4/pom.xml
+++ b/hapi-fhir-structures-r4/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-structures-r4b/pom.xml
+++ b/hapi-fhir-structures-r4b/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-structures-r5/pom.xml
+++ b/hapi-fhir-structures-r5/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-test-utilities/pom.xml
+++ b/hapi-fhir-test-utilities/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-testpage-overlay/pom.xml
+++ b/hapi-fhir-testpage-overlay/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-validation-resources-dstu2.1/pom.xml
+++ b/hapi-fhir-validation-resources-dstu2.1/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-validation-resources-dstu2/pom.xml
+++ b/hapi-fhir-validation-resources-dstu2/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-validation-resources-dstu3/pom.xml
+++ b/hapi-fhir-validation-resources-dstu3/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-validation-resources-r4/pom.xml
+++ b/hapi-fhir-validation-resources-r4/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-validation-resources-r4b/pom.xml
+++ b/hapi-fhir-validation-resources-r4b/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-validation-resources-r5/pom.xml
+++ b/hapi-fhir-validation-resources-r5/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-fhir-validation/pom.xml
+++ b/hapi-fhir-validation/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-deployable-pom</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
 	</parent>
--- a/hapi-tinder-plugin/pom.xml
+++ b/hapi-tinder-plugin/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
@ -118,11 +118,9 @@
 			<artifactId>velocity-engine-core</artifactId>
 		</dependency>
 		<dependency>
-			<artifactId>commons-lang</artifactId>
-			<groupId>commons-lang</groupId>
-			<version>2.6</version>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/Configuration.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/Configuration.java
@ -4,7 +4,7 @@ import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.tinder.parser.BaseStructureSpreadsheetParser;
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.text.WordUtils;

 import java.io.File;
 import java.io.IOException;
--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderGenericSingleFileMojo.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderGenericSingleFileMojo.java
@ -7,7 +7,7 @@ import ca.uhn.fhir.tinder.TinderStructuresMojo.ValueSetFileDefinition;
 import ca.uhn.fhir.tinder.parser.BaseStructureParser;
 import ca.uhn.fhir.tinder.parser.DatatypeGeneratorUsingSpreadsheet;
 import ca.uhn.fhir.tinder.parser.TargetType;
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderJpaRestServerMojo.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/TinderJpaRestServerMojo.java
@ -6,7 +6,7 @@ import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.tinder.parser.BaseStructureSpreadsheetParser;
 import ca.uhn.fhir.tinder.parser.ResourceGeneratorUsingModel;
 import ca.uhn.fhir.util.ClasspathUtil;
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ant/TinderGeneratorTask.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ant/TinderGeneratorTask.java
@ -33,7 +33,7 @@ import ca.uhn.fhir.tinder.parser.BaseStructureParser;
 import ca.uhn.fhir.tinder.parser.BaseStructureSpreadsheetParser;
 import ca.uhn.fhir.tinder.parser.DatatypeGeneratorUsingSpreadsheet;
 import ca.uhn.fhir.tinder.parser.TargetType;
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/BaseElement.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/BaseElement.java
@ -8,8 +8,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

-import static org.apache.commons.lang.StringUtils.defaultString;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.defaultString;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;

 public abstract class BaseElement {

--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/SearchParameter.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/model/SearchParameter.java
@ -1,6 +1,6 @@
 package ca.uhn.fhir.tinder.model;

-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.apache.commons.lang3.StringUtils;

 import java.util.ArrayList;
--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureParser.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/BaseStructureParser.java
@ -25,7 +25,7 @@ import ca.uhn.fhir.tinder.model.SimpleSetter.Parameter;
 import com.google.common.base.Charsets;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoFailureException;
@ -56,8 +56,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;

-import static org.apache.commons.lang.StringUtils.defaultString;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.defaultString;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;

 public abstract class BaseStructureParser {

--- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/ResourceGeneratorUsingModel.java
+++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/parser/ResourceGeneratorUsingModel.java
@ -6,7 +6,7 @@ import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
 import ca.uhn.fhir.tinder.model.Resource;
 import ca.uhn.fhir.tinder.model.SearchParameter;
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.apache.maven.plugin.MojoFailureException;

 import java.io.File;
--- a/hapi-tinder-test/pom.xml
+++ b/hapi-tinder-test/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../pom.xml</relativePath>
 	</parent>
--- a/pom.xml
+++ b/pom.xml
@ -8,7 +8,7 @@
 	<groupId>ca.uhn.hapi.fhir</groupId>
 	<artifactId>hapi-fhir</artifactId>
 	<packaging>pom</packaging>
-	<version>7.5.2-SNAPSHOT</version>
+	<version>7.5.3-SNAPSHOT</version>

 	<name>HAPI-FHIR</name>
 	<description>An open-source implementation of the FHIR specification in Java.</description>
@ -990,8 +990,8 @@
 		<!-- Before Bumping: See note above about dbcp2 -->
 		<commons_pool2_version>2.12.0</commons_pool2_version>
 		<commons_text_version>1.10.0</commons_text_version>
-		<commons_io_version>2.11.0</commons_io_version>
-		<commons_lang3_version>3.14.0</commons_lang3_version>
+		<commons_io_version>2.17.0</commons_io_version>
+		<commons_lang3_version>3.17.0</commons_lang3_version>
 		<com_jamesmurty_utils_version>1.2</com_jamesmurty_utils_version>
 		<error_prone_core_version>2.23.0</error_prone_core_version>
 		<mockito_version>5.8.0</mockito_version>
@ -1004,17 +1004,17 @@
 		<jaxb_runtime_version>4.0.4</jaxb_runtime_version>
 		<jena_version>4.9.0</jena_version>
 		<jersey_version>3.0.3</jersey_version>
-		<jetty_version>12.0.9</jetty_version>
+		<jetty_version>12.0.14</jetty_version>
 		<jsr305_version>3.0.2</jsr305_version>
 		<junit_version>5.10.1</junit_version>
 		<flexmark_version>0.64.8</flexmark_version>
 		<flyway_version>9.4.0</flyway_version>
-		<hibernate_version>6.4.1.Final</hibernate_version>
+		<hibernate_version>6.4.10.Final</hibernate_version>
 		<logback_version>1.4.14</logback_version>
 		<!-- Update lucene version when you update hibernate-search version - These go together! -->
-		<hibernate_search_version>7.0.0.Final</hibernate_search_version>
+		<hibernate_search_version>7.0.1.Final</hibernate_search_version>
 		<!-- Update lucene version when you update hibernate-search version - These go together! -->
-		<lucene_version>9.8.0</lucene_version>
+		<lucene_version>9.12.0</lucene_version>
 		<hamcrest_version>2.2</hamcrest_version>
 		<hibernate_validator_version>8.0.0.Final</hibernate_validator_version>
 		<httpcore_version>4.4.13</httpcore_version>
@ -1037,8 +1037,8 @@
 		<swagger_version>2.2.22</swagger_version>
 		<slf4j_version>2.0.13</slf4j_version>
 		<log4j_to_slf4j_version>2.19.0</log4j_to_slf4j_version>
-		<spring_version>6.1.8</spring_version>
-		<spring_data_bom_version>2023.1.6</spring_data_bom_version>
+		<spring_version>6.1.14</spring_version>
+		<spring_data_bom_version>2024.0.5</spring_data_bom_version>
 		<spring_batch_version>4.3.10</spring_batch_version>
 		<spring_boot_version>3.2.6</spring_boot_version>
 		<spring_retry_version>2.0.6</spring_retry_version>
@ -1054,7 +1054,7 @@
 		<ucum_version>1.0.8</ucum_version>

 		<!-- Clinical Reasoning & CQL Support -->
-		<clinical-reasoning.version>3.13.0</clinical-reasoning.version>
+		<clinical-reasoning.version>3.13.1</clinical-reasoning.version>

 		<!-- Site properties -->
 		<fontawesomeVersion>5.4.1</fontawesomeVersion>
@ -1664,7 +1664,7 @@
 			<dependency>
 				<groupId>org.apache.velocity</groupId>
 				<artifactId>velocity-engine-core</artifactId>
-				<version>2.3</version>
+				<version>2.4.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.awaitility</groupId>
--- a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
+++ b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../../pom.xml</relativePath>
 	</parent>
--- a/tests/hapi-fhir-base-test-mindeps-client/pom.xml
+++ b/tests/hapi-fhir-base-test-mindeps-client/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../../pom.xml</relativePath>
 	</parent>
--- a/tests/hapi-fhir-base-test-mindeps-server/pom.xml
+++ b/tests/hapi-fhir-base-test-mindeps-server/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>hapi-fhir</artifactId>
-		<version>7.5.2-SNAPSHOT</version>
+		<version>7.5.3-SNAPSHOT</version>

 		<relativePath>../../pom.xml</relativePath>
 	</parent>
Author	SHA1	Message	Date
TipzCM	7e5b5bda06	Merge `fd56f1462f` into `8a8291e65d`	2024-11-08 05:53:40 -05:00
Tadgh	8a8291e65d	Rel 7 6 CVE (#6446 ) * Bump commons io * Bump HS and Lucene, and hibernate * Jetty bump for CVE * Resolve CVES * Bump with mismatch lucene * Bump velocity template engine * Revert bom bump * wip * Version bump * move changelog, fix cve * Bump commons-lang * Replace imports * wip * fix HQL break * remove dead code	2024-11-08 01:07:42 -08:00
volodymyr-korzh	a5f3878392	Automated Migration Testing (HAPI-FHIR) - updated test migration scripts for 7_4_0 (#6439 )	2024-11-07 21:52:39 +00:00
Brenin Rhodes	ffd1287a06	Update CR to 3.13.1 (#6433 )	2024-11-07 19:27:47 +00:00
volodymyr-korzh	c0de4cd88b	Bulk Import job status not changed after activation - failing test, fix, changelog (#6452 )	2024-11-07 10:11:07 -07:00