diff --git a/build.gradle b/build.gradle index 27890ae..81a5821 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,9 @@ plugins { id 'org.springframework.boot' version '2.7.18' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'io.spring.dependency-management' version '1.1.4' id 'java' id 'jacoco' - id 'com.github.spotbugs' version '6.0.4' - id 'org.owasp.dependencycheck' version '7.4.4' + id 'com.github.spotbugs' version '6.0.6' } group = 'uk.nhs.prm.repo' @@ -169,14 +168,5 @@ spotbugsIntegration { } } -dependencyCheck { - failBuildOnCVSS = 7 - suppressionFile = './dependency-checks-suppression.xml' - analyzers { - assemblyEnabled = false - ossIndexEnabled = false - } -} - check.dependsOn integration diff --git a/dependency-checks-suppression.xml b/dependency-checks-suppression.xml deleted file mode 100644 index 89f6b90..0000000 --- a/dependency-checks-suppression.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - ^pkg:maven/io\.netty/netty\-tcnative\-classes@.*$ - cpe:/a:netty:netty - - - - ^pkg:maven/org\.springframework/spring\-.*$ - CVE-2016-1000027 - - - - ^pkg:maven/org\.springframework/spring\-.*$ - cpe:/a:springsource:spring_framework - cpe:/a:pivotal_software:spring_framework - cpe:/a:vmware:spring_framework - - - - ^pkg:maven/org\.apache\.bcel/bcel@.*$ - CVE-2022-42920 - - - - ^pkg:maven/commons\-codec/commons\-codec@.*$ - CVE-2021-37533 - - - - ^pkg:maven/org\.apache\.commons/commons\-text@.*$ - CVE-2021-37533 - - - - ^pkg:maven/commons\-logging/commons\-logging@.*$ - CVE-2021-37533 - - - - ^pkg:maven/org\.yaml/snakeyaml@.*$ - CVE-2022-3064 - CVE-2021-4235 - - - - ^pkg:maven/org\.latencyutils/LatencyUtils@.*$ - CVE-2021-4277 - - - - ^pkg:maven/software\.amazon\.awssdk/json\-utils@.*$ - CVE-2021-4277 - - - - ^pkg:maven/software\.amazon\.awssdk/utils@.*$ - CVE-2021-4277 - - - - ^pkg:maven/software\.amazon\.awssdk/json\-utils@.*$ - CVE-2022-45688 - - - - ^pkg:maven/software\.amazon\.awssdk/aws\-json\-protocol@.*$ - CVE-2022-45688 - - - - ^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-core@.*$ - CVE-2022-45688 - - diff --git a/gocd/audit.pipeline.gocd.yml b/gocd/audit.pipeline.gocd.yml deleted file mode 100644 index d50c9ec..0000000 --- a/gocd/audit.pipeline.gocd.yml +++ /dev/null @@ -1,29 +0,0 @@ -format_version: 4 -pipelines: - re-registration-service.audit: - group: repo-audit - label_template: '${COUNT}-${git[:8]}' - materials: - git: - type: configrepo - timer: - spec: 0 0 5 ? * MON,TUE,WED,THU,FRI * - stages: - - audit: - clean_workspace: true - approval: manual - jobs: - dependency_check: - artifacts: - - build: - source: build/reports - tabs: - dependency: reports/dependency-check-report.html - resources: - - docker - tasks: - - exec: - command: /bin/bash - arguments: - - -c - - ./tasks dep diff --git a/tasks b/tasks index c2e19c5..23dcb66 100755 --- a/tasks +++ b/tasks @@ -231,12 +231,6 @@ case "${command}" in run_localstack_local) docker-compose -f docker-compose.localstack-local.yaml up -d ;; - _dep) - gradle dependencyCheckAnalyze - ;; - dep) - dojo "./tasks _dep" - ;; _tf) _assume_environment_role $NHS_ENVIRONMENT tf_init