From 34cd410b8a1ac1fdcef6f47bd389f00777dda4e1 Mon Sep 17 00:00:00 2001 From: Tobias Watzl Date: Tue, 7 Jan 2025 10:59:53 +0100 Subject: [PATCH 1/2] update dependencies --- gradle/libs.versions.toml | 8 ++++---- .../i18n/autoconfigure/PlatformI18nAutoConfiguration.kt | 7 ++----- .../spring/jpa/autoconfigure/TransactionCustomizer.kt | 4 ++-- .../autoconfigure/ManagementSecurityAutoConfiguration.kt | 2 +- .../azurite/AzuriteContainerConnectionDetailsFactory.kt | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 37e75ec..7d2023b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] assertj = "3.26.0" -azure = "5.16.0" -azure-identity = "1.13.3" +azure = "5.19.0" +azure-identity = "1.14.2" # we provide the latest version of guava here, as queryDSL pulls in a very old (and vulnerable) version of guava, and we want to override that here guava = "33.2.1-jre" @@ -18,8 +18,8 @@ opentelemetry = "1.38.0" shedlock = "5.13.0" -spring-boot = "3.3.5" -spring-cloud = "2023.0.3" +spring-boot = "3.4.1" +spring-cloud = "2024.0.0" [libraries] archunit-ccv = { module = "io.cloudflight.cleancode.archunit:archunit-cleancode-verifier", version = "0.5.0" } diff --git a/platform-spring-bom/platform-spring-i18n/src/main/kotlin/io/cloudflight/platform/spring/i18n/autoconfigure/PlatformI18nAutoConfiguration.kt b/platform-spring-bom/platform-spring-i18n/src/main/kotlin/io/cloudflight/platform/spring/i18n/autoconfigure/PlatformI18nAutoConfiguration.kt index 0650c99..f82464a 100644 --- a/platform-spring-bom/platform-spring-i18n/src/main/kotlin/io/cloudflight/platform/spring/i18n/autoconfigure/PlatformI18nAutoConfiguration.kt +++ b/platform-spring-bom/platform-spring-i18n/src/main/kotlin/io/cloudflight/platform/spring/i18n/autoconfigure/PlatformI18nAutoConfiguration.kt @@ -18,11 +18,8 @@ class PlatformI18nAutoConfiguration : MessageSourceAutoConfiguration() { @Bean override fun messageSource(properties: MessageSourceProperties): MessageSource { val messageSource = PlatformMessageSourceImpl() - if (StringUtils.hasText(properties.basename)) { - messageSource.setBasenames( - *StringUtils - .commaDelimitedListToStringArray(StringUtils.trimAllWhitespace(properties.basename)) - ) + if (properties.basename.isNotEmpty()) { + messageSource.setBasenames(*properties.basename.toTypedArray()) } if (properties.encoding != null) { messageSource.setDefaultEncoding(properties.encoding.name()) diff --git a/platform-spring-bom/platform-spring-jpa/src/main/kotlin/io/cloudflight/platform/spring/jpa/autoconfigure/TransactionCustomizer.kt b/platform-spring-bom/platform-spring-jpa/src/main/kotlin/io/cloudflight/platform/spring/jpa/autoconfigure/TransactionCustomizer.kt index a49741a..8886a68 100644 --- a/platform-spring-bom/platform-spring-jpa/src/main/kotlin/io/cloudflight/platform/spring/jpa/autoconfigure/TransactionCustomizer.kt +++ b/platform-spring-bom/platform-spring-jpa/src/main/kotlin/io/cloudflight/platform/spring/jpa/autoconfigure/TransactionCustomizer.kt @@ -1,9 +1,9 @@ package io.cloudflight.platform.spring.jpa.autoconfigure -import org.springframework.boot.autoconfigure.transaction.PlatformTransactionManagerCustomizer +import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizer import org.springframework.transaction.support.AbstractPlatformTransactionManager -class TransactionCustomizer(private val properties: TransactionProperties) : PlatformTransactionManagerCustomizer { +class TransactionCustomizer(private val properties: TransactionProperties) : TransactionManagerCustomizer { override fun customize(transactionManager: AbstractPlatformTransactionManager) { // we want to have that validation here in order to ensure that if a read-only transaction is being opened that diff --git a/platform-spring-bom/platform-spring-monitoring/src/main/kotlin/io/cloudflight/platform/spring/monitoring/autoconfigure/ManagementSecurityAutoConfiguration.kt b/platform-spring-bom/platform-spring-monitoring/src/main/kotlin/io/cloudflight/platform/spring/monitoring/autoconfigure/ManagementSecurityAutoConfiguration.kt index 7914c4e..bafabed 100644 --- a/platform-spring-bom/platform-spring-monitoring/src/main/kotlin/io/cloudflight/platform/spring/monitoring/autoconfigure/ManagementSecurityAutoConfiguration.kt +++ b/platform-spring-bom/platform-spring-monitoring/src/main/kotlin/io/cloudflight/platform/spring/monitoring/autoconfigure/ManagementSecurityAutoConfiguration.kt @@ -40,7 +40,7 @@ class ManagementSecurityAutoConfiguration { disable() } - authorizeRequests { + authorizeHttpRequests { authorize(EndpointRequest.toAnyEndpoint(), permitAll) } } diff --git a/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainerConnectionDetailsFactory.kt b/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainerConnectionDetailsFactory.kt index 591a035..2537add 100644 --- a/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainerConnectionDetailsFactory.kt +++ b/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainerConnectionDetailsFactory.kt @@ -6,7 +6,7 @@ import org.springframework.boot.testcontainers.service.connection.ContainerConne class AzuriteContainerConnectionDetailsFactory : ContainerConnectionDetailsFactory( - null, + emptyList(), "io.cloudflight.platform.spring.storage.azure.autoconfigure.PlatformAzureStorageBlobAutoConfiguration" ) { From 24226c3953ea42e83caf3cbc81822c784717a49e Mon Sep 17 00:00:00 2001 From: Tobias Watzl Date: Tue, 7 Jan 2025 12:50:58 +0100 Subject: [PATCH 2/2] explicitely set version for azurite testcontainer to ensure correct api version --- .../spring/test/testcontainers/azurite/AzuriteContainer.kt | 2 +- .../azurite/AzuriteContainerConnectionDetailsFactory.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt b/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt index 5bf6775..5461fbe 100644 --- a/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt +++ b/platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt @@ -17,7 +17,7 @@ class AzuriteContainer(dockerImageName: DockerImageName) : GenericContainer( - emptyList(), + "", "io.cloudflight.platform.spring.storage.azure.autoconfigure.PlatformAzureStorageBlobAutoConfiguration" ) {