From 57459b2cb803522a28567efeb8934536a8582e75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 00:10:41 +0000 Subject: [PATCH 01/24] Bump org.springframework.boot:spring-boot-gradle-plugin Bumps [org.springframework.boot:spring-boot-gradle-plugin](https://github.com/spring-projects/spring-boot) from 2.7.18 to 3.3.2. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.7.18...v3.3.2) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-gradle-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b0571825..78e350b0 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.run.BootRun buildscript { ext { - springBootVersion = '2.7.18' + springBootVersion = '3.3.2' } repositories { mavenLocal() From 05a8511cd3797051ef619b99153a3573b8e91389 Mon Sep 17 00:00:00 2001 From: hcarslaw Date: Tue, 6 Aug 2024 16:47:23 +0100 Subject: [PATCH 02/24] FPET-1062: Update dependencies to fix build --- build.gradle | 57 +++++++++++++------ .../gov/hmcts/reform/prl/IntegrationTest.java | 2 +- .../DocumentGeneratorApplication.java | 5 +- .../config/HttpConnectionConfiguration.java | 15 +++-- .../config/TemplateConfig.java | 2 +- .../config/TemplatesConfiguration.java | 2 +- .../DocumentGeneratorController.java | 2 +- .../helper/GlobalExceptionHandler.java | 2 +- .../request/GenerateDocumentRequest.java | 2 +- 9 files changed, 55 insertions(+), 34 deletions(-) diff --git a/build.gradle b/build.gradle index 78e350b0..698b5b69 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'jacoco' id 'org.owasp.dependencycheck' version '9.0.4' id 'org.sonarqube' version '5.0.0.4638' - id 'org.springframework.boot' version '2.7.0' + id 'org.springframework.boot' version '3.3.2' id 'info.solidsoft.pitest' version '1.7.4' id 'au.com.dius.pact' version '4.1.7' } @@ -172,9 +172,9 @@ def versions = [ gradlePitest: '1.4.5', guava: '32.1.2-jre', jacksonDatabind: '2.16.0', - apacheLogging: '2.20.0', + apacheLogging: '2.23.1', jsonAssert: '1.2.3', - junit: '4.13.1', + junit: '5.10.3', lombok: '1.18.26', nimbus: '5.1', pdfbox: '2.0.24', @@ -188,24 +188,24 @@ def versions = [ serviceTokenGenerator: '3.0.0', sonarPitest: '0.5', spring_security_rsa: '1.0.12.RELEASE', - springBoot: '2.7.18', - springCloud: '3.1.6', + springBoot: '3.3.2', + springCloud: '4.1.3', springHateoas: '1.5.5', unirest: '1.4.9', - wiremockVersion: '2.27.2', + wiremockVersion: '3.9.1', springSecurityCrypto: '5.7.11', tomcat : '9.0.83', pact_version: '4.1.11', httpComponents: '4.5.13', bouncycastle: '1.73', ccdCaseDocumentAmClient: '1.7.2', - springFramework : '5.3.27' + springFramework : '6.1.11' ] ext["logback.version"] = '1.2.13' ext['snakeyaml.version'] = '2.2' ext['jackson.version'] = '2.16.0' -ext['spring-framework.version'] = '5.3.27' +ext['spring-framework.version'] = '6.1.11' @@ -248,6 +248,7 @@ dependencies { implementation (group: 'commons-beanutils', name: 'commons-beanutils', version: versions.commonsBeanUtils) { force = true + exclude(module: 'commons-logging') } implementation (group: 'org.springframework.security', name: 'spring-security-rsa', version: versions.spring_security_rsa) { force = true @@ -261,13 +262,13 @@ dependencies { implementation group: 'com.github.hmcts', name:'ccd-case-document-am-client', version: versions.ccdCaseDocumentAmClient - implementation(group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: versions.apacheLogging) - implementation(group: 'org.apache.logging.log4j', name: 'log4j-api', version: versions.apacheLogging) - implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springBoot implementation group: 'com.puppycrawl.tools', name: 'checkstyle', version: versions.puppyCrawl implementation group: 'commons-io', name: 'commons-io', version: versions.commonsIo implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.9' + implementation group: 'jakarta.el', name: 'jakarta.el-api', version: '6.0.1' + + implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1' implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5' @@ -288,7 +289,6 @@ dependencies { implementation group: 'org.springframework', name: 'spring-context-support', version: versions.springFramework implementation group: 'uk.gov.hmcts.reform', name: 'logging-appinsights', version: versions.reformsJavaLogging implementation group: 'uk.gov.hmcts.reform', name: 'logging-spring', version: versions.reformsJavaLogging - implementation group: 'uk.gov.hmcts.reform', name: 'logging-httpcomponents', version: versions.reformsJavaLogging implementation (group: 'uk.gov.hmcts.reform', name:'service-auth-provider-client', version: versions.serviceTokenGenerator) { exclude group: 'io.reactivex', module: 'io.reactivex' exclude group: 'io.reactivex', module: 'rxnetty' @@ -297,19 +297,28 @@ dependencies { exclude group: 'org.bouncycastle' } - implementation group: 'junit', name: 'junit', version: versions.junit + implementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: versions.junit implementation group: 'org.pitest', name: 'pitest', version: versions.pitest implementation group:'info.solidsoft.gradle.pitest', name: 'gradle-pitest-plugin', version: versions.gradlePitest implementation group:'org.codehaus.sonar-plugins', name:'sonar-pitest-plugin', version: versions.sonarPitest - implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: versions.httpComponents implementation (group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '7.4.0') + implementation(group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.12'){ + force = true + } + implementation(group: 'ch.qos.logback', name: 'logback-core', version: '1.5.6'){ + force = true + } + + implementation 'org.junit.jupiter:junit-jupiter:5.10.3' + implementation group: 'org.springframework', name: 'spring-context', version: versions.springFramework + annotationProcessor("org.projectlombok:lombok:${versions.lombok}") annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" implementation group: 'org.projectlombok', name: 'lombok', version: versions.lombok implementation("org.springframework.boot:spring-boot-starter-validation") - testImplementation group: 'com.github.tomakehurst', name:'wiremock', version: versions.wiremockVersion + testImplementation group: 'org.wiremock', name: 'wiremock-standalone', version: versions.wiremockVersion testImplementation group: 'io.rest-assured', name: 'rest-assured', version: versions.restAssured testImplementation group: 'io.rest-assured', name: 'json-path', version: versions.restAssured testImplementation group: 'io.rest-assured', name: 'xml-path', version: versions.restAssured @@ -345,6 +354,22 @@ dependencies { testImplementation group: 'io.rest-assured', name: 'json-path', version: versions.restAssured testImplementation group: 'io.rest-assured', name: 'xml-path', version: versions.restAssured testImplementation group: 'org.mockito', name: 'mockito-inline', version: '5.2.0' + + testImplementation 'org.eclipse.jetty:jetty-server:11.0.14' + testImplementation 'jakarta.servlet:jakarta.servlet-api:6.0.0' + testImplementation group: 'org.springframework', name: 'spring-test', version: '6.1.11' + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.23.1' + testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.6.4' + + modules { + module("org.codehaus.groovy:groovy") { + replacedBy("org.apache.groovy:groovy", "conflicts in current rest-assured version") + } + module("org.codehaus.groovy:groovy-xml") { + replacedBy("org.apache.groovy:groovy-xml", "conflicts in current rest-assured version") + } + } + } task fortifyScan(type: JavaExec) { @@ -384,8 +409,6 @@ dependencyManagement { entry 'tomcat-embed-el' } - // CVE-2021-28170 - dependency group: 'org.glassfish', name: 'jakarta.el', version: '4.0.2' //CVE-2022-45688 dependencySet(group: 'org.json', version: '20230227') { diff --git a/src/integrationTest/java/uk/gov/hmcts/reform/prl/IntegrationTest.java b/src/integrationTest/java/uk/gov/hmcts/reform/prl/IntegrationTest.java index 78427300..422a91db 100644 --- a/src/integrationTest/java/uk/gov/hmcts/reform/prl/IntegrationTest.java +++ b/src/integrationTest/java/uk/gov/hmcts/reform/prl/IntegrationTest.java @@ -1,6 +1,7 @@ package uk.gov.hmcts.reform.prl; import io.restassured.response.Response; +import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import net.serenitybdd.junit.spring.integration.SpringIntegrationMethodRule; import org.assertj.core.util.Strings; @@ -17,7 +18,6 @@ import java.net.URL; import java.util.Base64; import java.util.UUID; -import javax.annotation.PostConstruct; @Slf4j @RunWith(SpringRunner.class) diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/DocumentGeneratorApplication.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/DocumentGeneratorApplication.java index 4085ae0c..d4a511d3 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/DocumentGeneratorApplication.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/DocumentGeneratorApplication.java @@ -3,13 +3,12 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.openfeign.EnableFeignClients; -import uk.gov.hmcts.reform.authorisation.ServiceAuthAutoConfiguration; @SpringBootApplication( scanBasePackages = {"uk.gov.hmcts.reform.prl", "uk.gov.hmcts.reform.logging.appinsights", - "uk.gov.hmcts.reform.ccd.document"}, - exclude = {ServiceAuthAutoConfiguration.class}) + "uk.gov.hmcts.reform.ccd.document"} + ) public class DocumentGeneratorApplication { public static void main(String[] args) { diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/HttpConnectionConfiguration.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/HttpConnectionConfiguration.java index 60ec016a..3af5be22 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/HttpConnectionConfiguration.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/HttpConnectionConfiguration.java @@ -4,9 +4,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.google.common.collect.ImmutableList; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.core5.util.Timeout; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -21,7 +22,6 @@ import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.client.RestTemplate; -import uk.gov.hmcts.reform.logging.httpcomponents.OutboundRequestIdSettingInterceptor; import java.nio.charset.Charset; @@ -89,15 +89,14 @@ private RestTemplate getRestTemplate( new StringHttpMessageConverter())); RequestConfig config = RequestConfig.custom() - .setConnectTimeout(connectTimeout) - .setConnectionRequestTimeout(connectRequestTimeout) - .setSocketTimeout(connectRequestTimeout) + .setConnectTimeout(Timeout.ofMilliseconds(connectTimeout)) + .setConnectionRequestTimeout(Timeout.ofMilliseconds(connectRequestTimeout)) + .setResponseTimeout(Timeout.ofMilliseconds(connectRequestTimeout)) .build(); CloseableHttpClient client = HttpClientBuilder .create() .useSystemProperties() - .addInterceptorFirst(new OutboundRequestIdSettingInterceptor()) .setDefaultRequestConfig(config) .build(); diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplateConfig.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplateConfig.java index 9cdd3927..6829438f 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplateConfig.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplateConfig.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.prl.documentgenerator.config; +import jakarta.validation.Valid; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -7,7 +8,6 @@ import org.springframework.validation.annotation.Validated; import java.util.Map; -import javax.validation.Valid; @Getter diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplatesConfiguration.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplatesConfiguration.java index 6cbf78ab..c257e45e 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplatesConfiguration.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/config/TemplatesConfiguration.java @@ -1,5 +1,6 @@ package uk.gov.hmcts.reform.prl.documentgenerator.config; +import jakarta.annotation.PostConstruct; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -8,7 +9,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import javax.annotation.PostConstruct; import static java.util.stream.Collectors.toMap; diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/controller/DocumentGeneratorController.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/controller/DocumentGeneratorController.java index 6033d72a..5e21fa3a 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/controller/DocumentGeneratorController.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/controller/DocumentGeneratorController.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; @@ -19,7 +20,6 @@ import uk.gov.hmcts.reform.prl.documentgenerator.domain.response.GeneratedDocumentInfo; import uk.gov.hmcts.reform.prl.documentgenerator.service.DocumentManagementService; -import javax.validation.Valid; @RestController @RequestMapping(path = "/version/1") diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/controller/helper/GlobalExceptionHandler.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/controller/helper/GlobalExceptionHandler.java index 0a9358db..15fbc3e7 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/controller/helper/GlobalExceptionHandler.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/controller/helper/GlobalExceptionHandler.java @@ -32,7 +32,7 @@ public ResponseEntity handleDocumentStorageAndPDFGenerationException(Exc log.error(exception.getMessage(), exception); if (exception.getCause() instanceof HttpClientErrorException) { - HttpStatus httpClientErrorException = ((HttpClientErrorException) exception.getCause()).getStatusCode(); + HttpStatus httpClientErrorException = (HttpStatus) ((HttpClientErrorException) exception.getCause()).getStatusCode(); if (httpClientErrorException == HttpStatus.BAD_REQUEST) { return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(exception.getMessage()); diff --git a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/domain/request/GenerateDocumentRequest.java b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/domain/request/GenerateDocumentRequest.java index 104dd460..c494b446 100644 --- a/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/domain/request/GenerateDocumentRequest.java +++ b/src/main/java/uk/gov/hmcts/reform/prl/documentgenerator/domain/request/GenerateDocumentRequest.java @@ -2,10 +2,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; import lombok.Value; import java.util.Map; -import javax.validation.constraints.NotBlank; @Value @Schema(description = "Request body model for Document Generation Request") From 5ef469ebf3c44367cb41a500e639ffd5bf49f49f Mon Sep 17 00:00:00 2001 From: hcarslaw Date: Tue, 6 Aug 2024 16:56:22 +0100 Subject: [PATCH 03/24] FPET-1062: Fix compile tests --- .../management/monitoring/health/HealthCheckITest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/management/monitoring/health/HealthCheckITest.java b/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/management/monitoring/health/HealthCheckITest.java index 5a2f2fe8..448f1b6c 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/management/monitoring/health/HealthCheckITest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/management/monitoring/health/HealthCheckITest.java @@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.boot.web.server.LocalServerPort; import org.springframework.cloud.contract.wiremock.WireMockSpring; import org.springframework.cloud.netflix.ribbon.StaticServerList; import org.springframework.context.annotation.Bean; From e38552862c64f0252dcce33f892599aa6d2d9674 Mon Sep 17 00:00:00 2001 From: hcarslaw Date: Wed, 7 Aug 2024 12:11:03 +0100 Subject: [PATCH 04/24] FPET-1062: Update dependencies to fix unit tests --- build.gradle | 14 ++++++-- .../monitoring/health/HealthCheckITest.java | 34 +++++++++---------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 698b5b69..0e9d1e39 100644 --- a/build.gradle +++ b/build.gradle @@ -194,7 +194,7 @@ def versions = [ unirest: '1.4.9', wiremockVersion: '3.9.1', springSecurityCrypto: '5.7.11', - tomcat : '9.0.83', + tomcat : '10.1.26', pact_version: '4.1.11', httpComponents: '4.5.13', bouncycastle: '1.73', @@ -211,6 +211,14 @@ ext['spring-framework.version'] = '6.1.11' dependencies { + + configurations { + all { + exclude group: 'ch.qos.logback', module: 'logback-classic' + exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j' + } + } + //integration test integrationTestImplementation group: 'com.mashape.unirest', name: 'unirest-java', version: versions.unirest integrationTestImplementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: versions.nimbus @@ -244,7 +252,7 @@ dependencies { - testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '3.1.1' + testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '4.1.4' implementation (group: 'commons-beanutils', name: 'commons-beanutils', version: versions.commonsBeanUtils) { force = true @@ -312,6 +320,7 @@ dependencies { implementation 'org.junit.jupiter:junit-jupiter:5.10.3' implementation group: 'org.springframework', name: 'spring-context', version: versions.springFramework + implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.23.1' annotationProcessor("org.projectlombok:lombok:${versions.lombok}") @@ -359,7 +368,6 @@ dependencies { testImplementation 'jakarta.servlet:jakarta.servlet-api:6.0.0' testImplementation group: 'org.springframework', name: 'spring-test', version: '6.1.11' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.23.1' - testImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.6.4' modules { module("org.codehaus.groovy:groovy") { diff --git a/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/management/monitoring/health/HealthCheckITest.java b/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/management/monitoring/health/HealthCheckITest.java index 448f1b6c..3d17853d 100644 --- a/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/management/monitoring/health/HealthCheckITest.java +++ b/src/test/java/uk/gov/hmcts/reform/prl/documentgenerator/management/monitoring/health/HealthCheckITest.java @@ -5,11 +5,11 @@ import com.jayway.jsonpath.JsonPath; import com.netflix.loadbalancer.Server; import com.netflix.loadbalancer.ServerList; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.classic.MinimalHttpClient; +import org.apache.hc.core5.http.io.entity.EntityUtils; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -67,9 +67,9 @@ public class HealthCheckITest { public static WireMockClassRule caseDocService = new WireMockClassRule(buildWireMockConfig(5170)); private String healthUrl; - private final HttpClient httpClient = HttpClients.createMinimal(); + private final MinimalHttpClient httpClient = HttpClients.createMinimal(); - private HttpResponse getHealth() throws Exception { + private CloseableHttpResponse getHealth() throws Exception { final HttpGet request = new HttpGet(healthUrl); request.addHeader("Accept", "application/json;charset=UTF-8"); @@ -100,10 +100,10 @@ public void givenAllDependenciesAreUp_whenCheckHealth_thenReturnStatusUp() throw stubEndpointAndResponse(docmosisService, true); stubEndpointAndResponse(caseDocService, true); - HttpResponse response = getHealth(); + CloseableHttpResponse response = getHealth(); String body = EntityUtils.toString(response.getEntity()); - assertThat(response.getStatusLine().getStatusCode(), equalTo(HttpStatus.OK.value())); + assertThat(response.getCode(), equalTo(HttpStatus.OK.value())); assertThat(JsonPath.read(body, "$.status").toString(), equalTo("UP")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), @@ -122,10 +122,10 @@ public void givenAllDependenciesAreDown_whenCheckHealth_thenReturnStatusDown() t stubEndpointAndResponse(docmosisService, false); stubEndpointAndResponse(caseDocService, false); - HttpResponse response = getHealth(); + CloseableHttpResponse response = getHealth(); String body = EntityUtils.toString(response.getEntity()); - assertThat(response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SERVICE_UNAVAILABLE.value())); + assertThat(response.getCode(), equalTo(HttpStatus.SERVICE_UNAVAILABLE.value())); assertThat(JsonPath.read(body, "$.status").toString(), equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), @@ -144,10 +144,10 @@ public void givenDocmosisServiceIsDown_whenCheckHealth_thenReturnStatusDown() th stubEndpointAndResponse(docmosisService, false); stubEndpointAndResponse(caseDocService, true); - HttpResponse response = getHealth(); + CloseableHttpResponse response = getHealth(); String body = EntityUtils.toString(response.getEntity()); - assertThat(response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SERVICE_UNAVAILABLE.value())); + assertThat(response.getCode(), equalTo(HttpStatus.SERVICE_UNAVAILABLE.value())); assertThat(JsonPath.read(body, "$.status").toString(), equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), @@ -166,10 +166,10 @@ public void givenCaseDocumentsClientIsDown_whenCheckHealth_thenReturnStatusDown( stubEndpointAndResponse(docmosisService, true); stubEndpointAndResponse(caseDocService, false); - HttpResponse response = getHealth(); + CloseableHttpResponse response = getHealth(); String body = EntityUtils.toString(response.getEntity()); - assertThat(response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SERVICE_UNAVAILABLE.value())); + assertThat(response.getCode(), equalTo(HttpStatus.SERVICE_UNAVAILABLE.value())); assertThat(JsonPath.read(body, "$.status").toString(), equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), @@ -188,10 +188,10 @@ public void givenAuthServiceIsDown_whenCheckHealth_thenReturnStatusDown() throws stubEndpointAndResponse(docmosisService, true); stubEndpointAndResponse(caseDocService, true); - HttpResponse response = getHealth(); + CloseableHttpResponse response = getHealth(); String body = EntityUtils.toString(response.getEntity()); - assertThat(response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SERVICE_UNAVAILABLE.value())); + assertThat(response.getCode(), equalTo(HttpStatus.SERVICE_UNAVAILABLE.value())); assertThat(JsonPath.read(body, "$.status").toString(), equalTo("DOWN")); assertThat(JsonPath.read(body, "$.components.serviceAuthProviderHealthCheck.status").toString(), From ff0062c66477615ed8eddf0fa0a202844085607f Mon Sep 17 00:00:00 2001 From: hcarslaw Date: Wed, 7 Aug 2024 12:23:45 +0100 Subject: [PATCH 05/24] FPET-1062: Update github CI to java 17 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d34ddcc..a0f87a88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,9 +15,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Build run: ./gradlew check From 01fee56096266209b26a075187c1b102ad824b40 Mon Sep 17 00:00:00 2001 From: hcarslaw Date: Wed, 7 Aug 2024 12:51:05 +0100 Subject: [PATCH 06/24] FPET-1062: Fix CVE issue --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 0e9d1e39..fde86b10 100644 --- a/build.gradle +++ b/build.gradle @@ -303,6 +303,7 @@ dependencies { exclude group: 'io.reactivex', module: 'rxnetty-contexts' exclude group: 'io.reactivex', module: 'rxnetty-servo' exclude group: 'org.bouncycastle' + exclude group: 'org.apache.httpcomponents' } implementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: versions.junit From b392349e966b2ab7006602bb266ca1247be7a7dd Mon Sep 17 00:00:00 2001 From: hcarslaw Date: Wed, 7 Aug 2024 13:03:54 +0100 Subject: [PATCH 07/24] FPET-1062: Fix CVE issue --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fde86b10..4ded0013 100644 --- a/build.gradle +++ b/build.gradle @@ -168,7 +168,7 @@ def versions = [ commonsIo: '2.7', commonsLang3: '3.9', commonsBeanUtils: '1.9.4', - feignHttpClient: '10.2.0', + feignHttpClient: '13.3', gradlePitest: '1.4.5', guava: '32.1.2-jre', jacksonDatabind: '2.16.0', From a6450a8b80081056c42720300841b44a6adaeb6c Mon Sep 17 00:00:00 2001 From: hcarslaw <119344120+hcarslaw@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:05:54 +0100 Subject: [PATCH 08/24] Update values.preview.template.yaml --- charts/prl-dgs/values.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prl-dgs/values.preview.template.yaml b/charts/prl-dgs/values.preview.template.yaml index efab50ca..4e5de6e2 100644 --- a/charts/prl-dgs/values.preview.template.yaml +++ b/charts/prl-dgs/values.preview.template.yaml @@ -32,7 +32,7 @@ java: MANAGEMENT_ENDPOINT_HEALTH_CACHE_TIMETOLIVE: "30000" DOCMOSIS_SERVICE_DEV_MODE_FLAG: "true" PDF_TEST_ENABLED: "true" - CCD_CASE_DOCS_AM_API: http://prl-ccd-definitions-pr-2326-cdam + CCD_CASE_DOCS_AM_API: "http://ccd-case-document-am-api-aat.service.core-compute-aat.internal" AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" IDAM_S2S_URL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" DOCMOSIS_SERVICE_BASE_URL: "https://docmosis.aat.platform.hmcts.net" From a9d0d5c88f7c0979516d0df7e7165c3a015f41dc Mon Sep 17 00:00:00 2001 From: hcarslaw Date: Fri, 9 Aug 2024 12:37:37 +0100 Subject: [PATCH 09/24] FPET-1062: Upgrade rest-assured and serenity --- build.gradle | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 4ded0013..8f75568b 100644 --- a/build.gradle +++ b/build.gradle @@ -182,8 +182,8 @@ def versions = [ powerMock: '2.0.0', puppyCrawl: '8.29', reformsJavaLogging: '5.1.1', - restAssured: '4.5.1', - serenity: '2.2.13', + restAssured: '5.5.0', + serenity: '4.1.20', serenityCucumber: '1.9.51', serviceTokenGenerator: '3.0.0', sonarPitest: '0.5', @@ -369,16 +369,6 @@ dependencies { testImplementation 'jakarta.servlet:jakarta.servlet-api:6.0.0' testImplementation group: 'org.springframework', name: 'spring-test', version: '6.1.11' testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.23.1' - - modules { - module("org.codehaus.groovy:groovy") { - replacedBy("org.apache.groovy:groovy", "conflicts in current rest-assured version") - } - module("org.codehaus.groovy:groovy-xml") { - replacedBy("org.apache.groovy:groovy-xml", "conflicts in current rest-assured version") - } - } - } task fortifyScan(type: JavaExec) { From becff72e0091760c8c161288b2ac915137fe303f Mon Sep 17 00:00:00 2001 From: hcarslaw Date: Mon, 12 Aug 2024 12:26:12 +0100 Subject: [PATCH 10/24] FPET-1062: Remove unnecessary dependency changes --- build.gradle | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/build.gradle b/build.gradle index 8f75568b..593c542d 100644 --- a/build.gradle +++ b/build.gradle @@ -172,7 +172,7 @@ def versions = [ gradlePitest: '1.4.5', guava: '32.1.2-jre', jacksonDatabind: '2.16.0', - apacheLogging: '2.23.1', + apacheLogging: '2.20.0', jsonAssert: '1.2.3', junit: '5.10.3', lombok: '1.18.26', @@ -256,7 +256,6 @@ dependencies { implementation (group: 'commons-beanutils', name: 'commons-beanutils', version: versions.commonsBeanUtils) { force = true - exclude(module: 'commons-logging') } implementation (group: 'org.springframework.security', name: 'spring-security-rsa', version: versions.spring_security_rsa) { force = true @@ -274,9 +273,7 @@ dependencies { implementation group: 'com.puppycrawl.tools', name: 'checkstyle', version: versions.puppyCrawl implementation group: 'commons-io', name: 'commons-io', version: versions.commonsIo implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.9' - implementation group: 'jakarta.el', name: 'jakarta.el-api', version: '6.0.1' - - implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1' + implementation group: 'org.apache.httpcomponents.client5', name: 'httpclient5', version: '5.3.1' implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5' @@ -311,16 +308,6 @@ dependencies { implementation group:'info.solidsoft.gradle.pitest', name: 'gradle-pitest-plugin', version: versions.gradlePitest implementation group:'org.codehaus.sonar-plugins', name:'sonar-pitest-plugin', version: versions.sonarPitest implementation (group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '7.4.0') - - implementation(group: 'ch.qos.logback', name: 'logback-classic', version: '1.4.12'){ - force = true - } - implementation(group: 'ch.qos.logback', name: 'logback-core', version: '1.5.6'){ - force = true - } - - implementation 'org.junit.jupiter:junit-jupiter:5.10.3' - implementation group: 'org.springframework', name: 'spring-context', version: versions.springFramework implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.23.1' @@ -328,7 +315,6 @@ dependencies { annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" implementation group: 'org.projectlombok', name: 'lombok', version: versions.lombok implementation("org.springframework.boot:spring-boot-starter-validation") - testImplementation group: 'org.wiremock', name: 'wiremock-standalone', version: versions.wiremockVersion testImplementation group: 'io.rest-assured', name: 'rest-assured', version: versions.restAssured testImplementation group: 'io.rest-assured', name: 'json-path', version: versions.restAssured testImplementation group: 'io.rest-assured', name: 'xml-path', version: versions.restAssured @@ -364,11 +350,6 @@ dependencies { testImplementation group: 'io.rest-assured', name: 'json-path', version: versions.restAssured testImplementation group: 'io.rest-assured', name: 'xml-path', version: versions.restAssured testImplementation group: 'org.mockito', name: 'mockito-inline', version: '5.2.0' - - testImplementation 'org.eclipse.jetty:jetty-server:11.0.14' - testImplementation 'jakarta.servlet:jakarta.servlet-api:6.0.0' - testImplementation group: 'org.springframework', name: 'spring-test', version: '6.1.11' - testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: '2.23.1' } task fortifyScan(type: JavaExec) { From 0d5a75d085a07edc2f83840473586cde597bebe8 Mon Sep 17 00:00:00 2001 From: hcarslaw <119344120+hcarslaw@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:44:29 +0100 Subject: [PATCH 11/24] Update values.preview.template.yaml --- charts/prl-dgs/values.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prl-dgs/values.preview.template.yaml b/charts/prl-dgs/values.preview.template.yaml index 4e5de6e2..abb8de5e 100644 --- a/charts/prl-dgs/values.preview.template.yaml +++ b/charts/prl-dgs/values.preview.template.yaml @@ -32,7 +32,7 @@ java: MANAGEMENT_ENDPOINT_HEALTH_CACHE_TIMETOLIVE: "30000" DOCMOSIS_SERVICE_DEV_MODE_FLAG: "true" PDF_TEST_ENABLED: "true" - CCD_CASE_DOCS_AM_API: "http://ccd-case-document-am-api-aat.service.core-compute-aat.internal" + CCD_CASE_DOCS_AM_API: http://prl-ccd-definitions-pr-2377-cdam AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" IDAM_S2S_URL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" DOCMOSIS_SERVICE_BASE_URL: "https://docmosis.aat.platform.hmcts.net" From bbda788f99bf410657dc654d972d8cd70b16310e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 16:33:11 +0000 Subject: [PATCH 12/24] Bump org.springdoc:springdoc-openapi-ui from 1.6.9 to 1.8.0 Bumps org.springdoc:springdoc-openapi-ui from 1.6.9 to 1.8.0. --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-ui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index dc54e11d..bff310cf 100644 --- a/build.gradle +++ b/build.gradle @@ -268,7 +268,7 @@ dependencies { implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: versions.springBoot implementation group: 'com.puppycrawl.tools', name: 'checkstyle', version: versions.puppyCrawl implementation group: 'commons-io', name: 'commons-io', version: versions.commonsIo - implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.9' + implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.8.0' implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5' From 5081b061debe47562d27c2055da73c859115af71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 09:45:37 +0000 Subject: [PATCH 13/24] Bump org.junit.jupiter:junit-jupiter-engine from 5.9.2 to 5.10.2 Bumps [org.junit.jupiter:junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.2 to 5.10.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.10.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bff310cf..4bab4e53 100644 --- a/build.gradle +++ b/build.gradle @@ -329,7 +329,7 @@ dependencies { contractTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' contractTestImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2") - contractTestRuntime("org.junit.jupiter:junit-jupiter-engine:5.9.2") + contractTestRuntime("org.junit.jupiter:junit-jupiter-engine:5.10.2") contractTestImplementation('org.junit.jupiter:junit-jupiter-api:5.10.2') contractTestImplementation sourceSets.main.runtimeClasspath From a95663db2fe72011561aa11f543e4568fc017a61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 00:26:47 +0000 Subject: [PATCH 14/24] Bump info.solidsoft.pitest from 1.7.4 to 1.15.0 Bumps info.solidsoft.pitest from 1.7.4 to 1.15.0. --- updated-dependencies: - dependency-name: info.solidsoft.pitest dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4bab4e53..85fd484d 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'org.owasp.dependencycheck' version '9.0.4' id 'org.sonarqube' version '5.0.0.4638' id 'org.springframework.boot' version '2.7.0' - id 'info.solidsoft.pitest' version '1.7.4' + id 'info.solidsoft.pitest' version '1.15.0' id 'au.com.dius.pact' version '4.1.7' } From b878cac45eab8c9b6cd4701154570fef66595a32 Mon Sep 17 00:00:00 2001 From: praneethhm <101885945+praneethhm@users.noreply.github.com> Date: Wed, 23 Oct 2024 14:48:49 +0100 Subject: [PATCH 15/24] updated end point --- charts/prl-dgs/values.preview.template.yaml | 2 +- testFile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 testFile diff --git a/charts/prl-dgs/values.preview.template.yaml b/charts/prl-dgs/values.preview.template.yaml index ce1babe3..45a64392 100644 --- a/charts/prl-dgs/values.preview.template.yaml +++ b/charts/prl-dgs/values.preview.template.yaml @@ -32,7 +32,7 @@ java: MANAGEMENT_ENDPOINT_HEALTH_CACHE_TIMETOLIVE: "30000" DOCMOSIS_SERVICE_DEV_MODE_FLAG: "true" PDF_TEST_ENABLED: "true" - CCD_CASE_DOCS_AM_API: http://prl-ccd-definitions-pr-2424-cdam + CCD_CASE_DOCS_AM_API: "http://ccd-case-document-am-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" IDAM_S2S_URL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" DOCMOSIS_SERVICE_BASE_URL: "https://docmosis.aat.platform.hmcts.net" diff --git a/testFile b/testFile new file mode 100644 index 00000000..88298345 --- /dev/null +++ b/testFile @@ -0,0 +1 @@ +Any String you want \ No newline at end of file From e51606fd0907629f1553ca8deb26fa847105a868 Mon Sep 17 00:00:00 2001 From: Sahitya Desireddy Date: Wed, 1 May 2024 04:53:09 +0100 Subject: [PATCH 16/24] contract test fix From ccbded9753c4321afebaa6ab9a01b1985df68be9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 09:26:49 +0000 Subject: [PATCH 17/24] Bump org.springframework.security:spring-security-crypto Bumps [org.springframework.security:spring-security-crypto](https://github.com/spring-projects/spring-security) from 5.7.5 to 6.3.1. - [Release notes](https://github.com/spring-projects/spring-security/releases) - [Changelog](https://github.com/spring-projects/spring-security/blob/main/RELEASE.adoc) - [Commits](https://github.com/spring-projects/spring-security/compare/5.7.5...6.3.1) --- updated-dependencies: - dependency-name: org.springframework.security:spring-security-crypto dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 85fd484d..e331753b 100644 --- a/build.gradle +++ b/build.gradle @@ -398,7 +398,7 @@ dependencyManagement { dependencySet(group: 'org.yaml', version: '2.2') { entry 'snakeyaml' } - dependency group: 'org.springframework.security', name: 'spring-security-crypto', version: '5.7.5' + dependency group: 'org.springframework.security', name: 'spring-security-crypto', version: '6.3.1' } From 38dc448aee839ff2fee9d84edbe3e08fdece315e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 09:26:51 +0000 Subject: [PATCH 18/24] Bump org.projectlombok:lombok from 1.18.26 to 1.18.34 Bumps [org.projectlombok:lombok](https://github.com/projectlombok/lombok) from 1.18.26 to 1.18.34. - [Changelog](https://github.com/projectlombok/lombok/blob/master/doc/changelog.markdown) - [Commits](https://github.com/projectlombok/lombok/compare/v1.18.26...v1.18.34) --- updated-dependencies: - dependency-name: org.projectlombok:lombok dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e331753b..a48f48a1 100644 --- a/build.gradle +++ b/build.gradle @@ -176,7 +176,7 @@ def versions = [ apacheLogging: '2.20.0', jsonAssert: '1.2.3', junit: '4.13.1', - lombok: '1.18.26', + lombok: '1.18.34', nimbus: '5.1', pdfbox: '2.0.24', pitest: '1.7.3', From 46d270ea825085b8977a50f57c6ef4a6765f9371 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 09:26:57 +0000 Subject: [PATCH 19/24] Bump au.com.dius.pact from 4.1.7 to 4.6.11 Bumps au.com.dius.pact from 4.1.7 to 4.6.11. --- updated-dependencies: - dependency-name: au.com.dius.pact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a48f48a1..9cca15a6 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ plugins { id 'org.sonarqube' version '5.0.0.4638' id 'org.springframework.boot' version '2.7.0' id 'info.solidsoft.pitest' version '1.15.0' - id 'au.com.dius.pact' version '4.1.7' + id 'au.com.dius.pact' version '4.6.11' } apply plugin: 'net.serenity-bdd.aggregator' From 2c33cbab6f57b0673cd235d3fa1d17dc5d98f4ad Mon Sep 17 00:00:00 2001 From: praneethhm <101885945+praneethhm@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:55:06 +0100 Subject: [PATCH 20/24] updated pact --- build.gradle | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 9cca15a6..b239d09c 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,9 @@ buildscript { } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - classpath("net.serenity-bdd:serenity-gradle-plugin:2.4.34") + classpath("net.serenity-bdd:serenity-gradle-plugin:2.4.34"){ + exclude group: "org.codehaus.groovy", module: "groovy" + } } } @@ -209,8 +211,6 @@ ext['jackson.version'] = '2.16.0' ext['spring-framework.version'] = '5.3.27' - - dependencies { //integration test integrationTestImplementation group: 'com.mashape.unirest', name: 'unirest-java', version: versions.unirest @@ -391,7 +391,10 @@ dependencyManagement { dependencySet(group: 'org.json', version: '20230227') { entry 'json' } - //CVE-2023-2976 + + dependency group: 'org.apache.groovy', name: 'groovy', version: '4.0.22' + + //CVE-2023-2976 dependency group: 'com.google.guava', name: 'guava', version: '32.1.2-jre' //CVE-2022-1471 From f68f16039a780ede76424390f51355d27e18ec23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 09:27:01 +0000 Subject: [PATCH 21/24] Bump org.springframework.cloud:spring-cloud-contract-wiremock Bumps [org.springframework.cloud:spring-cloud-contract-wiremock](https://github.com/spring-cloud/spring-cloud-contract) from 3.1.1 to 4.1.4. - [Release notes](https://github.com/spring-cloud/spring-cloud-contract/releases) - [Commits](https://github.com/spring-cloud/spring-cloud-contract/compare/v3.1.1...v4.1.4) --- updated-dependencies: - dependency-name: org.springframework.cloud:spring-cloud-contract-wiremock dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b239d09c..d3d29858 100644 --- a/build.gradle +++ b/build.gradle @@ -245,7 +245,7 @@ dependencies { - testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '3.1.1' + testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '4.1.4' implementation (group: 'commons-beanutils', name: 'commons-beanutils', version: versions.commonsBeanUtils) { force = true From d74b3cfe7ec6e6666b81df54a8d15893bd6c5343 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 09:26:57 +0000 Subject: [PATCH 22/24] Bump org.owasp.dependencycheck from 9.0.4 to 10.0.3 Bumps org.owasp.dependencycheck from 9.0.4 to 10.0.3. --- updated-dependencies: - dependency-name: org.owasp.dependencycheck dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d3d29858..e6d0d0d2 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'com.github.ben-manes.versions' version '0.51.0' id 'io.spring.dependency-management' version '1.0.11.RELEASE' id 'jacoco' - id 'org.owasp.dependencycheck' version '9.0.4' + id 'org.owasp.dependencycheck' version '10.0.3' id 'org.sonarqube' version '5.0.0.4638' id 'org.springframework.boot' version '2.7.0' id 'info.solidsoft.pitest' version '1.15.0' From 398d19edf7fc84c6a805ba466a7d903727ba60a3 Mon Sep 17 00:00:00 2001 From: praneethhm <101885945+praneethhm@users.noreply.github.com> Date: Wed, 23 Oct 2024 20:57:12 +0100 Subject: [PATCH 23/24] upgraded gradle & pact --- build.gradle | 27 +++++++++++------------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index e6d0d0d2..5946ab6c 100644 --- a/build.gradle +++ b/build.gradle @@ -323,9 +323,7 @@ dependencies { contractTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: versions.httpComponents contractTestImplementation group: 'au.com.dius.pact.consumer', name: 'junit5', version: versions.pact_version - contractTestImplementation group: 'au.com.dius.pact.consumer', name: 'java8', version: versions.pact_version contractTestRuntime group: 'au.com.dius.pact.consumer', name: 'junit5', version: versions.pact_version - contractTestRuntime group: 'au.com.dius.pact.consumer', name: 'java8', version: versions.pact_version contractTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test' contractTestImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2") @@ -564,30 +562,29 @@ run { } } + project.ext { pactVersion = getCheckedOutGitCommitHash() } +pact { + publish { + pactDirectory = 'pacts' + pactBrokerUrl = System.getenv("PACT_BROKER_FULL_URL") ?: 'http://localhost:80' + tags = [System.getenv("PACT_BRANCH_NAME") ?:'Dev'] + version = project.pactVersion + } +} + task runAndPublishConsumerPactTests(type: Test){ + dependsOn(contract) logger.lifecycle("Runs pact Tests") testClassesDirs = sourceSets.contractTest.output.classesDirs classpath = sourceSets.contractTest.runtimeClasspath - + finalizedBy(pactPublish) } -runAndPublishConsumerPactTests.dependsOn contract - -runAndPublishConsumerPactTests.finalizedBy pactPublish - def getCheckedOutGitCommitHash() { 'git rev-parse --verify --short HEAD'.execute().text.trim() } -pact { - publish { - pactDirectory = 'pacts' - pactBrokerUrl = System.getenv("PACT_BROKER_FULL_URL") ?: 'http://localhost:80' - tags = [System.getenv("PACT_BRANCH_NAME") ?:'Dev'] - version = project.pactVersion - } -} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 263b8f24..423ff9f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip From 0e2add07ffb10a5294db157c3959d62f65ca0ab2 Mon Sep 17 00:00:00 2001 From: praneethhm <101885945+praneethhm@users.noreply.github.com> Date: Mon, 28 Oct 2024 10:10:00 +0000 Subject: [PATCH 24/24] updated cdam url --- charts/prl-dgs/values.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prl-dgs/values.preview.template.yaml b/charts/prl-dgs/values.preview.template.yaml index 45a64392..0c93446c 100644 --- a/charts/prl-dgs/values.preview.template.yaml +++ b/charts/prl-dgs/values.preview.template.yaml @@ -32,7 +32,7 @@ java: MANAGEMENT_ENDPOINT_HEALTH_CACHE_TIMETOLIVE: "30000" DOCMOSIS_SERVICE_DEV_MODE_FLAG: "true" PDF_TEST_ENABLED: "true" - CCD_CASE_DOCS_AM_API: "http://ccd-case-document-am-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" + CCD_CASE_DOCS_AM_API: http://prl-ccd-definitions-pr-2460-cdam AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" IDAM_S2S_URL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" DOCMOSIS_SERVICE_BASE_URL: "https://docmosis.aat.platform.hmcts.net"