Skip to content

Commit 022faa4

Browse files
DTSRD-6169 (#1127)
* rse-gradle-java-plugin 0.12.70 * ben-manes.versions 0.54.0 * dependencycheck 12.2.0 * CVE-2025-48976: enforce commons-fileupload 1.6.0 * CVE-2024-47554: enforce commons-io 2.22.0 * CVE-2025-48924: enforce commons-lang3 3.20.0 * CVE-2026-42198: enforce postgres 42.7.11 * removed deprecated logging-appinsights 6.1.9 * replaced deprecated methods --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 0569c78 commit 022faa4

3 files changed

Lines changed: 18 additions & 11 deletions

File tree

build.gradle

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
plugins {
22
id 'application'
3-
id 'uk.gov.hmcts.java' version '0.12.67'
3+
id 'uk.gov.hmcts.java' version '0.12.70'
44
id 'idea'
55
id 'jacoco'
66
id 'pmd'
77
id 'checkstyle'
88
id 'project-report'
9-
id 'com.github.ben-manes.versions' version '0.53.0'
9+
id 'com.github.ben-manes.versions' version '0.54.0'
1010
id "info.solidsoft.pitest" version '1.15.0'
1111
id 'io.spring.dependency-management' version '1.1.7'
1212
id 'org.sonarqube' version '7.0.1.6134'
1313
id 'org.springframework.boot' version '3.5.14'
1414
id "org.flywaydb.flyway" version "9.22.3"
1515
id 'au.com.dius.pact' version '4.6.17'
16-
id 'org.owasp.dependencycheck' version '12.1.6'
16+
id 'org.owasp.dependencycheck' version '12.2.0'
1717
id 'net.serenity-bdd.serenity-gradle-plugin' version '4.2.34'
1818
}
1919

@@ -27,7 +27,7 @@ def versions = [
2727
reformHealthStarter: '0.0.5',
2828
sonarPitest : '0.5',
2929
junitPitest : '1.2.1',
30-
commonsLang3 : '3.17.0',
30+
commonsLang3 : '3.20.0',
3131
pact_version : '4.6.17',
3232
launchDarklySdk : "5.10.9",
3333
junit : '6.0.0',
@@ -357,7 +357,7 @@ dependencies {
357357
implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: versions.launchDarklySdk
358358

359359
implementation group: 'org.flywaydb', name: 'flyway-core', version: '9.22.3'
360-
implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.8'
360+
implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.11'
361361

362362
implementation group: 'com.google.guava', name: 'guava', version: '33.5.0-jre'
363363
implementation group: 'jakarta.el', name: 'jakarta.el-api', version: '6.0.1'
@@ -377,12 +377,12 @@ dependencies {
377377
implementation 'io.github.openfeign:feign-httpclient:13.6'
378378
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: versions.log4j
379379
implementation "com.github.hmcts.java-logging:logging:${versions.reformLogging}"
380-
implementation "com.github.hmcts.java-logging:logging-appinsights:6.1.9"
381380
implementation('net.logstash.logback:logstash-logback-encoder') {
382381
version { strictly versions.logstashEncoder }
383382
because 'logstash 9 pulls Jackson 3 (tools.*); stay on Jackson 2 for Spring Boot 3'
384383
}
385384
implementation group: 'org.apache.commons', name: 'commons-lang3', version: versions.commonsLang3
385+
implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.6.0'
386386

387387
testImplementation 'com.github.hmcts:rd-commons-lib:0.1.3'
388388

@@ -496,6 +496,12 @@ dependencyManagement {
496496
entry 'tomcat-embed-el'
497497
entry 'tomcat-embed-websocket'
498498
}
499+
dependencySet(group: 'commons-io', version: '2.22.0') {
500+
entry 'commons-io'
501+
}
502+
dependencySet(group: 'org.apache.commons', version: versions.commonsLang3) {
503+
entry 'commons-lang3'
504+
}
499505
}
500506
}
501507

src/main/java/uk/gov/hmcts/reform/lrdapi/service/impl/RegionServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package uk.gov.hmcts.reform.lrdapi.service.impl;
22

33
import lombok.extern.slf4j.Slf4j;
4+
import org.apache.commons.lang3.Strings;
45
import org.springframework.beans.factory.annotation.Autowired;
56
import org.springframework.beans.factory.annotation.Value;
67
import org.springframework.stereotype.Service;
@@ -15,7 +16,6 @@
1516
import java.util.function.BooleanSupplier;
1617
import java.util.function.Supplier;
1718

18-
import static org.apache.commons.lang3.StringUtils.replaceIgnoreCase;
1919
import static org.apache.logging.log4j.util.Strings.isNotBlank;
2020
import static org.springframework.util.ObjectUtils.isEmpty;
2121
import static uk.gov.hmcts.reform.lrdapi.controllers.constants.LocationRefConstants.ALL;
@@ -114,7 +114,7 @@ private void isRegionIdParamValid(String param) {
114114
}
115115

116116
private boolean doesStringContainAlphabetOtherThanAll(String param) {
117-
String paramWithoutAll = replaceIgnoreCase(param.toUpperCase(), ALL, "");
117+
String paramWithoutAll = Strings.CI.replace(param.toUpperCase(), ALL, "");
118118

119119
return isPatternPresent(paramWithoutAll, ALPHABET_REGEX);
120120
}

src/main/java/uk/gov/hmcts/reform/lrdapi/util/ValidationUtils.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.apache.commons.lang3.ObjectUtils;
44
import org.apache.commons.lang3.StringUtils;
5+
import org.apache.commons.lang3.Strings;
56
import org.slf4j.Logger;
67
import uk.gov.hmcts.reform.lrdapi.controllers.advice.InvalidRequestException;
78
import uk.gov.hmcts.reform.lrdapi.domain.CourtVenueRequestParam;
@@ -233,7 +234,7 @@ public static boolean isPatternPresent(String stringToEvaluate, String regex) {
233234
}
234235

235236
private static void checkIfStringStartsAndEndsWithComma(String csvIds, String exceptionMessage) {
236-
if (StringUtils.startsWith(csvIds, COMMA) || StringUtils.endsWith(csvIds, COMMA)) {
237+
if (Strings.CS.startsWith(csvIds, COMMA) || Strings.CS.endsWith(csvIds, COMMA)) {
237238
throw new InvalidRequestException(String.format(exceptionMessage, csvIds));
238239
}
239240
}
@@ -257,8 +258,8 @@ public static void validateCourtVenueFilters(CourtVenueRequestParam requestParam
257258

258259
private static void validateSingleFilters(String value, String filterString) {
259260
if (value != null
260-
&& !StringUtils.equalsIgnoreCase(value, IS_Y)
261-
&& !StringUtils.equalsIgnoreCase(value, IS_N)) {
261+
&& !Strings.CI.equals(value, IS_Y)
262+
&& !Strings.CI.equals(value, IS_N)) {
262263
throw new InvalidRequestException(String.format(INVALID_ADDITIONAL_FILTER, filterString));
263264
}
264265
}

0 commit comments

Comments
 (0)