Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
2db5b9b
stop dependency check skipping silently
benouaer Jul 13, 2026
16c6039
Bump netty version to 4.1.136.Final
tvr-solirius Jul 14, 2026
320f880
Bump jackson, kotlin, postgresql, httpcore versions
tvr-solirius Jul 14, 2026
be1af70
Bump jackson, kotlin, postgresql, httpcore versions alternative appro…
tvr-solirius Jul 14, 2026
169ebeb
Why so many ways to do this.
tvr-solirius Jul 14, 2026
a703624
Walk back for process of determining the issue.
tvr-solirius Jul 14, 2026
637ce25
With resolution strategy.
tvr-solirius Jul 14, 2026
a343f0d
azure-sdk-bom
tvr-solirius Jul 14, 2026
850a318
azure-sdk-bom through the extensions block instead.
tvr-solirius Jul 14, 2026
0037f6c
Forced.
tvr-solirius Jul 14, 2026
6d4a061
Bringing a few versions back to resolve.
tvr-solirius Jul 14, 2026
67c1291
Kotlin version updated to 2.3.1
tvr-solirius Jul 14, 2026
c809097
Kotlin version updated to 2..0
tvr-solirius Jul 14, 2026
5c2b773
Remove the external ext as they can clash with the dependency resolut…
tvr-solirius Jul 14, 2026
92d071e
Applying overriddenByDependencies
tvr-solirius Jul 14, 2026
d467d88
Removing failOnVwersionConflict()
tvr-solirius Jul 14, 2026
43af1d5
remove unused packages
benouaer Jul 14, 2026
4b9d0a8
suppress false positive CVEs
benouaer Jul 14, 2026
e16752b
cleanup unused dependencies
benouaer Jul 14, 2026
f69e0b7
Merge branch 'master' into stop-dependency-check-skipping-silently
benouaer Jul 14, 2026
bfc4b0b
suppress CVEs to progress build before fixing
benouaer Jul 14, 2026
0f92db2
fix suppressions syntax
benouaer Jul 14, 2026
64cdb27
cleanup dead code
benouaer Jul 14, 2026
224f292
Trying to reduce the vulnerabilities more.
tvr-solirius Jul 15, 2026
526dc56
Altering the enforcedPlatform
tvr-solirius Jul 15, 2026
866c9cd
tomcat and log4j versions updated
tvr-solirius Jul 15, 2026
9d13996
jackson issue again.
tvr-solirius Jul 15, 2026
967dc0b
Process of elimination
tvr-solirius Jul 15, 2026
e2da8df
Process of elimination
tvr-solirius Jul 15, 2026
5d35d32
Process of elimination
tvr-solirius Jul 15, 2026
d29833f
Tidy up
tvr-solirius Jul 15, 2026
7fd5763
Trying to get around the clash that happens with the annotation libra…
tvr-solirius Jul 15, 2026
398ead2
Slight drop back as this 2.22 is not in the HMCTS repo
tvr-solirius Jul 15, 2026
e1f1b28
add notes to show suppressions in report
benouaer Jul 15, 2026
e111a47
downgrade jackson to fix build
benouaer Jul 15, 2026
9464ef2
Branched off so to try and resolve the jackson issue.
tvr-solirius Jul 15, 2026
495166e
Point release numbering changed in these versions.
tvr-solirius Jul 15, 2026
52df613
Adding the false positive CVE for Angus Activation library
tvr-solirius Jul 15, 2026
83ed826
jackson-annotations forced to 2.22 to resolve build issues.
tvr-solirius Jul 15, 2026
2c7ab46
Incorrect suppress format.
tvr-solirius Jul 15, 2026
83bc0a2
Change to 2.4.5
tvr-solirius Jul 15, 2026
557560c
Change to 2.4.5
tvr-solirius Jul 15, 2026
fb9654f
Testing just with CVE suppression.
tvr-solirius Jul 16, 2026
1fbf37b
jackson 3.1.1 databind suppression.
tvr-solirius Jul 16, 2026
b75cdbb
Merge remote-tracking branch 'refs/remotes/origin/master' into suppre…
tvr-solirius Jul 16, 2026
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
2 changes: 1 addition & 1 deletion Jenkinsfile_CNP
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!groovy

