Skip to content

Commit 3294340

Browse files
authored
FACT-2294 dependancy updates (#3379)
* FACT-2294 dependancy updates * updated azure api version test * added more * added more updates * downgrade because breaking change * gradle * flyway * poke * owasp * poke * poke * set directory * new version of pact * sonar
1 parent 7d24b13 commit 3294340

File tree

6 files changed

+30
-29
lines changed

6 files changed

+30
-29
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,4 @@ To run migration gradle task expects `FLYWAY_URL` to be present. In case db requ
111111
## License
112112

113113
This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
114+

build.gradle

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
flywayVersion = '10.17.3'
4-
postgresqlVersion = '42.7.4'
3+
flywayVersion = '10.22.0'
4+
postgresqlVersion = '42.7.5'
55
}
66
dependencies {
77
classpath("org.postgresql:postgresql:$postgresqlVersion") // must be compatible with flyway version
@@ -14,14 +14,14 @@ plugins {
1414
id 'checkstyle'
1515
id 'pmd'
1616
id 'jacoco'
17-
id 'io.spring.dependency-management' version '1.1.6'
17+
id 'io.spring.dependency-management' version '1.1.7'
1818
id 'org.flywaydb.flyway' version "$flywayVersion"
19-
id 'org.springframework.boot' version '3.3.5'
20-
id 'org.owasp.dependencycheck' version '9.1.0'
19+
id 'org.springframework.boot' version '3.3.9'
20+
id 'org.owasp.dependencycheck' version '12.1.0'
2121
id 'com.github.ben-manes.versions' version '0.51.0'
22-
id 'org.sonarqube' version '5.0.0.4638'
22+
id 'org.sonarqube' version '6.0.1.5171'
2323
id 'info.solidsoft.pitest' version '1.15.0'
24-
id 'au.com.dius.pact' version '4.6.15'
24+
id 'au.com.dius.pact' version '4.7.0-beta.0'
2525
}
2626

2727
group = 'uk.gov.hmcts.reform'
@@ -276,9 +276,9 @@ dependencies {
276276
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '5.14.0'
277277
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc', version: '5.14.0'
278278

279-
implementation group: 'com.azure', name: 'azure-storage-blob', version: '12.28.1'
279+
implementation group: 'com.azure', name: 'azure-storage-blob', version: '12.30.0'
280280

281-
implementation group: 'com.azure', name: 'azure-messaging-servicebus', version: '7.17.5'
281+
implementation group: 'com.azure', name: 'azure-messaging-servicebus', version: '7.17.9'
282282

283283
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
284284
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
@@ -291,13 +291,13 @@ dependencies {
291291

292292

293293
implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '4.1.3'
294-
implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: '13.3'
295-
implementation group: 'io.github.openfeign', name: 'feign-jackson', version: '13.3'
294+
implementation group: 'io.github.openfeign', name: 'feign-httpclient', version: '13.5'
295+
implementation group: 'io.github.openfeign', name: 'feign-jackson', version: '13.5'
296296

297297
implementation group: 'com.github.java-json-tools', name: 'json-schema-validator', version: '2.2.14', withoutJavaxMailApi
298298

299299
// review following dependency after integrating db structure
300-
implementation group: 'io.hypersistence', name: 'hypersistence-utils-hibernate-63', version: '3.8.3'
300+
implementation group: 'io.hypersistence', name: 'hypersistence-utils-hibernate-63', version: '3.9.5'
301301

302302

303303

@@ -319,17 +319,17 @@ dependencies {
319319

320320

321321
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
322-
implementation group: 'commons-io', name: 'commons-io', version: '2.17.0'
322+
implementation group: 'commons-io', name: 'commons-io', version: '2.18.0'
323323
// only used in uk.gov.hmcts.reform.bulkscanprocessor.validation.OcrValidator
324324
// single import: io.vavr.control.Try
325-
implementation group: 'io.vavr', name: 'vavr', version: '0.10.5'
325+
implementation group: 'io.vavr', name: 'vavr', version: '0.10.6'
326326

327-
implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.12.0'
328-
implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.1.8'
327+
implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.13.0'
328+
implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.2.0'
329329

330-
implementation group: 'io.github.resilience4j', name: 'resilience4j-spring-boot2', version: '2.2.0'
331-
implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '7.6.0'
332-
implementation group: 'com.google.guava', name: 'guava', version: '33.3.1-jre'
330+
implementation group: 'io.github.resilience4j', name: 'resilience4j-spring-boot2', version: '2.3.0'
331+
implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '7.7.0'
332+
implementation group: 'com.google.guava', name: 'guava', version: '33.4.0-jre'
333333

334334

335335
testImplementation libraries.junit5
@@ -343,24 +343,24 @@ dependencies {
343343
}
344344
testImplementation group: 'org.apache.commons', name: 'commons-email', version: '1.6.0'
345345
testImplementation group: 'io.github.netmikey.logunit', name: 'logunit-core', version: '2.0.0'
346-
testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.5', classifier: 'all', {
346+
testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.7', classifier: 'all', {
347347
exclude group: 'commons-io', module: 'commons-io'
348348
exclude group: 'org.apache.commons', module: 'commons-lang3'
349349
}
350-
testImplementation group: 'com.icegreen', name: 'greenmail', version: '2.1.0'
350+
testImplementation group: 'com.icegreen', name: 'greenmail', version: '2.1.3'
351351

352352
testRuntimeOnly group: 'io.github.netmikey.logunit', name: 'logunit-logback', version: '2.0.0'
353353

354354
integrationTestImplementation sourceSets.main.runtimeClasspath
355355
integrationTestImplementation sourceSets.test.runtimeClasspath
356-
integrationTestImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '4.1.4', {
356+
integrationTestImplementation group: 'org.springframework.cloud', name: 'spring-cloud-contract-wiremock', version: '4.2.0', {
357357
exclude group: 'com.github.tomakehurst', module: 'wiremock-jre8-standalone'
358358
}
359-
integrationTestImplementation group: 'org.wiremock', name: 'wiremock-standalone', version: '3.9.2'
360-
integrationTestImplementation group: 'org.testcontainers', name: 'postgresql', version: '1.19.7', {
359+
integrationTestImplementation group: 'org.wiremock', name: 'wiremock-standalone', version: '3.12.1'
360+
integrationTestImplementation group: 'org.testcontainers', name: 'postgresql', version: '1.20.6', {
361361
exclude group: 'junit', module: 'junit'
362362
}
363-
integrationTestImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.20.1'
363+
integrationTestImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.20.6'
364364
integrationTestImplementation group: 'com.revinate', name: 'assertj-json', version: '1.2.0'
365365

366366
functionalTestImplementation sourceSets.main.runtimeClasspath

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/functionalTest/java/uk/gov/hmcts/reform/bulkscanprocessor/controllers/GetSasTokenTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private void verifySasTokenProperties(Response tokenResponse) throws java.io.IOE
137137
Date tokenExpiry = DateUtil.parseDatetime(queryParams.get("se"));
138138
assertThat(tokenExpiry).isNotNull();
139139
assertThat(queryParams.get("sig")).isNotNull(); //this is a generated hash of the resource string
140-
assertThat(queryParams.get("sv")).contains("2024-11-04"); //azure api version is latest
140+
assertThat(queryParams.get("sv")).contains("2025-05-05"); //azure api version is latest
141141
assertThat(queryParams.get("sp")).contains("wl"); //access permissions(write-w,list-l)
142142
}
143143

src/integrationTest/java/uk/gov/hmcts/reform/bulkscanprocessor/controllers/SasTokenControllerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void verifySasTokenProperties(String tokenResponse) throws java.io.IOExc
6767

6868
assertThat(queryParams.get("sig")).isNotNull();//this is a generated hash of the resource string
6969
assertThat(queryParams.get("se")).startsWith(currentDate);//the expiry date/time for the signature
70-
assertThat(queryParams.get("sv")).contains("2024-11-04");//azure api version is latest
70+
assertThat(queryParams.get("sv")).contains("2025-05-05");//azure api version is latest
7171
assertThat(queryParams.get("sp")).contains("wl");//access permissions(write-w,list-l)
7272
}
7373
}

src/test/java/uk/gov/hmcts/reform/bulkscanprocessor/services/SasTokenGeneratorServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void should_generate_sas_token_when_service_configuration_is_available() {
6060

6161
assertThat(queryParams.get("sig")).isNotNull();//this is a generated hash of the resource string
6262
assertThat(queryParams.get("se")).startsWith(currentDate);//the expiry date/time for the signature
63-
assertThat(queryParams.get("sv")).contains("2024-11-04");//azure api version is latest
63+
assertThat(queryParams.get("sv")).contains("2025-05-05");//azure api version is latest
6464
assertThat(queryParams.get("sp")).contains("rwl");//access permissions(write-w,list-l)
6565
}
6666

0 commit comments

Comments
 (0)