Skip to content

Commit

Permalink
FACT 1698 - Renovate Dependency Updates (#644)
Browse files Browse the repository at this point in the history
* Update Helm release java to v5.0.4

* Update dependency com.typesafe:config to v1.4.3

* Update dependency org.springframework.cloud:spring-cloud-starter-openfeign to v3.1.9

* Update junit5 monorepo

* Bumping chart version/ fixing aliases

* Update dependency commons-validator:commons-validator to v1.8.0

* Update dependency com.fasterxml.jackson.core:jackson-databind to v2.17.0

* Update Terraform azurerm to ~> 3.101.0

* - manually updates chart-java

* - suppresses jackson-databind cve

* - manually updates gradle version

* - manually updates hasicorp/terraform version

* Revert "Merge remote-tracking branch 'origin/renovate/com.fasterxml.jackson.core-2.14.2' into FACT-1698-renovate-updates"

This reverts commit f1c0b86, reversing
changes made to a08d95a.

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: hmcts-jenkins-a-to-c <62422075+hmcts-jenkins-a-to-c[bot]@users.noreply.github.com>
  • Loading branch information
3 people committed May 23, 2024
1 parent 2329f66 commit e5034a6
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ repositories {
// it is important to specify logback classic and core packages explicitly as libraries like spring boot
// enforces it's own (older) version which is not recommended.
def versions = [
junit : '5.9.3',
junitPlatform : '1.9.3',
junit : '5.10.2',
junitPlatform : '1.10.2',
reformLogging : '6.0.1'
]

Expand All @@ -158,7 +158,7 @@ dependencyManagement {
entry 'commons-io'
}
// for CompatibilityNotMetException
dependencySet(group: 'org.springframework.cloud', version: '3.1.8') {
dependencySet(group: 'org.springframework.cloud', version: '3.1.9') {
entry 'spring-cloud-starter-openfeign'
}
dependencySet(group: 'org.apache.logging.log4j', version: '2.20.0') {
Expand Down Expand Up @@ -203,7 +203,7 @@ dependencies {
implementation group: 'com.github.hmcts.java-logging', name: 'logging-appinsights', version: versions.reformLogging
implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '7.4'
implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.0.3'
implementation group: 'commons-validator', name: 'commons-validator', version: '1.7'
implementation group: 'commons-validator', name: 'commons-validator', version: '1.8.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
implementation group: 'com.google.guava', name: 'guava', version: '33.0.0-jre'

Expand All @@ -215,7 +215,7 @@ dependencies {
testImplementation group: 'org.apiguardian', name: 'apiguardian-api', version: '1.1.2'

testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.4.0'
testImplementation group: 'com.typesafe', name: 'config', version: '1.4.2'
testImplementation group: 'com.typesafe', name: 'config', version: '1.4.3'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.24.2'
testImplementation group: 'io.rest-assured', name: 'rest-assured'

Expand Down
4 changes: 2 additions & 2 deletions charts/bulk-scan-sample-app/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v2
name: bulk-scan-sample-app
home: https://github.com/hmcts/bulk-scan-ccd-event-handler-sample-app
version: 1.4.11
version: 1.4.12
description: HMCTS Bulk Scan CCD event handler application
maintainers:
- name: HMCTS BSP Team
email: bspteam@hmcts.net
dependencies:
- name: java
version: 5.0.0
version: 5.2.0
repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
4 changes: 4 additions & 0 deletions config/owasp/suppressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@
<cve>CVE-2023-6378</cve>
<cve>CVE-2023-6481</cve>
</suppress>
<suppress>
<notes>Jackson-databind. Wait for newer springdoc.</notes>
<cve>CVE-2023-35116</cve>
</suppress>
</suppressions>
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion infrastructure/.terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.2
1.8.2
2 changes: 1 addition & 1 deletion infrastructure/state.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "~> 3.63.0"
version = "~> 3.101.0"
}
random = {
source = "hashicorp/random"
Expand Down

0 comments on commit e5034a6

Please sign in to comment.