Merge branch 'main' into NIAD-1137/OutputMessageWrapperMapper

Author: Jonopono123

e2e-tests/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     testImplementation 'org.awaitility:awaitility:4.3.0'
     testImplementation "org.assertj:assertj-core:3.27.6"
     testImplementation 'ch.qos.logback:logback-classic:1.5.20'
-    testImplementation 'org.xmlunit:xmlunit-assertj3:2.10.4'
+    testImplementation 'org.xmlunit:xmlunit-assertj3:2.11.0'
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.5.1'
 
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

mock-mhs-adaptor/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.5.6'
+	id 'org.springframework.boot' version '3.5.7'
 	id 'io.spring.dependency-management' version '1.1.7'
 	id 'java'
 	id "io.freefair.lombok" version "9.0.0"

service/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '3.5.0'
+	id 'org.springframework.boot' version '3.5.7'
 	id 'io.spring.dependency-management' version '1.1.7'
 	id 'java'
 	id "checkstyle"
@@ -10,7 +10,7 @@ plugins {
 
 	// Mutation testing
 	id 'info.solidsoft.pitest' version '1.15.0'
-	id 'com.arcmutate.github' version '2.2.3'
+	id 'com.arcmutate.github' version '2.2.4'
 }
 
 spotbugs {

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/ObservationToNarrativeStatementMapperTest.java

@@ -119,7 +119,7 @@ void When_MappingObservationJsonWithNestedTrue_Expect_NarrativeStatementXmlOutpu
 
         String outputMessage = observationToNarrativeStatementMapper.mapObservationToNarrativeStatement(parsedObservation, true);
 
-        assertThat(outputMessage).isEqualToIgnoringWhitespace(expectedOutputMessage);
+        assertThat(outputMessage).isEqualTo(expectedOutputMessage);
     }
 
     @Test