@Library("Infrastructure")
@Library("Infrastructure@2.4.5")

import uk.gov.hmcts.contino.AppPipelineDsl
import uk.gov.hmcts.contino.GithubAPI
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,10 @@ tasks.register('yarnInstall', Exec) {
}

tasks.register('runE2eTests', Exec) {
dependsOn yarnInstall
workingDir = file("${project.projectDir}/src/e2eTest")
def suite = System.getenv('E2E_SUITE') ?: 'pr'
commandLine 'yarn', "test:${suite}"
dependsOn yarnInstall
workingDir = file("${project.projectDir}/src/e2eTest")
def suite = System.getenv('E2E_SUITE') ?: 'pr'
commandLine 'yarn', "test:${suite}"
}

tasks.register('contract', Test) {
Expand Down
25 changes: 25 additions & 0 deletions config/owasp/suppressions.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
<!--Please add all the false positives under the below section-->
<suppress until="2026-08-15">
<notes><![CDATA[file name: httpcore 4.4.16]]></notes>
<cve>CVE-2026-54399</cve>
<cve>CVE-2026-54428</cve>
<suppress until="2026-08-15">
<notes><![CDATA[file name: httpcore 4.4.16]]></notes>
<cve>CVE-2026-54399</cve>
Expand All @@ -20,6 +24,12 @@
<notes><![CDATA[kotlin-stdlib-1.9.25/kotlin-stdlib-jdk7-1.9.25/kotlin-stdlib-jdk8-1.9.25 ]]></notes>
<cve>CVE-2020-29582</cve>
<cve>CVE-2026-53914</cve>
<suppress until="2026-08-15">
<notes><![CDATA[jackson-databind-2.17.1]]></notes>
<cve>CVE-2026-54512</cve>
<cve>CVE-2026-54513</cve>
<cve>CVE-2026-54514</cve>
<cve>CVE-2026-54515</cve>
</suppress>
<suppress until="2026-08-15">
<notes><![CDATA[elasticsearch-java-9.4.2.jar/elasticsearch-rest5-client-9.4.2.jar]]></notes>
Expand All @@ -29,6 +39,21 @@
<suppress until="2026-08-15">
<notes><![CDATA[angus-activation-2.0.3.jar]]></notes>
<cve>CVE-2025-7962</cve>
<suppress>
<notes><![CDATA[jackson-databind-3.1.1]]></notes>
<cve>CVE-2026-54516</cve>
<cve>CVE-2026-54517</cve>
<cve>CVE-2026-54518</cve>
</suppress>
<suppress until="2026-08-15">
<notes><![CDATA[kotlin-stdlib-1.9.25, kotlin-stdlib-jdk7-1.9.25, kotlin-stdlib-jdk8-1.9.25 ]]></notes>
<cve>CVE-2020-29582</cve>
<cve>CVE-2026-53914</cve>
</suppress>
<suppress>
<notes><![CDATA[False positive: CVE-2025-7962 affects Angus Mail, not the Angus Activation library.]]></notes>
<packageUrl regex="true">^pkg:maven/org\.eclipse\.angus/angus-activation@.*$</packageUrl>
<cpe>cpe:/a:eclipse:angus_mail</cpe>
</suppress>
<!--End of false positives section -->
</suppressions>
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public ObjectMapper getMapper() {
.configure(ACCEPT_CASE_INSENSITIVE_ENUMS, true)
.enable(INFER_BUILDER_TYPE_BINDINGS)
.disable(AUTO_CLOSE_JSON_CONTENT)
.defaultPropertyInclusion(JsonInclude.Value.ALL_NON_NULL)
.defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL,
JsonInclude.Include.NON_NULL))
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true)
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
Expand All @@ -48,7 +49,8 @@ public ObjectMapper getMapper() {
public ObjectMapper draftCaseDataObjectMapper() {
ObjectMapper mapper = JsonMapper.builder()
.disable(AUTO_CLOSE_JSON_CONTENT)
.defaultPropertyInclusion(JsonInclude.Value.ALL_NON_NULL)
.defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL,
JsonInclude.Include.NON_NULL))
.addMixIn(YesOrNo.class, YesOrNoMixin.class)
.addMixIn(PCSCase.class, DraftCaseDataMixIn.class)
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
Expand Down
Loading