Skip to content

[ESWE-1258] Upgrade dependencies; Add suppression; workaround for JPA issue #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2025
Merged

[ESWE-1258] Upgrade dependencies; Add suppression; workaround for JPA issue #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
536ef0e
[ESWE-1258] Upgrade dependencies; Add suppressions
rickchoijd Mar 11, 2025
aac57a1
[ESWE-1258] workaround JPA bug (of `3.4.3`)
rickchoijd Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
plugins {
id("uk.gov.justice.hmpps.gradle-spring-boot") version "7.1.1"
id("uk.gov.justice.hmpps.gradle-spring-boot") version "7.1.3"
kotlin("plugin.spring") version "2.1.10"
kotlin("plugin.jpa") version "2.1.10"
id("jvm-test-suite")
id("jacoco")
}

ext["logback.version"] = "1.5.16"

dependencies {
implementation("uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:5.3.0")
implementation("uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:5.3.2")
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-webflux")
implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
implementation("org.springframework.data:spring-data-envers")
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4")
implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.5") {
implementation("org.webjars:swagger-ui:5.20.0")
}
runtimeOnly("org.flywaydb:flyway-database-postgresql")
runtimeOnly("org.postgresql:postgresql")

Expand Down
10 changes: 9 additions & 1 deletion jobs-board-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,13 @@
<packageUrl regex="true">^pkg:javascript/DOMPurify@.*$</packageUrl>
<vulnerabilityName>CVE-2024-48910</vulnerabilityName>
</suppress>

<suppress>
<notes><![CDATA[
Suppression for DOMPurify mXSS, as it is used in testing only (Wiremock's bundled Swagger UI)
wiremock-jre8-standalone-2.35.1.jar: swagger-ui-bundle.js (pkg:javascript/[email protected]) : CVE-2025-26791
wiremock-jre8-standalone-2.35.1.jar: swagger-ui-es-bundle.js (pkg:javascript/[email protected]) : CVE-2025-26791
]]></notes>
<packageUrl regex="true">^pkg:javascript/DOMPurify@.*$</packageUrl>
<vulnerabilityName>CVE-2025-26791</vulnerabilityName>
</suppress>
</suppressions>
2 changes: 1 addition & 1 deletion .../uk/gov/justice/digital/hmpps/jobsboard/api/jobs/domain/MatchingCandidateJobRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ interface MatchingCandidateJobRepository : JpaRepository<Job, EntityId> {
LEFT JOIN Postcode pos1 ON j.postcode = pos1.code
LEFT JOIN Postcode pos2 ON pos2.code = :releaseArea
WHERE (j.closingDate >= :currentDate OR j.closingDate IS NULL)
AND (LOWER(j.sector) IN :sectors OR :sectors IS NULL )
AND (LOWER(j.sector) IN :#{#sectors} OR :#{#sectors} IS NULL )
AND a.id IS NULL
AND (CAST(ROUND(SQRT(POWER(pos2.xCoordinate - pos1.xCoordinate, 2) + POWER(pos2.yCoordinate - pos1.yCoordinate, 2)) / 1609.34, 1) AS FLOAT) <= :searchRadius
OR pos1.code IS NULL OR pos2.code IS NULL OR pos2.xCoordinate IS NULL OR pos2.yCoordinate IS NULL OR :searchRadius IS NULL)
Expand Down