Skip to content

Commit a972765

Browse files
twatzlTobias Watzl
andauthored
update dependencies (#138)
* update dependencies * explicitely set version for azurite testcontainer to ensure correct api version --------- Co-authored-by: Tobias Watzl <[email protected]>
1 parent f091ccb commit a972765

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[versions]
22
assertj = "3.26.0"
33

4-
azure = "5.16.0"
5-
azure-identity = "1.13.3"
4+
azure = "5.19.0"
5+
azure-identity = "1.14.2"
66

77
# 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
88
guava = "33.2.1-jre"
@@ -18,8 +18,8 @@ opentelemetry = "1.38.0"
1818

1919
shedlock = "5.13.0"
2020

21-
spring-boot = "3.3.5"
22-
spring-cloud = "2023.0.3"
21+
spring-boot = "3.4.1"
22+
spring-cloud = "2024.0.0"
2323

2424
[libraries]
2525
archunit-ccv = { module = "io.cloudflight.cleancode.archunit:archunit-cleancode-verifier", version = "0.5.0" }

platform-spring-bom/platform-spring-i18n/src/main/kotlin/io/cloudflight/platform/spring/i18n/autoconfigure/PlatformI18nAutoConfiguration.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@ class PlatformI18nAutoConfiguration : MessageSourceAutoConfiguration() {
1818
@Bean
1919
override fun messageSource(properties: MessageSourceProperties): MessageSource {
2020
val messageSource = PlatformMessageSourceImpl()
21-
if (StringUtils.hasText(properties.basename)) {
22-
messageSource.setBasenames(
23-
*StringUtils
24-
.commaDelimitedListToStringArray(StringUtils.trimAllWhitespace(properties.basename))
25-
)
21+
if (properties.basename.isNotEmpty()) {
22+
messageSource.setBasenames(*properties.basename.toTypedArray<String>())
2623
}
2724
if (properties.encoding != null) {
2825
messageSource.setDefaultEncoding(properties.encoding.name())

platform-spring-bom/platform-spring-jpa/src/main/kotlin/io/cloudflight/platform/spring/jpa/autoconfigure/TransactionCustomizer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.cloudflight.platform.spring.jpa.autoconfigure
22

3-
import org.springframework.boot.autoconfigure.transaction.PlatformTransactionManagerCustomizer
3+
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizer
44
import org.springframework.transaction.support.AbstractPlatformTransactionManager
55

6-
class TransactionCustomizer(private val properties: TransactionProperties) : PlatformTransactionManagerCustomizer<AbstractPlatformTransactionManager> {
6+
class TransactionCustomizer(private val properties: TransactionProperties) : TransactionManagerCustomizer<AbstractPlatformTransactionManager> {
77

88
override fun customize(transactionManager: AbstractPlatformTransactionManager) {
99
// we want to have that validation here in order to ensure that if a read-only transaction is being opened that

platform-spring-bom/platform-spring-monitoring/src/main/kotlin/io/cloudflight/platform/spring/monitoring/autoconfigure/ManagementSecurityAutoConfiguration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ManagementSecurityAutoConfiguration {
4040
disable()
4141
}
4242

43-
authorizeRequests {
43+
authorizeHttpRequests {
4444
authorize(EndpointRequest.toAnyEndpoint(), permitAll)
4545
}
4646
}

platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AzuriteContainer(dockerImageName: DockerImageName) : GenericContainer<Azur
1717
val accountKey = AzuriteContainerConnectionDetailsFactory.ACCOUNT_KEY
1818

1919
companion object {
20-
private const val DEFAULT_IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite"
20+
private const val DEFAULT_IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite:3.33.0"
2121

2222
private const val AZURITE_PORT = 10000
2323
}

platform-spring-test-bom/platform-spring-test-testcontainers/src/main/kotlin/io/cloudflight/platform/spring/test/testcontainers/azurite/AzuriteContainerConnectionDetailsFactory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import org.springframework.boot.testcontainers.service.connection.ContainerConne
66

77
class AzuriteContainerConnectionDetailsFactory :
88
ContainerConnectionDetailsFactory<AzuriteContainer, AzuriteConnectionDetails>(
9-
null,
9+
"",
1010
"io.cloudflight.platform.spring.storage.azure.autoconfigure.PlatformAzureStorageBlobAutoConfiguration"
1111
) {
1212

0 commit comments

Comments
 (0)