Update all non-major dependencies (#738)

* Update all non-major dependencies

* Fixing dependency for spring bootstrap. Added TODO for an upgrade

* Reverting ccd-case-document-am-client to older version

* Updating renovate config to no longer check for cdam upgrade

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: JakeCohenSol <[email protected]>

.github/renovate.json

@@ -14,6 +14,10 @@
       "groupName": "all non-major dependencies",
       "groupSlug": "all-minor-patch",
       "automerge": true
+    },
+    {
+      "packagePatterns": ["^ccd-case-document-am-client$"],
+      "enabled": false
     }
   ],
   "timezone": "Europe/London",

Dockerfile

@@ -1,5 +1,5 @@
  # renovate: datasource=github-releases depName=microsoft/ApplicationInsights-Java
-ARG APP_INSIGHTS_AGENT_VERSION=3.4.13
+ARG APP_INSIGHTS_AGENT_VERSION=3.4.17
 # Application image
 FROM hmctspublic.azurecr.io/base/java:17-distroless
 

build.gradle

@@ -13,15 +13,15 @@ plugins {
     id 'checkstyle'
     id 'jacoco'
     id 'pmd'
-    id 'com.github.ben-manes.versions' version '0.42.0'
-    id "info.solidsoft.pitest" version '1.9.0'
-    id 'io.spring.dependency-management' version '1.1.0'
-    id 'org.owasp.dependencycheck' version '8.2.1'
-    id 'org.sonarqube' version '3.0'
-    id 'org.springframework.boot' version '2.7.14'
-    id 'uk.gov.hmcts.java' version '0.12.43'
-    id 'au.com.dius.pact' version '4.2.14'
-    id "io.freefair.lombok" version "6.2.0"
+    id 'com.github.ben-manes.versions' version '0.49.0'
+    id "info.solidsoft.pitest" version '1.15.0'
+    id 'io.spring.dependency-management' version '1.1.3'
+    id 'org.owasp.dependencycheck' version '8.4.0'
+    id 'org.sonarqube' version '3.5.0.2730'
+    id 'org.springframework.boot' version '2.7.16'
+    id 'uk.gov.hmcts.java' version '0.12.45'
+    id 'au.com.dius.pact' version '4.6.3'
+    id "io.freefair.lombok" version "6.6.3"
 }
 
 apply plugin: 'java'
@@ -30,19 +30,19 @@ apply plugin: 'project-report'
 apply plugin: 'idea'
 
 def versions = [
-    junit              : '5.8.2',
-    junitPlatform      : '1.7.2',
+    junit              : '5.10.0',
+    junitPlatform      : '1.10.0',
     gradlePitest       : '1.5.1',
-    pitest             : '1.9.0',
+    pitest             : '1.15.0',
     reformLogging      : '5.1.7',
     reformHealthStarter: '0.0.5',
-    restAssured        : '5.3.0',
-    serenity           : '3.6.22',
+    restAssured        : '5.3.2',
+    serenity           : '3.9.8',
     sonarPitest        : '0.5',
     springHystrix      : '2.2.10.RELEASE',
     pact_version       : '4.1.38',
-    springDoc          : '1.6.8',
-    springCloud        : '3.1.6'
+    springDoc          : '1.7.0',
+    springCloud        : '3.1.8'
 ]
 
 mainClassName = 'uk.gov.hmcts.reform.iacasedocumentsapi.Application'
