From 336bcc229c1b042117dc4de728bd02e6ad23bf69 Mon Sep 17 00:00:00 2001 From: Majid-justice <81159704+Majid-justice@users.noreply.github.com> Date: Tue, 5 Nov 2024 17:25:33 +0000 Subject: [PATCH] update packages (#2651) * update LaunchDarkly to version 7.5.0 * update packages * revert httpclient5 to 5.3.1 * update * update * update package * revert httpclient5 to 5.3.1 --- build.gradle | 28 +++++++++---------- infrastructure/.terraform-version | 2 +- .../sendletter/FunctionalTestSuite.java | 4 ++- .../resources/docker/docker-compose.yml | 2 +- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index e369171a1..c0eb157bf 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import org.flywaydb.gradle.task.FlywayMigrateTask buildscript { ext { - flywayVersion = '10.17.3' + flywayVersion = '10.18.0' postgresqlVersion = '42.7.4' } dependencies { @@ -21,9 +21,9 @@ plugins { id 'org.springframework.boot' version '3.3.3' id 'org.owasp.dependencycheck' version '10.0.4' id 'com.github.ben-manes.versions' version '0.51.0' - id 'org.sonarqube' version '5.0.0.4638' + id 'org.sonarqube' version '5.1.0.4882' id 'info.solidsoft.pitest' version '1.15.0' - id 'au.com.dius.pact' version '4.6.4' + id 'au.com.dius.pact' version '4.6.15' } flyway { @@ -147,7 +147,7 @@ checkstyle { } pmd { - toolVersion = "6.55.0" + toolVersion = "7.7.0" ignoreFailures = true incrementalAnalysis = true sourceSets = [sourceSets.main, sourceSets.test, sourceSets.functionalTest, sourceSets.integrationTest, sourceSets.smokeTest] @@ -221,7 +221,7 @@ def versions = [ junitPlatform: '1.11.0', reformLogging: '6.1.4', springfoxSwagger: '2.9.2', - pact_version: '4.6.7', + pact_version: '4.6.15', service_auth: '5.2.0', pdfbox: '3.0.2', flyway: "$flywayVersion", @@ -236,11 +236,11 @@ configurations.all { dependencyManagement { dependencies { // CVE-2018-10237 - Unbounded memory allocation - dependencySet(group: 'com.google.guava', version: '32.1.3-jre') { + dependencySet(group: 'com.google.guava', version: '33.3.1-jre') { entry 'guava' } // CVE-2022-25857 - dependencySet(group: 'org.yaml', version: '2.2') { + dependencySet(group: 'org.yaml', version: '2.3') { entry 'snakeyaml' } // CVE-2023-24998 @@ -262,7 +262,7 @@ dependencies { } implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1' implementation group: 'org.eclipse.jetty', name: 'jetty-util', version: '12.0.12' - implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '12.0.12' + implementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '12.0.14' implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1' implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '4.1.3' implementation group: 'org.springframework.boot', name: 'spring-boot-properties-migrator' @@ -279,23 +279,23 @@ dependencies { implementation group: 'org.flywaydb', name: 'flyway-core', version: versions.flyway implementation group: 'org.postgresql', name: 'postgresql', version: versions.postgresql - implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '5.15.1' + implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '5.16.0' implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '5.15.1' implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.6.0' implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: versions.reformLogging implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: versions.reformLogging - implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '7.4' + implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '8.0' implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: versions.service_auth implementation group: 'com.github.hmcts', name: 'reform-api-standards', version: '0.5.2' implementation group: 'com.github.hmcts.rpe-pdf-service', name: 'pdf-generator', version:'1.0.2' implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-hystrix', version: '2.2.10.RELEASE' implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: '4.1.4' - implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: '13.3' + implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: '13.5' - implementation group: 'com.hierynomus', name: 'sshj', version: '0.38.0' + implementation group: 'com.hierynomus', name: 'sshj', version: '0.39.0' implementation group: 'org.apache.pdfbox', name: 'pdfbox', version: versions.pdfbox implementation group: 'org.apache.pdfbox', name: 'pdfbox-io', version: versions.pdfbox implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.11.0' @@ -307,7 +307,7 @@ dependencies { implementation group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: versions.bouncycastle implementation group: 'org.bouncycastle', name: 'bcpg-jdk18on', version: versions.bouncycastle - implementation group: 'com.azure', name: 'azure-storage-blob', version: '12.27.1' + implementation group: 'com.azure', name: 'azure-storage-blob', version: '12.28.1' implementation group: 'io.github.resilience4j', name: 'resilience4j-spring-boot3', version: '2.2.0' @@ -339,7 +339,7 @@ dependencies { integrationTestImplementation sourceSets.test.runtimeClasspath integrationTestImplementation group: 'org.apache.sshd', name: 'sshd-scp', version: '2.13.2' integrationTestImplementation group: 'org.apache.sshd', name: 'sshd-sftp', version: '2.13.2' - integrationTestImplementation group: 'org.testcontainers', name: 'postgresql', version: '1.19.3' + integrationTestImplementation group: 'org.testcontainers', name: 'postgresql', version: '1.20.3' integrationTestImplementation group: 'org.awaitility', name: 'awaitility', version: '4.2.2', withoutJunit4 smokeTestImplementation sourceSets.main.runtimeClasspath diff --git a/infrastructure/.terraform-version b/infrastructure/.terraform-version index ec70f7556..66beabb57 100644 --- a/infrastructure/.terraform-version +++ b/infrastructure/.terraform-version @@ -1 +1 @@ -1.6.6 +1.9.8 diff --git a/src/functionalTest/java/uk/gov/hmcts/reform/sendletter/FunctionalTestSuite.java b/src/functionalTest/java/uk/gov/hmcts/reform/sendletter/FunctionalTestSuite.java index e1dbed18a..f95ccd693 100644 --- a/src/functionalTest/java/uk/gov/hmcts/reform/sendletter/FunctionalTestSuite.java +++ b/src/functionalTest/java/uk/gov/hmcts/reform/sendletter/FunctionalTestSuite.java @@ -8,6 +8,7 @@ import io.restassured.response.Response; import net.schmizz.sshj.SSHClient; import net.schmizz.sshj.sftp.RemoteFile; +import net.schmizz.sshj.sftp.RemoteResourceFilter; import net.schmizz.sshj.sftp.RemoteResourceInfo; import net.schmizz.sshj.sftp.SFTPClient; import org.apache.pdfbox.Loader; @@ -309,7 +310,8 @@ private Optional findSingleFileOnSftp( ) throws IOException { String lettersFolder = String.join("/", ftpTargetFolder, "BULKPRINT"); - List matchingFiles = sftp.ls(lettersFolder, file -> file.getName().contains(letterId)); + List matchingFiles = + sftp.ls(lettersFolder, (RemoteResourceFilter) file -> file.getName().contains(letterId)); if (matchingFiles.size() > 1) { String failMessage = String.format( diff --git a/src/integrationTest/resources/docker/docker-compose.yml b/src/integrationTest/resources/docker/docker-compose.yml index d418c3c12..7737977ab 100644 --- a/src/integrationTest/resources/docker/docker-compose.yml +++ b/src/integrationTest/resources/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: azure-storage: - image: mcr.microsoft.com/azure-storage/azurite:3.29.0 + image: mcr.microsoft.com/azure-storage/azurite:3.33.0 ports: - 10000:10000 environment: