Skip to content

Commit

Permalink
Update dependencies (#402)
Browse files Browse the repository at this point in the history
* Update dependency gradle to v8.12
* Update all non major Gradle dependencies
* Bump the development group across 1 directory with 2 updates
* Accept trivy suppressions from shared DPS lib
* Keep kotlin plugins < 2.1 since dependencies are still incompatible
  • Loading branch information
renovate[bot] authored Jan 3, 2025
1 parent f184dbb commit 13aff69
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 53 deletions.
3 changes: 3 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
# Suppression for h2 2.1.214 password on command line vulnerability
# can be suppressed as we only run h2 locally and not on build environments
CVE-2022-45868
# Suppression for tomcat vulnerability affecting jsp compilation in the default servlet
# can be suppressed as we do not use the default servlet and haven't configured it for write either
CVE-2024-50379
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import uk.gov.justice.digital.hmpps.gradle.PortForwardRedisTask
import uk.gov.justice.digital.hmpps.gradle.RevealSecretsTask

plugins {
id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.1.0"
id("uk.gov.justice.hmpps.gradle-spring-boot") version "6.1.2"
kotlin("plugin.jpa") version "2.0.21"
kotlin("plugin.spring") version "2.0.21"
idea
Expand All @@ -16,19 +16,19 @@ configurations {
}

dependencies {
implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:1.1.0")
implementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter:1.1.1")
implementation("org.springframework.boot:spring-boot-starter-webflux")
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-validation")

implementation("uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:5.2.0")
implementation("uk.gov.justice.service.hmpps:hmpps-digital-prison-reporting-lib:7.2.2")
implementation("uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:5.2.2")
implementation("uk.gov.justice.service.hmpps:hmpps-digital-prison-reporting-lib:7.3.13")

implementation("io.opentelemetry:opentelemetry-api:1.44.1")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.10.0")
implementation("io.opentelemetry:opentelemetry-api:1.45.0")
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.11.0")

implementation("com.vladmihalcea:hibernate-types-60:2.21.1")
implementation("org.hibernate.orm:hibernate-community-dialects:6.6.3.Final")
implementation("org.hibernate.orm:hibernate-community-dialects:6.6.4.Final")

implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0")

Expand All @@ -41,7 +41,7 @@ dependencies {

testImplementation("org.wiremock:wiremock-standalone:3.10.0")

testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:1.1.0")
testImplementation("uk.gov.justice.service.hmpps:hmpps-kotlin-spring-boot-starter-test:1.1.1")
testImplementation("org.awaitility:awaitility-kotlin:4.2.2")
testImplementation("org.mockito:mockito-inline:5.2.0")
testImplementation("io.swagger.parser.v3:swagger-parser:2.1.24")
Expand Down
84 changes: 42 additions & 42 deletions clients/node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down

0 comments on commit 13aff69

Please sign in to comment.