Merge branch 'main' into old_hapi

Author: anthony-nhs

pom.xml

@@ -291,7 +291,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.3</version>
+                <version>3.5.4</version>
             </plugin>
             <plugin>
                 <groupId>dev.aspectj</groupId>