Merge branch 'main' into dependabot/gradle/common/com.github.spotbugs…

…-6.0.25
NHSDigital · Oct 30, 2024 · 9e461a9 · 9e461a9
2 parents 3baf4d1 + f90b14f
commit 9e461a9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,16 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [3.0.4] - 2024-10-28
+
 ### Fixed
 
 - In the event that an inbound MHS message cannot be processed and needs to be sent to the dead letter queue, the
   adaptor will now emit a log message at INFO level as opposed to DEBUG level.
-- Fixed a bug when mapping `MedicationRequest` where multiple `MedicationRequest [Order]` are based on the same acute
-`MedicationRequest [Plan]`. Now the `Order` with the earliest `DispenseRequest` validity period start date will remain
-referencing the original `Plan` whilst later `Orders` will instead reference a generated `Plan` instead.
--Fixed a bug when mapping `MedicationRequest` where multiple `MedicationRequest [Order]` are based on the same acute
-`MedicationRequest [Plan]`. Now the `Order` with the earliest `DispenseRequest` validity period start date will remain
- referencing the original `MedicationStatement` whilst later `Orders` will instead reference a generated `MedicationRequest` instead.
+- Fixed a bug when mapping a post-dated acute prescription with multiple issues, whereby the adaptor was generating
+  a `MedicationRequest [Plan]` which was being referenced by multiple `MedicationRequest [Order]`.
+  Now each acute prescription issue gets its own `MedicationRequest [Plan]`, with the `priorPrescription` field linking
+  the plans together.
 
 ## [3.0.3] - 2024-08-23
 

diff --git a/common/build.gradle b/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id 'java'
     id 'java-library'
     id 'checkstyle'
-    id 'io.freefair.lombok' version '8.10'
+    id 'io.freefair.lombok' version '8.10.2'
     id 'com.github.spotbugs' version '6.0.25'
 }
 
@@ -18,7 +18,7 @@ repositories {
 }
 
 dependencies {
-    api 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:7.4.0'
+    api 'ca.uhn.hapi.fhir:hapi-fhir-structures-dstu3:7.4.4'
     api 'org.springframework.boot:spring-boot-starter-jdbc'
     api 'org.springframework.boot:spring-boot-starter-actuator'
     api 'org.springframework.boot:spring-boot-starter-web'
@@ -27,7 +27,7 @@ dependencies {
     api 'org.apache.commons:commons-lang3:3.17.0'
     api 'org.apache.qpid:qpid-jms-client:2.5.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
 
 }
 

diff --git a/db-connector/build.gradle b/db-connector/build.gradle
@@ -12,7 +12,7 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.6'
     id 'java'
     id 'checkstyle'
-    id 'io.freefair.lombok' version '8.10'
+    id 'io.freefair.lombok' version '8.10.2'
     id 'com.github.spotbugs' version '6.0.22'
 }
 

diff --git a/gpc-api-facade/build.gradle b/gpc-api-facade/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.6'
     id 'java'
     id 'checkstyle'
-    id 'com.github.spotbugs' version '6.0.24'
+    id 'com.github.spotbugs' version '6.0.25'
     id 'io.freefair.lombok' version '8.10.2'
 }
 
@@ -28,7 +28,7 @@ dependencies {
     implementation project(':db-connector')
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'
     testImplementation 'org.assertj:assertj-core:3.26.3'

diff --git a/schema/build.gradle b/schema/build.gradle
@@ -14,8 +14,8 @@ dependencies {
 
     implementation 'org.apache.commons:commons-lang3:3.17.0'
     implementation 'org.projectlombok:lombok:1.18.34'
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
     testImplementation 'org.assertj:assertj-core:3.26.3'
 }
 

diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle
@@ -10,8 +10,8 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.3'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
     testImplementation 'org.assertj:assertj-core:3.26.3'
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1'
     testImplementation 'org.postgresql:postgresql:42.7.4'