Skip to content

Commit 7525307

Browse files
dependabot[bot]anthony-britton-moj
dependabot[bot]
and
anthony-britton-moj
authored
Bump the minor group across 1 directory with 17 updates (#5116)
* Bump the minor group across 1 directory with 17 updates Bumps the minor group with 17 updates in the / directory: | Package | From | To | | --- | --- | --- | | [com.microsoft.azure:applicationinsights-agent](https://github.com/Microsoft/ApplicationInsights-Java) | `3.7.2` | `3.7.3` | | [org.springframework.boot](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | | io.awspring.cloud:spring-cloud-aws-starter-s3 | `3.3.0` | `3.4.0` | | [io.awspring.cloud:spring-cloud-aws-autoconfigure](https://github.com/awspring/spring-cloud-aws) | `3.3.0` | `3.4.0` | | software.amazon.awssdk:aws-query-protocol | `2.31.45` | `2.31.61` | | io.awspring.cloud:spring-cloud-aws-starter-sns | `3.3.0` | `3.4.0` | | io.awspring.cloud:spring-cloud-aws-starter-sqs | `3.3.0` | `3.4.0` | | io.awspring.cloud:spring-cloud-aws-starter | `3.3.0` | `3.4.0` | | software.amazon.awssdk:sts | `2.31.45` | `2.31.61` | | [com.microsoft.azure:applicationinsights-web](https://github.com/Microsoft/ApplicationInsights-Java) | `3.7.2` | `3.7.3` | | [com.azure:azure-identity](https://github.com/Azure/azure-sdk-for-java) | `1.16.1` | `1.16.2` | | [com.microsoft.graph:microsoft-graph](https://github.com/microsoftgraph/msgraph-sdk-java) | `6.38.0` | `6.41.0` | | [org.opensearch.client:spring-data-opensearch-starter](https://github.com/opensearch-project/spring-data-opensearch) | `1.6.3` | `1.7.0` | | [io.sentry:sentry-spring-boot-starter-jakarta](https://github.com/getsentry/sentry-java) | `8.12.0` | `8.13.2` | | [org.springdoc:springdoc-openapi-starter-webmvc-ui](https://github.com/springdoc/springdoc-openapi) | `2.8.8` | `2.8.9` | | [org.wiremock:wiremock-standalone](https://github.com/wiremock/wiremock) | `3.13.0` | `3.13.1` | | com.gradle.develocity | `4.0.1` | `4.0.2` | Updates `com.microsoft.azure:applicationinsights-agent` from 3.7.2 to 3.7.3 - [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases) - [Changelog](https://github.com/microsoft/ApplicationInsights-Java/blob/main/CHANGELOG.md) - [Commits](microsoft/ApplicationInsights-Java@3.7.2...3.7.3) Updates `org.springframework.boot` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](spring-projects/spring-boot@v3.4.5...v3.5.0) Updates `io.awspring.cloud:spring-cloud-aws-starter-s3` from 3.3.0 to 3.4.0 Updates `io.awspring.cloud:spring-cloud-aws-autoconfigure` from 3.3.0 to 3.4.0 - [Release notes](https://github.com/awspring/spring-cloud-aws/releases) - [Commits](awspring/spring-cloud-aws@v3.3.0...v3.4.0) Updates `software.amazon.awssdk:aws-query-protocol` from 2.31.45 to 2.31.61 Updates `io.awspring.cloud:spring-cloud-aws-starter-sns` from 3.3.0 to 3.4.0 Updates `io.awspring.cloud:spring-cloud-aws-starter-sqs` from 3.3.0 to 3.4.0 Updates `io.awspring.cloud:spring-cloud-aws-starter` from 3.3.0 to 3.4.0 Updates `software.amazon.awssdk:sts` from 2.31.45 to 2.31.61 Updates `com.microsoft.azure:applicationinsights-web` from 3.7.2 to 3.7.3 - [Release notes](https://github.com/Microsoft/ApplicationInsights-Java/releases) - [Changelog](https://github.com/microsoft/ApplicationInsights-Java/blob/main/CHANGELOG.md) - [Commits](microsoft/ApplicationInsights-Java@3.7.2...3.7.3) Updates `com.azure:azure-identity` from 1.16.1 to 1.16.2 - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](Azure/azure-sdk-for-java@azure-identity_1.16.1...azure-identity_1.16.2) Updates `com.microsoft.graph:microsoft-graph` from 6.38.0 to 6.41.0 - [Release notes](https://github.com/microsoftgraph/msgraph-sdk-java/releases) - [Changelog](https://github.com/microsoftgraph/msgraph-sdk-java/blob/main/CHANGELOG.md) - [Commits](microsoftgraph/msgraph-sdk-java@v6.38.0...v6.41.0) Updates `org.opensearch.client:spring-data-opensearch-starter` from 1.6.3 to 1.7.0 - [Release notes](https://github.com/opensearch-project/spring-data-opensearch/releases) - [Commits](opensearch-project/spring-data-opensearch@v1.6.3...v1.7.0) Updates `io.sentry:sentry-spring-boot-starter-jakarta` from 8.12.0 to 8.13.2 - [Release notes](https://github.com/getsentry/sentry-java/releases) - [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md) - [Commits](getsentry/sentry-java@8.12.0...8.13.2) Updates `org.springdoc:springdoc-openapi-starter-webmvc-ui` from 2.8.8 to 2.8.9 - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](springdoc/springdoc-openapi@v2.8.8...v2.8.9) Updates `org.wiremock:wiremock-standalone` from 3.13.0 to 3.13.1 - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](wiremock/wiremock@3.13.0...3.13.1) Updates `com.gradle.develocity` from 4.0.1 to 4.0.2 --- updated-dependencies: - dependency-name: com.microsoft.azure:applicationinsights-agent dependency-version: 3.7.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: org.springframework.boot dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: io.awspring.cloud:spring-cloud-aws-starter-s3 dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: io.awspring.cloud:spring-cloud-aws-autoconfigure dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: software.amazon.awssdk:aws-query-protocol dependency-version: 2.31.61 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: io.awspring.cloud:spring-cloud-aws-starter-sns dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: io.awspring.cloud:spring-cloud-aws-starter-sqs dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: io.awspring.cloud:spring-cloud-aws-starter dependency-version: 3.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: software.amazon.awssdk:sts dependency-version: 2.31.61 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: com.microsoft.azure:applicationinsights-web dependency-version: 3.7.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: com.azure:azure-identity dependency-version: 1.16.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: com.microsoft.graph:microsoft-graph dependency-version: 6.41.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: org.opensearch.client:spring-data-opensearch-starter dependency-version: 1.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: io.sentry:sentry-spring-boot-starter-jakarta dependency-version: 8.13.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-ui dependency-version: 2.8.9 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: org.wiremock:wiremock-standalone dependency-version: 3.13.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor - dependency-name: com.gradle.develocity dependency-version: 4.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor ... Signed-off-by: dependabot[bot] <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anthony Britton <[email protected]>
1 parent 3c4eaf2 commit 7525307

File tree

5 files changed

+32
-35
lines changed

5 files changed

+32
-35
lines changed

‎build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
kotlin("jvm") version "2.1.21"
1212
kotlin("plugin.spring") version "2.1.21" apply false
1313
kotlin("plugin.jpa") version "2.1.21" apply false
14-
id("org.springframework.boot") version "3.4.5" apply false
14+
id("org.springframework.boot") version "3.5.3" apply false
1515
id("io.spring.dependency-management") version "1.1.7" apply false
1616
id("com.gorylenko.gradle-git-properties") version "2.5.0" apply false
1717
id("com.google.cloud.tools.jib") apply false
@@ -23,7 +23,7 @@ plugins {
2323
val agentDeps: Configuration by configurations.creating
2424

2525
dependencies {
26-
agentDeps("com.microsoft.azure:applicationinsights-agent:3.7.2")
26+
agentDeps("com.microsoft.azure:applicationinsights-agent:3.7.3")
2727
}
2828

2929
val copyAgentTask = project.tasks.register<Copy>("copyAgent") {

‎projects/common-platform-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import software.amazon.awssdk.services.s3.model.GetObjectResponse
2626
import uk.gov.justice.digital.hmpps.audit.entity.AuditedInteraction
2727
import uk.gov.justice.digital.hmpps.audit.service.AuditedInteractionService
2828
import uk.gov.justice.digital.hmpps.data.generator.MessageGenerator
29-
import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator
3029
import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator.generate
3130
import uk.gov.justice.digital.hmpps.flags.FeatureFlags
3231
import uk.gov.justice.digital.hmpps.integrations.delius.audit.BusinessInteractionCode
@@ -43,7 +42,6 @@ import uk.gov.justice.digital.hmpps.service.PersonService
4342
import uk.gov.justice.digital.hmpps.telemetry.TelemetryMessagingExtensions.notificationReceived
4443
import uk.gov.justice.digital.hmpps.telemetry.TelemetryService
4544
import java.io.ByteArrayInputStream
46-
import java.time.Duration
4745
import java.time.LocalDate
4846
import java.util.function.Function
4947

@@ -220,8 +218,8 @@ internal class IntegrationTest {
220218

221219
verify(addressRepository).save(check<PersonAddress> {
222220
assertThat(it.start, Matchers.equalTo(LocalDate.now()))
223-
assertNull(it.endDate)
224-
assertNotNull(it.notes)
221+
Assertions.assertNull(it.endDate)
222+
Assertions.assertNotNull(it.notes)
225223
assertThat(it.softDeleted, Matchers.equalTo(false))
226224
assertThat(it.status.code, Matchers.equalTo(ReferenceData.StandardRefDataCode.ADDRESS_MAIN_STATUS.code))
227225
assertThat(it.noFixedAbode, Matchers.equalTo(false))
@@ -276,8 +274,8 @@ internal class IntegrationTest {
276274

277275
verify(addressRepository).save(check<PersonAddress> {
278276
assertThat(it.start, Matchers.equalTo(LocalDate.now()))
279-
assertNull(it.endDate)
280-
assertNotNull(it.notes)
277+
Assertions.assertNull(it.endDate)
278+
Assertions.assertNotNull(it.notes)
281279
assertThat(it.softDeleted, Matchers.equalTo(false))
282280
assertThat(it.status.code, Matchers.equalTo(ReferenceData.StandardRefDataCode.ADDRESS_MAIN_STATUS.code))
283281
assertThat(it.noFixedAbode, Matchers.equalTo(false))
@@ -307,17 +305,17 @@ internal class IntegrationTest {
307305
assertEquals(1, event.version)
308306
assertEquals("probation-case.engagement.created", event.eventType)
309307
assertEquals("A probation case record for a person has been created in Delius", event.description)
310-
assertNotNull(event.personReference.findCrn())
311-
assertNull(event.detailUrl)
308+
Assertions.assertNotNull(event.personReference.findCrn())
309+
Assertions.assertNull(event.detailUrl)
312310
assertTrue(event.additionalInformation.isEmpty())
313311
}
314312

315313
"probation-case.address.created" -> {
316314
assertEquals(1, event.version)
317315
assertEquals("probation-case.address.created", event.eventType)
318316
assertEquals("A new address has been created on the probation case", event.description)
319-
assertNotNull(event.personReference.findCrn())
320-
assertNull(event.detailUrl)
317+
Assertions.assertNotNull(event.personReference.findCrn())
318+
Assertions.assertNull(event.detailUrl)
321319

322320
with(event.additionalInformation) {
323321
assertTrue(containsKey("addressStatus"))
@@ -354,7 +352,7 @@ internal class IntegrationTest {
354352
assertThat(it.district, Matchers.containsString("Example Address Line 2"))
355353
assertThat(it.town, Matchers.containsString("Example Address Line 3"))
356354
assertThat(it.postcode, Matchers.containsString("AA1 1AA"))
357-
assertNull(it.endDate)
355+
Assertions.assertNull(it.endDate)
358356
assertThat(
359357
it.notes,
360358
Matchers.equalTo("This address record was initially created using information from HMCTS Common Platform.")
@@ -379,8 +377,8 @@ internal class IntegrationTest {
379377
assertThat(it.streetName, Matchers.containsString("Test Street"))
380378
assertThat(it.addressNumber, Matchers.containsString("123"))
381379
assertThat(it.town, Matchers.containsString("Test"))
382-
assertNull(it.endDate)
383-
assertNotNull(it.notes)
380+
Assertions.assertNull(it.endDate)
381+
Assertions.assertNotNull(it.notes)
384382
assertThat(it.softDeleted, Matchers.equalTo(false))
385383
assertThat(it.status.code, Matchers.equalTo(ReferenceData.StandardRefDataCode.ADDRESS_MAIN_STATUS.code))
386384
assertThat(it.noFixedAbode, Matchers.equalTo(false))
@@ -419,7 +417,7 @@ internal class IntegrationTest {
419417
assertThat(it.person.forename, Matchers.equalTo("Example First Name"))
420418
assertThat(it.person.surname, Matchers.equalTo("Example Last Name"))
421419
assertThat(it.offence.description, Matchers.equalTo("Murder"))
422-
assertNotNull(it.offence)
420+
Assertions.assertNotNull(it.offence)
423421
})
424422
verify(courtAppearanceRepository).save(check<CourtAppearance> {
425423
assertThat(it.person.forename, Matchers.equalTo("Example First Name"))
@@ -442,7 +440,7 @@ internal class IntegrationTest {
442440
assertThat(it.allocationReason.description, Matchers.equalTo("Initial Allocation"))
443441
assertTrue(it.active)
444442
assertThat(it.allocationDate, Matchers.equalTo(LocalDate.of(2024, 1, 1)))
445-
assertNull(it.endDate)
443+
Assertions.assertNull(it.endDate)
446444
})
447445

448446
verify(personService).updatePerson(check<Person> {

‎projects/workforce-allocations-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/allocations/InitialAllocation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ interface InitialAllocation {
3737
val allocationDate: LocalDate
3838

3939
@get:JsonFormat(shape = STRING, pattern = "dd/MM/yyyy")
40-
val endDate: LocalDate
40+
val endDate: LocalDate?
4141
val officerCode: String
4242
val teamCode: String
4343
val teamDescription: String

‎projects/workforce-allocations-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/InitialAllocationService.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ import uk.gov.justice.digital.hmpps.config.CsvMapperConfig.csvMapper
66
import uk.gov.justice.digital.hmpps.integrations.delius.allocations.InitialAllocation
77
import uk.gov.justice.digital.hmpps.integrations.delius.allocations.InitialAllocationRepository
88
import java.io.OutputStream
9-
import kotlin.streams.asSequence
109

1110
@Service
1211
class InitialAllocationService(private val initialAllocationRepository: InitialAllocationRepository) {
1312
@Transactional
1413
fun writeInitialAllocations(outputStream: OutputStream) {
15-
val results = initialAllocationRepository.findAllInitialAllocations().asSequence()
14+
val results = initialAllocationRepository.findAllInitialAllocations()
1615
csvMapper
1716
.writer(csvMapper.schemaFor(InitialAllocation::class.java).withHeader())
1817
.writeValues(outputStream.bufferedWriter())

‎settings.gradle.kts

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,30 @@ dependencyResolutionManagement {
7676
versionCatalogs {
7777
create("libs") {
7878
library("asyncapi", "org.openfolder:kotlin-asyncapi-spring-web:3.1.1")
79-
library("aws-s3", "io.awspring.cloud:spring-cloud-aws-starter-s3:3.3.0")
80-
library("aws-autoconfigure", "io.awspring.cloud:spring-cloud-aws-autoconfigure:3.3.0")
81-
library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.31.45")
82-
library("aws-sns", "io.awspring.cloud:spring-cloud-aws-starter-sns:3.3.0")
83-
library("aws-sqs", "io.awspring.cloud:spring-cloud-aws-starter-sqs:3.3.0")
84-
library("aws-starter", "io.awspring.cloud:spring-cloud-aws-starter:3.3.0")
85-
library("aws-sts", "software.amazon.awssdk:sts:2.31.45")
86-
library("azure-app-insights", "com.microsoft.azure:applicationinsights-web:3.7.2")
87-
library("azure-identity", "com.azure:azure-identity:1.16.1")
79+
library("aws-s3", "io.awspring.cloud:spring-cloud-aws-starter-s3:3.4.0")
80+
library("aws-autoconfigure", "io.awspring.cloud:spring-cloud-aws-autoconfigure:3.4.0")
81+
library("aws-query-protocol", "software.amazon.awssdk:aws-query-protocol:2.31.65")
82+
library("aws-sns", "io.awspring.cloud:spring-cloud-aws-starter-sns:3.4.0")
83+
library("aws-sqs", "io.awspring.cloud:spring-cloud-aws-starter-sqs:3.4.0")
84+
library("aws-starter", "io.awspring.cloud:spring-cloud-aws-starter:3.4.0")
85+
library("aws-sts", "software.amazon.awssdk:sts:2.31.65")
86+
library("azure-app-insights", "com.microsoft.azure:applicationinsights-web:3.7.3")
87+
library("azure-identity", "com.azure:azure-identity:1.16.2")
8888
library("flipt", "io.flipt:flipt-java:1.1.2")
8989
library("html2md", "com.vladsch.flexmark:flexmark-html2md-converter:0.64.8")
90-
library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.38.0")
90+
library("microsoft-graph", "com.microsoft.graph:microsoft-graph:6.42.0")
9191
library("mockito-inline", "org.mockito:mockito-inline:5.2.0")
9292
library("mockito-kotlin", "org.mockito.kotlin:mockito-kotlin:5.4.0")
9393
library("notify", "uk.gov.service.notify:notifications-java-client:5.2.1-RELEASE")
9494
library("opensearch", "org.opensearch.client:opensearch-java:2.23.0")
95-
library("opensearch-starter", "org.opensearch.client:spring-data-opensearch-starter:1.6.3")
95+
library("opensearch-starter", "org.opensearch.client:spring-data-opensearch-starter:1.7.0")
9696
library(
9797
"opentelemetry-annotations",
9898
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.16.0"
9999
)
100-
library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:8.12.0")
101-
library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8")
102-
library("wiremock", "org.wiremock:wiremock-standalone:3.13.0")
100+
library("sentry", "io.sentry:sentry-spring-boot-starter-jakarta:8.14.0")
101+
library("springdoc", "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9")
102+
library("wiremock", "org.wiremock:wiremock-standalone:3.13.1")
103103

104104
bundle(
105105
"aws-messaging",
@@ -112,7 +112,7 @@ dependencyResolutionManagement {
112112
}
113113
}
114114

115-
plugins { id("com.gradle.develocity") version "4.0.1" }
115+
plugins { id("com.gradle.develocity") version "4.0.2" }
116116
develocity {
117117
buildScan {
118118
publishing.onlyIf { !System.getenv("CI").isNullOrEmpty() }

0 commit comments

Comments
 (0)