@@ -151,13 +151,13 @@ configurations {
 
 checkstyle {
     maxWarnings = 0
-    toolVersion = '10.12.0'
+    toolVersion = '10.12.4'
     configDirectory.set(new File(rootDir, 'config/checkstyle'))
 }
 
 
 pmd {
-    toolVersion = '6.41.0'
+    toolVersion = '6.55.0'
     ignoreFailures = true
     sourceSets = [sourceSets.main, sourceSets.test, sourceSets.integrationTest, sourceSets.functionalTest, sourceSets.smokeTest]
     reportsDir = file("$project.buildDir/reports/pmd")
@@ -263,7 +263,7 @@ repositories {
 dependencyManagement {
     dependencies {
 
-        dependencySet(group: 'org.yaml', version: '2.0') {
+        dependencySet(group: 'org.yaml', version: '2.2') {
             entry 'snakeyaml'
         }
 
@@ -309,7 +309,7 @@ dependencies {
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
     implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: versions.springCloud
-    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: versions.springCloud
+    implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: '3.1.7'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
 
 
@@ -320,10 +320,10 @@ dependencies {
 
 
     // CVE-2019-17195
-    implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.22'
+    implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.36'
 
     // CVE-2021-27568
-    implementation group: 'net.minidev', name: 'json-smart', version: '2.4.10'
+    implementation group: 'net.minidev', name: 'json-smart', version: '2.5.0'
 
 
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core'
@@ -334,18 +334,18 @@ dependencies {
 
     implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: versions.springDoc
 
-    implementation group: 'com.sun.xml.bind', name: 'jaxb-osgi', version: '2.3.3'
+    implementation group: 'com.sun.xml.bind', name: 'jaxb-osgi', version: '2.3.8'
 
     implementation group: 'uk.gov.hmcts.reform', name: 'document-management-client', version: '7.0.0'
     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: 'uk.gov.hmcts.reform', name: 'service-auth-provider-client', version: '3.1.2'
+    implementation group: 'uk.gov.hmcts.reform', name: 'service-auth-provider-client', version: '3.1.4'
     implementation group: 'uk.gov.hmcts.reform', name: 'properties-volume-spring-boot-starter', version: '0.1.0'
 
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.8.0'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.14.0'
 
-    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
+    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
 
     implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.0.80'
     implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.0.80'
@@ -354,10 +354,10 @@ dependencies {
     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.2-jre'
 
-    annotationProcessor 'org.projectlombok:lombok:1.18.12'
-    compileOnly 'org.projectlombok:lombok:1.18.12'
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
+    compileOnly 'org.projectlombok:lombok:1.18.30'
 
-    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.6.28'
+    testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '3.12.4'
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
     testImplementation group: 'org.springframework.security', name: 'spring-security-test', version: versions.springSecurity
 
@@ -375,16 +375,16 @@ dependencies {
 
     testImplementation 'pl.pragmatists:JUnitParams:1.1.1'
 
-    testImplementation(group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '3.1.6') {
+    testImplementation(group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '3.1.8') {
         exclude group: "com.github.tomakehurst", module: "wiremock-standalone"
     }
 
     //pact contract testing
-    contractTestImplementation group: 'au.com.dius.pact.consumer', name: 'junit5', version: "4.2.14"
+    contractTestImplementation group: 'au.com.dius.pact.consumer', name: 'junit5', version: "4.6.3"
 
-    contractTestImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
-    contractTestRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0")
-    contractTestImplementation('org.junit.jupiter:junit-jupiter-api:5.3.2')
+    contractTestImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
+    contractTestRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    contractTestImplementation('org.junit.jupiter:junit-jupiter-api:5.10.0')
 
     integrationTestImplementation sourceSets.main.runtimeClasspath
     integrationTestImplementation sourceSets.test.runtimeClasspath

charts/ia-case-documents-api/Chart.yaml

@@ -1,12 +1,12 @@
 apiVersion: v2
 name: ia-case-documents-api
 home: https://github.com/hmcts/ia-case-documents-api
-version: 0.0.33
+version: 0.0.34
 description: Immigration & Asylum Case Documents Service
 maintainers:
   - name: HMCTS Immigration & Asylum Team
     email: [email protected]
 dependencies:
   - name: java
-    version: 4.0.13
+    version: 4.2.0
     repository: https://hmctspublic.azurecr.io/helm/v1/repo/

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,6 +85,9 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -141,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -194,10 +197,6 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

infrastructure/.terraform-version

@@ -1 +1 @@
-1.3.7
+1.6.0

infrastructure/state.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.47.0"
+      version = "~> 3.75.0"
     }
   }
 }

src/main/java/uk/gov/hmcts/reform/iacasedocumentsapi/infrastructure/clients/CdamDocumentDownloadClient.java

@@ -24,6 +24,7 @@ public CdamDocumentDownloadClient(
         this.accessTokenProvider = accessTokenProvider;
     }
 
+    //TODO Upgrade ccd-case-document-am-client. Need to get UUID, string cannot be converted.
     public Resource download(String documentBinaryUrl) {
         ResponseEntity<Resource> resourceResponseEntity = caseDocumentClient.getDocumentBinary(
             accessTokenProvider.getAccessToken(),