From 9304ae6f08b2003944f15e8467a90ec76f5ebeef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 15:25:40 +0000 Subject: [PATCH 1/4] Bump the minor group across 1 directory with 11 updates Bumps the minor group with 11 updates in the / directory: | Package | From | To | | --- | --- | --- | | [jvm](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.0` | | [plugin.spring](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.0` | | [plugin.jpa](https://github.com/JetBrains/kotlin) | `2.0.21` | `2.1.0` | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.4.0` | | software.amazon.awssdk:aws-query-protocol | `2.29.15` | `2.29.29` | | software.amazon.awssdk:sts | `2.29.15` | `2.29.29` | | [com.microsoft.graph:microsoft-graph](https://github.com/microsoftgraph/msgraph-sdk-java) | `6.20.0` | `6.23.0` | | [io.sentry:sentry-spring-boot-starter-jakarta](https://github.com/getsentry/sentry-java) | `7.18.0` | `7.18.1` | | [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) | `2.6.0` | `2.7.0` | | [org.wiremock:wiremock-standalone](https://github.com/wiremock/wiremock) | `3.9.2` | `3.10.0` | | org.sonarqube | `6.0.0.5145` | `6.0.1.5171` | Updates `jvm` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `plugin.spring` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `plugin.jpa` from 2.0.21 to 2.1.0 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0) Updates `org.springframework.boot` from 3.3.5 to 3.4.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.4.0) Updates `software.amazon.awssdk:aws-query-protocol` from 2.29.15 to 2.29.29 Updates `software.amazon.awssdk:sts` from 2.29.15 to 2.29.29 Updates `com.microsoft.graph:microsoft-graph` from 6.20.0 to 6.23.0 - [Release notes](https://github.com/microsoftgraph/msgraph-sdk-java/releases) - [Changelog](https://github.com/microsoftgraph/msgraph-sdk-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/microsoftgraph/msgraph-sdk-java/compare/v6.20.0...v6.23.0) Updates `io.sentry:sentry-spring-boot-starter-jakarta` from 7.18.0 to 7.18.1 - [Release notes](https://github.com/getsentry/sentry-java/releases) - [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-java/compare/7.18.0...7.18.1) Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 2.6.0 to 2.7.0 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v2.6.0...v2.7.0) Updates `org.wiremock:wiremock-standalone` from 3.9.2 to 3.10.0 - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/3.9.2...3.10.0) Updates `org.sonarqube` from 6.0.0.5145 to 6.0.1.5171 --- updated-dependencies: - dependency-name: jvm dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: plugin.spring dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: plugin.jpa dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: software.amazon.awssdk:aws-query-protocol dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: com.microsoft.graph:microsoft-graph dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: io.sentry:sentry-spring-boot-starter-jakarta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: org.wiremock:wiremock-standalone dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: org.sonarqube dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor ... Signed-off-by: dependabot[bot] --- build.gradle.kts | 8 ++++---- buildSrc/build.gradle.kts | 2 +- settings.gradle.kts | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d5682eed7b..b6993f3239 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,10 +8,10 @@ import uk.gov.justice.digital.hmpps.plugins.ClassPathPlugin import uk.gov.justice.digital.hmpps.plugins.JibConfigPlugin plugins { - kotlin("jvm") version "2.0.21" - kotlin("plugin.spring") version "2.0.21" apply false - kotlin("plugin.jpa") version "2.0.21" apply false - id("org.springframework.boot") version "3.3.5" apply false + kotlin("jvm") version "2.1.0" + kotlin("plugin.spring") version "2.1.0" apply false + kotlin("plugin.jpa") version "2.1.0" apply false + id("org.springframework.boot") version "3.4.0" apply false id("io.spring.dependency-management") version "1.1.6" apply false id("com.gorylenko.gradle-git-properties") version "2.4.2" apply false id("com.google.cloud.tools.jib") apply false diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index da0ca2b316..439861629d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,6 +1,6 @@ plugins { id("com.google.cloud.tools.jib") version "3.4.4" apply false - id("org.sonarqube") version "6.0.0.5145" apply false + id("org.sonarqube") version "6.0.1.5171" apply false `kotlin-dsl` } diff --git a/settings.gradle.kts b/settings.gradle.kts index c73ea07547..06f3688957 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -74,16 +74,16 @@ dependencyResolutionManagement { create("libs") { library("asyncapi", "org.openfolder:kotlin-asyncapi-spring-web:3.0.3") library("aws-autoconfigure", "io.awspring.cloud:spring-cloud-aws-autoconfigure:3.2.1") - library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.29.15") + library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.29.29") library("aws-sns", "io.awspring.cloud:spring-cloud-aws-starter-sns:3.2.1") library("aws-sqs", "io.awspring.cloud:spring-cloud-aws-starter-sqs:3.2.1") library("aws-starter", "io.awspring.cloud:spring-cloud-aws-starter:3.2.1") - library("aws-sts", "software.amazon.awssdk:sts:2.29.15") + library("aws-sts", "software.amazon.awssdk:sts:2.29.29") library("azure-app-insights", "com.microsoft.azure:applicationinsights-web:3.6.2") library("azure-identity", "com.azure:azure-identity:1.14.2") library("flipt", "io.flipt:flipt-java:1.1.1") library("html2md", "com.vladsch.flexmark:flexmark-html2md-converter:0.64.8") - library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.20.0") + library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.23.0") library("mockito-inline", "org.mockito:mockito-inline:5.2.0") library("mockito-kotlin", "org.mockito.kotlin:mockito-kotlin:5.4.0") library("notify", "uk.gov.service.notify:notifications-java-client:5.2.1-RELEASE") @@ -91,9 +91,9 @@ dependencyResolutionManagement { "opentelemetry-annotations", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.10.0" ) - library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:7.18.0") - library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0") - library("wiremock", "org.wiremock:wiremock-standalone:3.9.2") + library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:7.18.1") + library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0") + library("wiremock", "org.wiremock:wiremock-standalone:3.10.0") bundle( "aws-messaging", From 8466be17f8563418ef304b186e16b12fc7989128 Mon Sep 17 00:00:00 2001 From: Marcus Aspin Date: Mon, 9 Dec 2024 16:01:46 +0000 Subject: [PATCH 2/4] Update Sonar --- buildSrc/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 439861629d..00f7dce988 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -12,5 +12,5 @@ repositories { dependencies { implementation("com.google.cloud.tools:jib-gradle-plugin:3.4.4") - implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.0.0.5145") + implementation("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:6.0.1.5171") } From d8cb3da129465bd933170130552536258788c2be Mon Sep 17 00:00:00 2001 From: Marcus Aspin Date: Tue, 10 Dec 2024 09:32:58 +0000 Subject: [PATCH 3/4] Pin Spring Boot to 3.3.5 for now --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b6993f3239..7337d43143 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { kotlin("jvm") version "2.1.0" kotlin("plugin.spring") version "2.1.0" apply false kotlin("plugin.jpa") version "2.1.0" apply false - id("org.springframework.boot") version "3.4.0" apply false + id("org.springframework.boot") version "3.3.5" apply false id("io.spring.dependency-management") version "1.1.6" apply false id("com.gorylenko.gradle-git-properties") version "2.4.2" apply false id("com.google.cloud.tools.jib") apply false From d42ca39e3703987e1fa7626505f895d7a83fd011 Mon Sep 17 00:00:00 2001 From: Marcus Aspin Date: Tue, 10 Dec 2024 09:48:11 +0000 Subject: [PATCH 4/4] Pin springdoc to 2.6.0 to match Spring Boot 3.3 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 06f3688957..4487277278 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -92,7 +92,7 @@ dependencyResolutionManagement { "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.10.0" ) library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:7.18.1") - library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0") + library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0") library("wiremock", "org.wiremock:wiremock-standalone:3.10.0") bundle(