From a732e51f0e911564b267a2369b9c27957c484532 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Dec 2024 13:00:08 +0000 Subject: [PATCH] Bump the minor group across 1 directory with 7 updates (#4517) * Bump the minor group across 1 directory with 7 updates Bumps the minor group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.3.5` | `3.3.7` | | [io.spring.dependency-management](https://github.com/spring-gradle-plugins/dependency-management-plugin) | `1.1.6` | `1.1.7` | | software.amazon.awssdk:aws-query-protocol | `2.29.34` | `2.29.40` | | software.amazon.awssdk:sts | `2.29.34` | `2.29.40` | | [com.microsoft.graph:microsoft-graph](https://github.com/microsoftgraph/msgraph-sdk-java) | `6.23.0` | `6.24.0` | | [io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations](https://github.com/open-telemetry/opentelemetry-java-instrumentation) | `2.10.0` | `2.11.0` | | [io.sentry:sentry-spring-boot-starter-jakarta](https://github.com/getsentry/sentry-java) | `7.19.0` | `7.19.1` | Updates `org.springframework.boot` from 3.3.5 to 3.3.7 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.3.5...v3.3.7) Updates `io.spring.dependency-management` from 1.1.6 to 1.1.7 - [Release notes](https://github.com/spring-gradle-plugins/dependency-management-plugin/releases) - [Commits](https://github.com/spring-gradle-plugins/dependency-management-plugin/compare/v1.1.6...v1.1.7) Updates `software.amazon.awssdk:aws-query-protocol` from 2.29.34 to 2.29.40 Updates `software.amazon.awssdk:sts` from 2.29.34 to 2.29.40 Updates `com.microsoft.graph:microsoft-graph` from 6.23.0 to 6.24.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.23.0...v6.24.0) Updates `io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations` from 2.10.0 to 2.11.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/compare/v2.10.0...v2.11.0) Updates `io.sentry:sentry-spring-boot-starter-jakarta` from 7.19.0 to 7.19.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.19.0...7.19.1) --- updated-dependencies: - dependency-name: org.springframework.boot dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: io.spring.dependency-management dependency-type: direct:production update-type: version-update:semver-patch 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.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations 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 ... Signed-off-by: dependabot[bot] * Updates for Spring Boot 3.3.7 * Update ClassPathPlugin.kt --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Marcus Aspin --- build.gradle.kts | 4 ++-- .../justice/digital/hmpps/plugins/ClassPathPlugin.kt | 2 +- .../justice/digital/hmpps/alfresco/AlfrescoClient.kt | 2 +- settings.gradle.kts | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7337d43143..c6936801de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,8 +11,8 @@ 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.3.5" apply false - id("io.spring.dependency-management") version "1.1.6" apply false + id("org.springframework.boot") version "3.3.7" apply false + id("io.spring.dependency-management") version "1.1.7" apply false id("com.gorylenko.gradle-git-properties") version "2.4.2" apply false id("com.google.cloud.tools.jib") apply false id("base") diff --git a/buildSrc/src/main/kotlin/uk/gov/justice/digital/hmpps/plugins/ClassPathPlugin.kt b/buildSrc/src/main/kotlin/uk/gov/justice/digital/hmpps/plugins/ClassPathPlugin.kt index ce40d61ae0..c5e947b652 100644 --- a/buildSrc/src/main/kotlin/uk/gov/justice/digital/hmpps/plugins/ClassPathPlugin.kt +++ b/buildSrc/src/main/kotlin/uk/gov/justice/digital/hmpps/plugins/ClassPathPlugin.kt @@ -54,7 +54,7 @@ class ClassPathPlugin : Plugin { } } - project.tasks.create("integrationTest", Test::class.java) { + project.tasks.register("integrationTest", Test::class.java) { testClassesDirs = getByName("integrationTest").output.classesDirs classpath = getByName("integrationTest").runtimeClasspath val profiles = System.getProperty("spring.profiles.active", System.getenv("SPRING_PROFILES_ACTIVE")) diff --git a/libs/document-management/src/main/kotlin/uk/gov/justice/digital/hmpps/alfresco/AlfrescoClient.kt b/libs/document-management/src/main/kotlin/uk/gov/justice/digital/hmpps/alfresco/AlfrescoClient.kt index dc0af65e35..670961174d 100644 --- a/libs/document-management/src/main/kotlin/uk/gov/justice/digital/hmpps/alfresco/AlfrescoClient.kt +++ b/libs/document-management/src/main/kotlin/uk/gov/justice/digital/hmpps/alfresco/AlfrescoClient.kt @@ -48,7 +48,7 @@ class AlfrescoClient( else -> throw RuntimeException("Failed to download document. Alfresco responded with ${res.statusCode}.") } - }, false) + }, false) ?: throw NotFoundException("Document content", "alfrescoId", id) private fun HttpHeaders.copy(key: String, res: ConvertibleClientHttpResponse) { res.headers[key]?.also { this[key] = it } diff --git a/settings.gradle.kts b/settings.gradle.kts index caa280dfe3..c5b41d369a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -74,24 +74,24 @@ 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.34") + library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.29.40") 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.34") + library("aws-sts", "software.amazon.awssdk:sts:2.29.40") 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.23.0") + library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.24.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") library( "opentelemetry-annotations", - "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.10.0" + "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.11.0" ) - library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:7.19.0") + library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:7.19.1") library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0") library("wiremock", "org.wiremock:wiremock-standalone:3.10.0")