diff --git a/build.gradle b/build.gradle index f7ddd3fe..5143d44c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath("org.springframework.boot:spring-boot-gradle-plugin:3.1.2") + classpath("org.springframework.boot:spring-boot-gradle-plugin:3.3.4") } dependencies { classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.0.3225" @@ -12,17 +12,17 @@ plugins { id 'eclipse' id 'idea' id 'application' - id 'io.spring.dependency-management' version '1.1.3' - id 'org.springframework.boot' version '3.1.2' - id 'org.owasp.dependencycheck' version '8.3.1' + id 'io.spring.dependency-management' version '1.1.6' + id 'org.springframework.boot' version '3.3.4' + id 'org.owasp.dependencycheck' version '8.4.3' id 'se.patrikerdes.use-latest-versions' version '0.2.18' - id 'com.github.ben-manes.versions' version '0.47.0' - id 'org.sonarqube' version '4.3.0.3225' + id 'com.github.ben-manes.versions' version '0.51.0' + id 'org.sonarqube' version '4.4.1.3373' id 'jacoco' id "com.github.kt3k.coveralls" version "2.12.2" - id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.23' - id "info.solidsoft.pitest" version '1.9.11' - id 'uk.gov.hmcts.java' version '0.12.43' + id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25' + id "info.solidsoft.pitest" version '1.15.0' + id 'uk.gov.hmcts.java' version '0.12.63' } dependencyUpdates.resolutionStrategy { @@ -123,11 +123,11 @@ java { } ext { - sl4jVersion = '2.0.7' - lombokVersion = '1.18.28' - reformLogging = '6.0.1' - springCloudVersion = '2022.0.3' - springSecurity = '6.1.5' + sl4jVersion = '2.0.16' + lombokVersion = '1.18.34' + reformLogging = '6.1.6' + springCloudVersion = '2022.0.5' + springSecurity = '6.3.3' limits = [ 'instruction': 6, 'branch' : 8, @@ -149,7 +149,7 @@ dependencyManagement { mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" } dependencies { - dependencySet(group: 'org.apache.tomcat.embed', version: '10.1.26') { + dependencySet(group: 'org.apache.tomcat.embed', version: '10.1.31') { entry 'tomcat-embed-core' entry 'tomcat-embed-el' entry 'tomcat-embed-websocket' @@ -159,7 +159,7 @@ dependencyManagement { dependencies { - implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.78' + implementation group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: '1.78.1' compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: reformLogging @@ -178,21 +178,21 @@ dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator' implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web' - implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.2.0' - implementation "org.flywaydb:flyway-core:9.21.1" - implementation group: 'org.yaml', name: 'snakeyaml', version: '2.1' - implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.0.1' - runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.6.1' - implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '2.1.5' + implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.6.0' + implementation "org.flywaydb:flyway-core:9.22.3" + implementation group: 'org.yaml', name: 'snakeyaml', version: '2.3' + implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.1.0' + runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.7.4' + implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '2.3.0' constraints { - implementation('com.google.guava:guava:33.1.0-jre') { + implementation('com.google.guava:guava:33.3.1-jre') { because 'previous versions of this transitive dependency have CVEs' } } implementation group: 'javax.inject', name: 'javax.inject', version: '1' implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5' - implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0' + implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0' implementation group: 'com.sun.mail', name: 'mailapi', version: '2.0.1' implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14' @@ -204,24 +204,24 @@ dependencies { implementation group: 'org.springframework.security', name: 'spring-security-web', version: springSecurity implementation group: 'org.springframework.security', name: 'spring-security-crypto', version: springSecurity - aatImplementation 'com.github.hmcts:service-auth-provider-java-client:5.1.0' - codacy 'com.github.codacy:codacy-coverage-reporter:13.13.7' + aatImplementation 'com.github.hmcts:service-auth-provider-java-client:5.2.0' + codacy 'com.github.codacy:codacy-coverage-reporter:13.13.13' testImplementation "org.junit.jupiter:junit-jupiter-api" testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine" testRuntimeOnly "org.junit.vintage:junit-vintage-engine" - testImplementation "org.junit.jupiter:junit-jupiter:5.10.0" - testImplementation "org.testcontainers:testcontainers:1.18.3" - testImplementation "org.testcontainers:junit-jupiter:1.18.3" + testImplementation "org.junit.jupiter:junit-jupiter:5.11.2" + testImplementation "org.testcontainers:testcontainers:1.20.2" + testImplementation "org.testcontainers:junit-jupiter:1.20.2" testImplementation 'org.testcontainers:postgresql' testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' - testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.22.2' - testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.0.2' + testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.23.0' + testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.1.0' //testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.2' - testImplementation 'com.github.hmcts:fortify-client:1.3.0:all' - testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.11' + testImplementation 'com.github.hmcts:fortify-client:1.4.4:all' + testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0' } // end::dependencies[] diff --git a/charts/ccd-user-profile-api/Chart.yaml b/charts/ccd-user-profile-api/Chart.yaml index 58db0843..774ef11b 100644 --- a/charts/ccd-user-profile-api/Chart.yaml +++ b/charts/ccd-user-profile-api/Chart.yaml @@ -2,11 +2,11 @@ description: CCD User profile name: ccd-user-profile-api apiVersion: v2 home: https://github.com/hmcts/ccd-user-profile-api -version: 1.6.15 +version: 1.6.16 maintainers: - name: HMCTS CCD Dev Team email: ccd-devops@HMCTS.NET dependencies: - name: java - version: 5.2.0 + version: 5.2.1 repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/' diff --git a/docker/database/Dockerfile b/docker/database/Dockerfile index 0857cb83..2d79e982 100644 --- a/docker/database/Dockerfile +++ b/docker/database/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:11.1 +FROM postgres:11.16 USER postgres LABEL maintainer="https://github.com/hmcts/ccd-user-profile-api" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 033e24c4..a4b76b95 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..df97d72b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index fcb6fca1..f5feea6d 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +85,9 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +148,7 @@ 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=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | 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=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,11 +205,11 @@ 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 -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85b..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/infrastructure/.terraform-version b/infrastructure/.terraform-version index d615fd0c..fee0a278 100644 --- a/infrastructure/.terraform-version +++ b/infrastructure/.terraform-version @@ -1 +1 @@ -1.9.4 +1.9.7