Upgrade to Spring Boot 3

config/checkstyle/checkstyle.xml

@@ -176,8 +176,7 @@
     </module>
     <module name="AbbreviationAsWordInName">
       <property name="ignoreFinal" value="false"/>
-      <property name="allowedAbbreviationLength" value="4"/>
-      <property name="allowedAbbreviations" value="HMCTS"/>
+      <property name="allowedAbbreviationLength" value="5"/>
     </module>
     <module name="OverloadMethodsDeclarationOrder"/>
     <module name="VariableDeclarationUsageDistance"/>

e2e/tests/smoke_test.js

@@ -6,9 +6,9 @@ const output = require('codeceptjs').output;
 Feature('Smoke tests @smoke-tests @fixed');
 
 Scenario(
-  'Sign in as local authority and create a case',
+  'Sign in as Local Authority and create a case',
   async ({ I, caseListPage }) => {
-    output.print('Smoke test triggered');
+    output.print('Smoke test triggered NOW');
     await I.goToPage(config.baseUrl, config.newSwanseaLocalAuthorityUserOne);
     const caseName = `Smoke test case (${moment().format('YYYY-MM-DD HH:MM')})`;
     const caseId = await I.createCaseSmokeTest(

service/build.gradle

@@ -17,9 +17,9 @@ plugins {
   id 'checkstyle'
   id 'jacoco'
   id 'io.spring.dependency-management' version '1.1.5'
-  id 'org.springframework.boot' version '2.7.18'
+  id 'org.springframework.boot' version '3.2.4'
   id 'com.github.ben-manes.versions' version '0.51.0'
-  id 'org.sonarqube' version '3.5.0.2730'
+  id 'org.sonarqube' version '5.0.0.4638'
   id 'project-report'
   id 'idea'
   id 'info.solidsoft.pitest' version '1.15.0'
@@ -221,17 +221,17 @@ task highLevelDataSetup(type: JavaExec, description: 'High level data step mock
 
 checkstyle {
   maxWarnings = 0
-  toolVersion = "8.45.1"
+  toolVersion = "10.14.0"
   // need to set configDirectory to rootDir otherwise submodule will use submodule/config/checkstyle
-  configDirectory.set(file("$rootDir/config/checkstyle"))
+  getConfigDirectory().set(new File(rootDir, 'config/checkstyle'))
 }
 
 jacocoTestReport {
   executionData(test, integration)
   reports {
-    xml.required = true
-    csv.required = false
-    xml.destination = file("${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml")
+    xml.getRequired().set(true)
+    csv.getRequired().set(false)
+    xml.outputLocation = file("${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml")
   }
 }
 
@@ -281,11 +281,13 @@ def versions = [
   reformLogging   : '5.1.7',
   springBoot      : springBoot.class.package.implementationVersion,
   log4j           : '2.23.1',
+  logbackVersion  : '1.5.6',
+  jackson         : '2.15.4',
   pdfbox          : '2.0.31',
-  mockito         : '4.11.0',
-  serenity        : '2.6.0',
+  mockito         : '5.2.0',
+  serenity        : '4.1.6',
   pact_version    : '4.1.7',
-  junit_jupiter   : '5.7.1',
+  junit_jupiter   : '5.10.2',
   lombok          : '1.18.32',
   pitest          : '1.15.0',
   gradlePitest    : '1.3.0',
@@ -300,64 +302,57 @@ dependencies {
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-quartz'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
+  implementation group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
   implementation group: 'org.springframework.retry', name: 'spring-retry'
 
+  implementation group: 'org.springframework.security', name: 'spring-security-oauth2-jose', version: '6.2.3'
+  implementation group: 'org.springframework.security', name: 'spring-security-oauth2-resource-server', version: '6.2.3'
+
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
 
-  implementation group: 'org.springframework.security', name: 'spring-security-config', version: '5.8.12'
-  implementation group: 'org.springframework.security', name: 'spring-security-oauth2-resource-server', version: '5.8.12'
-  implementation group: 'org.springframework.security', name: 'spring-security-oauth2-jose', version: '5.8.12'
-  implementation group: 'org.springframework.security', name: 'spring-security-core', version: '5.8.12'
-  implementation group: 'org.springframework.security', name: 'spring-security-crypto', version: '5.8.12'
-  implementation group: 'org.springframework.security', name: 'spring-security-web', version: '5.8.12'
-  implementation group: 'org.springframework.security', name: 'spring-security-oauth2-core', version: '5.8.12'
-  implementation group: 'org.springframework.boot', name: 'spring-boot-starter-logging', version: '2.7.18'
-  implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-hystrix', version: '2.2.10.RELEASE'
-  implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: versions.log4j
-  implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: versions.log4j
-  implementation group: 'org.apache.pdfbox', name: 'pdfbox', version: versions.pdfbox
   implementation group: 'org.bitbucket.b_c', name: 'jose4j', version: '0.9.6'
-  implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
-  implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.13'
+  implementation group: 'org.apache.pdfbox', name: 'pdfbox', version: versions.pdfbox
 
   implementation group: 'org.apache.commons', name: 'commons-text', version: '1.12.0'
   implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.11.0'
+  implementation 'org.apache.commons:commons-lang3:3.12.0'
 
   implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.1.8'
 
   implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '5.10.9'
 
-  implementation group: 'io.github.openfeign', name: 'feign-core', version: '11.10'
-  implementation group: 'org.yaml', name: 'snakeyaml', version: '2.2'
-  implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.3'
-  implementation group: 'org.flywaydb', name: 'flyway-core', version: '8.5.13'
+  implementation group: 'org.flywaydb', name: 'flyway-core', version: '10.15.2'
+  implementation group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '10.15.2'
 
   implementation group: 'uk.gov.hmcts.reform', name: 'logging', version: versions.reformLogging
   implementation group: 'uk.gov.hmcts.reform', name: 'logging-appinsights', version: versions.reformLogging
   implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'
-  implementation group: 'uk.gov.hmcts.reform', name: 'idam-client', version: '2.0.0'
-  implementation group: 'uk.gov.hmcts.reform', name: 'document-management-client', version: '7.0.0'
+  implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '3.0.3'
+  implementation group: 'com.github.hmcts', name: 'document-management-client', version: '7.0.1'
   implementation group: 'uk.gov.hmcts.reform', name: 'core-case-data-store-client', version: '4.7.6'
   implementation group: 'uk.gov.hmcts.reform', name: 'service-auth-provider-client', version: '4.0.0'
-  implementation group: 'uk.gov.hmcts.reform.auth', name: 'auth-checker-lib', version: '2.1.4'
-  implementation group: 'com.github.hmcts', name: 'send-letter-client', version: '3.0.16'
+  implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '3.0.0'
+  implementation group: 'com.github.hmcts', name: 'send-letter-client', version: '4.0.4'
   implementation group: 'uk.gov.service.notify', name: 'notifications-java-client', version: '3.17.3-RELEASE'
-  implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.89'
-  implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.89'
 
   implementation group: 'com.github.hmcts', name: 'ccd-case-document-am-client', version: '1.7.3'
 
-  implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'
-  implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
-
-  implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
+  implementation group: 'com.google.guava', name: 'guava', version: '33.1.0-jre'
 
   implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.17.1'
 
-  implementation group: 'net.minidev', name: 'json-smart', version: '2.5.1'
+  implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.4'
 
-  implementation group: 'org.springframework.boot', name: 'spring-boot-starter-mail'
+  implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: versions.log4j
+  implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: versions.log4j
+  implementation group: 'ch.qos.logback', name: 'logback-classic', version: versions.logbackVersion
+  implementation group: 'ch.qos.logback', name: 'logback-core', version: versions.logbackVersion
+
+  implementation group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '3.4.12'
+  implementation group: 'com.microsoft.azure', name: 'applicationinsights-web', version: '3.4.12'
+
+  implementation 'org.postgresql:postgresql:42.7.3'
 
   testImplementation group: 'org.pitest', name: 'pitest', version: '1.16.1'
   testImplementation group: 'info.solidsoft.gradle.pitest', name: 'gradle-pitest-plugin', version: '1.15.0'
@@ -382,15 +377,19 @@ dependencies {
   testImplementation group: 'org.mockito', name: 'mockito-inline', version: versions.mockito
 
   // Fortify client for Fortify scans
-  testImplementation 'com.github.hmcts:fortify-client:1.2.0:all'
+  testImplementation 'com.github.hmcts:fortify-client:1.4.1'
 
+  testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
   functionalTestImplementation group: 'net.serenity-bdd', name: 'serenity-core', version: versions.serenity
   functionalTestImplementation group: 'net.serenity-bdd', name: 'serenity-junit', version: versions.serenity
   functionalTestImplementation group: 'net.serenity-bdd', name: 'serenity-rest-assured', version: versions.serenity
   functionalTestImplementation group: 'net.serenity-bdd', name: 'serenity-spring', version: versions.serenity
+  functionalTestImplementation group: 'io.rest-assured', name: 'rest-assured'
+  functionalTestImplementation group: 'net.javacrumbs.json-unit', name: 'json-unit-assertj', version: '3.2.7'
   functionalTestCompileOnly group: 'org.projectlombok', name: 'lombok', version: versions.lombok
   functionalTestAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: versions.lombok
+
   functionalTestImplementation sourceSets.main.runtimeClasspath
   functionalTestImplementation sourceSets.test.runtimeClasspath
 
@@ -409,11 +408,11 @@ dependencies {
   contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter
   contractTestRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: versions.junit_jupiter
   contractTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versions.junit_jupiter
-  contractTestRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.8.2'
-  contractTestImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.5'
+  contractTestRuntimeOnly group: 'org.junit.platform', name: 'junit-platform-commons', version: '1.10.2'
+  contractTestImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: versions.jackson
+  contractTestImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: versions.jackson
+  contractTestImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: versions.jackson
   contractTestImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '4.1.1'
-  contractTestImplementation group: 'org.springframework.cloud', name: 'spring-cloud-netflix-ribbon', version: '2.2.10.RELEASE'
-  contractTestImplementation group: 'com.netflix.ribbon', name: 'ribbon-core', version: '2.7.18'
   contractTestImplementation group: 'uk.gov.hmcts.reform', name: 'core-case-data-store-client', version: '4.7.6'
   contractTestImplementation group: 'com.google.guava', name: 'guava', version: '30.1.1-jre'
 }
@@ -454,7 +453,7 @@ pitest {
 
 dependencyManagement {
   imports {
-    mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2021.0.9'
+    mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
   }
 }
 
@@ -507,3 +506,7 @@ bootWithCCD {
     environment 'MANAGE_CASE_S2S_AUTHORISED_SERVICES', 'ccd_gw,xui_webapp,ccd_data,fpl_case_service'
   }
 }
+
+configurations.all {
+  exclude group: 'com.vaadin.external.google', module: 'android-json'
+}

service/src/contractTest/java/uk/gov/hmcts/reform/rd/client/ReferenceDataOrganisationalExternalUsersConsumerTest.java

@@ -15,7 +15,8 @@
 
 @PactTestFor(providerName = "referenceData_organisationalExternalUsers", port = "8892")
 @TestPropertySource(
-    properties = "rd_professional.api.url=localhost:8892")
+    properties = {"rd_professional.api.url=localhost:8892", "rd_judicial.api.url=localhost:8893",
+        "rd_staff.api.url=localhost:8894"})
 public class ReferenceDataOrganisationalExternalUsersConsumerTest extends ReferenceDataConsumerTestBase {
 
 

service/src/contractTest/java/uk/gov/hmcts/reform/rd/client/ReferenceDataOrganisationalInternalUsersConsumerTest.java

@@ -15,7 +15,8 @@
 
 @PactTestFor(providerName = "referenceData_organisationalInternal", port = "8894")
 @TestPropertySource(
-    properties = "rd_professional.api.url=localhost:8894")
+    properties = {"rd_professional.api.url=localhost:8894", "rd_judicial.api.url=localhost:8895",
+        "rd_staff.api.url=localhost:8896"})
 public class ReferenceDataOrganisationalInternalUsersConsumerTest extends ReferenceDataConsumerTestBase {
 
     @Pact(provider = "referenceData_organisationalInternal", consumer = "fpl_ccdConfiguration")

service/src/contractTest/java/uk/gov/hmcts/reform/rd/client/ReferenceDataProfessionalExternalUsersConsumerTest.java

@@ -19,7 +19,8 @@
 
 @PactTestFor(providerName = "referenceData_professionalExternalUsers", port = "8892")
 @TestPropertySource(
-    properties = "rd_professional.api.url=localhost:8892")
+    properties = {"rd_professional.api.url=localhost:8892", "rd_judicial.api.url=localhost:8893",
+        "rd_staff.api.url=localhost:8894"})
 public class ReferenceDataProfessionalExternalUsersConsumerTest extends ReferenceDataConsumerTestBase {
 
     private static final String USER_EMAIL = "UserEmail";

service/src/functionalTest/java/uk/gov/hmcts/reform/fpl/AdminManagesOrdersApiTests.java

@@ -1,7 +1,10 @@
 package uk.gov.hmcts.reform.fpl;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import uk.gov.hmcts.reform.fpl.enums.C29ActionsPermitted;
 import uk.gov.hmcts.reform.fpl.enums.EnglandOffices;
 import uk.gov.hmcts.reform.fpl.enums.PlacedUnderOrder;
@@ -15,8 +18,6 @@
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;

service/src/functionalTest/java/uk/gov/hmcts/reform/fpl/model/User.java

@@ -1,10 +1,8 @@
 package uk.gov.hmcts.reform.fpl.model;
 
 import lombok.Data;
-import org.springframework.boot.context.properties.ConstructorBinding;
 
 @Data
-@ConstructorBinding
 public class User {
 
     private final String name;

service/src/functionalTest/java/uk/gov/hmcts/reform/fpl/service/CaseService.java

@@ -1,6 +1,7 @@
 package uk.gov.hmcts.reform.fpl.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.restassured.http.ContentType;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.serenitybdd.rest.SerenityRest;
@@ -19,7 +20,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 
-import static com.gargoylesoftware.htmlunit.util.MimeType.APPLICATION_JSON;
 import static java.lang.String.format;
 import static java.net.HttpURLConnection.HTTP_OK;
 import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
@@ -45,7 +45,7 @@ public boolean hasCaseAccess(User user, CaseData caseData) {
         int status = SerenityRest
             .given()
             .headers(authenticationService.getAuthorizationHeaders(user))
-            .contentType(APPLICATION_JSON)
+            .contentType(ContentType.JSON)
             .get("/testing-support/case/" + caseData.getId())
             .thenReturn()
             .statusCode();
@@ -64,7 +64,7 @@ public CaseData createCase(CaseData caseData, User user) {
         CaseDetails caseDetails = SerenityRest
             .given()
             .headers(authenticationService.getAuthorizationHeaders(user))
-            .contentType(APPLICATION_JSON)
+            .contentType(ContentType.JSON)
             .body(Map.of())
             .post("/testing-support/case/create")
             .then()
@@ -81,7 +81,7 @@ public CaseData createCase(CaseData caseData, User user) {
         if (populateData) {
             SerenityRest
                 .given()
-                .contentType(APPLICATION_JSON)
+                .contentType(ContentType.JSON)
                 .headers(authenticationService.getAuthorizationHeaders(user))
                 .body(Map.of("state", Optional.ofNullable(caseData.getState())
                     .map(State::getValue)
@@ -100,7 +100,7 @@ public CallbackResponse callback(CaseData caseData, User user, String callback)
         AboutToStartOrSubmitCallbackResponse response = SerenityRest
             .given()
             .headers(authenticationService.getAuthorizationHeaders(user))
-            .contentType(APPLICATION_JSON)
+            .contentType(ContentType.JSON)
             .body(toCallbackRequest(caseData))
             .post(callback)
             .then()
@@ -122,7 +122,7 @@ public void submittedCallback(CaseData caseData, CaseData caseDataBefore, User u
         SerenityRest
             .given()
             .headers(authenticationService.getAuthorizationHeaders(user))
-            .contentType(APPLICATION_JSON)
+            .contentType(ContentType.JSON)
             .body(toCallbackRequest(caseData, caseDataBefore))
             .post(callback)
             .then()
@@ -133,7 +133,7 @@ private CaseData getCase(Long id, User user) {
         CaseDetails caseDetails = SerenityRest
             .given()
             .headers(authenticationService.getAuthorizationHeaders(user))
-            .contentType(APPLICATION_JSON)
+            .contentType(ContentType.JSON)
             .body(Map.of())
             .get("/testing-support/case/" + id)
             .then()

service/src/functionalTest/java/uk/gov/hmcts/reform/fpl/service/ScenarioService.java

@@ -1,6 +1,7 @@
 package uk.gov.hmcts.reform.fpl.service;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.restassured.http.ContentType;
 import lombok.RequiredArgsConstructor;
 import net.serenitybdd.rest.SerenityRest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +12,6 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 
-import static com.gargoylesoftware.htmlunit.util.MimeType.APPLICATION_JSON;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
@@ -40,7 +40,7 @@ public String executeScenario(Scenario scenario) {
             .given()
             .headers(authenticationService.getAuthorizationHeaders(testConfiguration.getUsers()
                 .get(scenario.getRequest().getUser())))
-            .contentType(APPLICATION_JSON)
+            .contentType(ContentType.JSON)
             .body(scenario.getRequest().getDataAsString())
             .post(scenario.getRequest().getUri())
             .then()

service/src/integrationTest/java/uk/gov/hmcts/reform/fpl/controllers/AbstractCallbackTest.java

@@ -28,7 +28,6 @@ public abstract class AbstractCallbackTest extends AbstractTest {
 
     private final String eventName;
     private final String eventId;
-
     protected static final long ASYNC_METHOD_CALL_TIMEOUT = 10000;
 
     protected AbstractCallbackTest(String eventName) {