CCD-6618 : Reduce unnecessary dependencies

Jenkinsfile_CNP

@@ -60,9 +60,6 @@ env.DEFAULT_COLLECTION_ASSERTION_MODE="UNORDERED"
 // Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctspublic ACR
 env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/"
 
-// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctspublic ACR
-env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/"
-
 withPipeline(type, product, app) {
     onMaster {
         enableSlackNotifications('#ccd-master-builds')

Jenkinsfile_nightly

@@ -61,9 +61,6 @@ env.DEFAULT_COLLECTION_ASSERTION_MODE="UNORDERED"
 // Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctspublic ACR
 env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/"
 
-// Prevent Docker hub rate limit errors by ensuring that testcontainers uses images from hmctspublic ACR
-env.TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX = "hmctspublic.azurecr.io/imported/"
-
 withNightlyPipeline(type, product, component) {
 
     stage('Wait for ccd-user-profile-api job') {

aat/build.gradle

@@ -28,7 +28,7 @@ configurations {
 }
 
 dependencies {
-    implementation group: 'org.awaitility', name: 'awaitility', version: '3.1.6'
+    implementation group: 'org.awaitility', name: 'awaitility', version: '4.3.0'
 }
 
 tasks.named("processAatResources") {

build.gradle

@@ -3,16 +3,16 @@ plugins {
     id 'jacoco'
     id 'idea'
     id 'eclipse'
-    id 'org.springframework.boot' version '3.4.1'
+    id 'org.springframework.boot' version '3.5.8'
     id 'io.spring.dependency-management' version '1.1.7'
     id 'com.github.ben-manes.versions' version '0.51.0'
-    id 'org.sonarqube' version '6.0.1.5171'
-    id 'com.github.kt3k.coveralls' version "2.12.2"
+    id 'org.sonarqube' version '7.1.0.6387'
+    id 'com.github.kt3k.coveralls' version '2.12.2'
     id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
     id 'info.solidsoft.pitest' version '1.15.0' apply(false)
     id 'org.jetbrains.gradle.plugin.idea-ext' version "1.3"
     id 'uk.gov.hmcts.java' version '0.12.67'
-    id 'org.owasp.dependencycheck' version '11.1.1'
+    id 'org.owasp.dependencycheck' version '12.1.3'
 }
 
 application {
@@ -32,27 +32,26 @@ tasks.register("printSuppressionFile") {
 
 ext {
     set('elasticsearch.version', '8.16.2')
-    set('spring-framework.version', '6.2.1')
-    set('spring-security.version', '6.4.2')
-    set('springCloudVersion', '2024.0.0')
+    set('spring-framework.version', '6.2.14')
+    set('spring-security.version', '6.5.7')
+    set('springCloudVersion', '2025.0.0')
     set('jackson.version', '2.16.0')
     set('snakeyaml.version', '2.3')
     set('log4j2.version', '2.24.3')
 
-    junitJupiterVersion = '5.11.4'
-    junitVintageVersion = '5.11.4'
+    junit = '5.13.4'
+    junitPlatform = '1.13.4'
     springDocVersion = '2.8.13'
     hamcrestVersion = '3.0'
     flywayVersion = '10.22.0'
-    reformLogging= '6.1.9'
+    reformLogging = '6.1.9'
     apachePoiVersion = '5.4.1'
     appInsightsVersion = '2.6.4'
     restAssuredVersion = '5.5.6'
     groovyVersion = '4.0.28'
     lombokVersion = '1.18.42'
     jjwtVersion = '0.13.0'
     feignJackson = '13.6'
-    gsonVersion = '2.13.2'
     elasticSearchVersion = '7.17.29'
     testcontainersVersion = '1.21.3'
     ccdTestDefinitionVersion = '7.27.7-prerelease-CME-537'
@@ -65,6 +64,18 @@ ext {
             'method'     : 99,
             'class'      : 90
     ]
+
+    libraries = [
+        junit5: [
+            "org.junit.jupiter:junit-jupiter-api:${junit}",
+            "org.junit.jupiter:junit-jupiter-engine:${junit}",
+            "org.junit.jupiter:junit-jupiter-params:${junit}",
+            "org.junit.platform:junit-platform-commons:${junitPlatform}",
+            "org.junit.platform:junit-platform-engine:${junitPlatform}",
+            "org.junit.platform:junit-platform-launcher:${junitPlatform}",
+            "org.apiguardian:apiguardian-api:1.1.2"
+        ]
+    ]
 }
 
 dependencyManagement {
@@ -99,8 +110,6 @@ allprojects {
 
         // start::CVE Vulnerability dependency overrides 
 
-        implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.6.0' // spring-cloud-starter-openfeign
-        implementation group: 'commons-io', name: 'commons-io', version: '2.20.0' // spring-cloud-starter-openfeign
 
         // end::CVE Vulnerability dependency overrides
 
@@ -115,13 +124,7 @@ allprojects {
 
         implementation group: 'net.minidev', name: 'json-smart', version: '2.6.0'
 
-        // CVE-2021-42550
-        implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.18'
-        implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.18'
-
-        testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', {
-            exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
-        }
+        testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
 
         testImplementation group: 'io.rest-assured', name: 'rest-assured', version: restAssuredVersion
         testImplementation group: 'io.rest-assured', name: 'xml-path', version: restAssuredVersion
@@ -197,14 +200,6 @@ subprojects { subproject ->
 
         // start::CVE Vulnerability dependency overrides 
 
-        implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '10.5' // spring-boot-starter-oauth2-client
-        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.20.0' // azure-storage
-        implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.5.0' // poi-ooxml
-
-
-
-        testImplementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2' // spring-cloud-contract-stub-runner
-        testImplementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.11.0' // spring-cloud-contract-stub-runner
 
         // end::CVE Vulnerability dependency overrides
 
@@ -222,12 +217,11 @@ subprojects { subproject ->
 
         // HMCTS
         implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '5.3.3'
-        implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '3.0.5'
-        implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: reformLogging
+        implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '3.0.4'
+        implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.9'
 
-        implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.9.3'
-        implementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion
-        implementation group: 'com.google.guava', name: 'guava', version: '33.5.0-jre'
+        implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.2.2'
+        implementation group: 'com.google.code.gson', name: 'gson', version: '2.13.2'
         implementation group: 'com.microsoft.azure', name: 'applicationinsights-logging-logback', version: appInsightsVersion
         implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: appInsightsVersion
         implementation group: 'com.microsoft.azure', name: 'azure-storage', version: '8.6.6'
@@ -251,6 +245,7 @@ subprojects { subproject ->
         compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
         annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
 
+        testImplementation libraries.junit5
         testImplementation libs.mockito
         mockitoAgent(libs.mockito) {
             transitive = false;
@@ -262,27 +257,21 @@ subprojects { subproject ->
         testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
         testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap'
         testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-contract-stub-runner'
-        testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '4.1.4'
-
-        // To avoid compiler warnings about @API annotations in JUnit5 code.
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion
-        testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion
-        testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: junitVintageVersion
-        testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: junitJupiterVersion
-        testImplementation group: 'org.apiguardian', name: 'apiguardian-api', version: '1.1.2'
+        testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock'
         testImplementation group: 'org.testcontainers', name: 'postgresql', version: testcontainersVersion
         testImplementation group: 'org.hamcrest', name: 'hamcrest-core', version: hamcrestVersion
         testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: hamcrestVersion
 
-        testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.20.0'
+        testImplementation group: 'com.google.guava', name: 'guava', version: '33.5.0-jre'
+        testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: beftaFwVersion
+        testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: ccdTestDefinitionVersion
         testImplementation group: 'com.github.npathai', name: 'hamcrest-optional', version: '2.0.0'
-        testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
+        testImplementation group: 'info.solidsoft.gradle.pitest', name: 'gradle-pitest-plugin', version: '1.15.0'
         testImplementation group: 'io.github.openfeign', name: 'feign-jackson', version: feignJackson
         testImplementation group: 'io.github.openfeign.form', name: 'feign-form', version: '3.8.0'
         testImplementation group: 'org.exparity', name: 'hamcrest-date', version: '2.0.8'
-        testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: ccdTestDefinitionVersion
-        testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: beftaFwVersion
-        testImplementation group: 'info.solidsoft.gradle.pitest', name: 'gradle-pitest-plugin', version: '1.15.0'
+        testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
+        testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.20.0'
     }
 
     // from https://github.com/junit-team/junit5/issues/1024'

domain/build.gradle

@@ -34,7 +34,7 @@ bootJar {
 
 ext {
     mapstructGenSourceDir = 'build/classes/java/main'
-    orgMapstructVersion='1.3.0.Final'
+    mapstructVersion='1.6.3'
 }
 
 dependencies {
@@ -44,12 +44,12 @@ dependencies {
     }
 
     implementation group: 'commons-validator', name: 'commons-validator', version: '1.10.1'
-    implementation "org.mapstruct:mapstruct-jdk8:${orgMapstructVersion}"
-    implementation "org.mapstruct:mapstruct-processor:${orgMapstructVersion}"
+    implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+    implementation "org.mapstruct:mapstruct-processor:${mapstructVersion}"
     testImplementation project(":app-insights").sourceSets.main.output
     testImplementation project(":repository").sourceSets.test.output
 
-    annotationProcessor "org.mapstruct:mapstruct-processor:${orgMapstructVersion}"
+    annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
 }
 
 idea {

repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/Category.java

@@ -1,12 +1,12 @@
 package uk.gov.hmcts.ccd.definition.store.repository.model;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Data;
 
 import java.time.LocalDate;
 
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Data
 public class Category {
 

repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/ChallengeQuestion.java

@@ -1,10 +1,10 @@
 package uk.gov.hmcts.ccd.definition.store.repository.model;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Data;
 
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Data
 public class ChallengeQuestion {
 

repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/RoleToAccessProfiles.java

@@ -1,11 +1,12 @@
 package uk.gov.hmcts.ccd.definition.store.repository.model;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import java.util.Date;
 import lombok.Data;
 
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+import java.util.Date;
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Data
 public class RoleToAccessProfiles {
 

repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/SearchCriteria.java

@@ -1,12 +1,12 @@
 package uk.gov.hmcts.ccd.definition.store.repository.model;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Data;
 
 import java.util.Date;
 
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Data
 public class SearchCriteria {
 

repository/src/main/java/uk/gov/hmcts/ccd/definition/store/repository/model/SearchParty.java

@@ -1,12 +1,12 @@
 package uk.gov.hmcts.ccd.definition.store.repository.model;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Data;
 
 import java.util.Date;
 
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 @Data
 public class SearchParty {