diff --git a/build.gradle.kts b/build.gradle.kts index b962bcc..fc6c1f6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,20 +6,19 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("org.springframework.boot") version "3.2.0" apply false + id("org.springframework.boot") version "3.2.2" apply false id("io.spring.dependency-management") version "1.1.4" apply false id("org.asciidoctor.jvm.convert") version "3.3.2" apply false - kotlin("jvm") version "1.9.20" apply false - kotlin("plugin.spring") version "1.9.20" apply false - kotlin("plugin.jpa") version "1.9.20" apply false - kotlin("plugin.noarg") version "1.9.20" apply false + kotlin("jvm") version "1.9.22" apply false + kotlin("plugin.spring") version "1.9.22" apply false + kotlin("plugin.jpa") version "1.9.22" apply false + kotlin("plugin.noarg") version "1.9.22" apply false } allprojects { repositories { mavenCentral() - maven { url = uri("https://repo.spring.io/milestone") } } if (project.childProjects.isEmpty()) { @@ -30,11 +29,11 @@ allprojects { imports { mavenBom("io.github.logrecorder:logrecorder-bom:2.9.1") mavenBom("io.github.openfeign:feign-bom:13.1") - mavenBom("org.jetbrains.kotlin:kotlin-bom:1.9.20") + mavenBom("org.jetbrains.kotlin:kotlin-bom:1.9.22") mavenBom("org.testcontainers:testcontainers-bom:1.19.3") - mavenBom("org.zalando:logbook-bom:3.6.0") + mavenBom("org.zalando:logbook-bom:3.7.2") - mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.0-RC1") + mavenBom("org.springframework.cloud:spring-cloud-dependencies:2023.0.0") mavenBom(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES) } dependencies { @@ -43,12 +42,6 @@ allprojects { dependency("io.kotest:kotest-assertions-core:5.8.0") dependency("io.mockk:mockk-jvm:1.13.8") - // currently using older version because of issues updating to Jakarta based version - dependency("org.apache.activemq:activemq-broker:5.17.3") - dependency("org.apache.activemq:activemq-client:5.17.3") - dependency("org.apache.activemq:activemq-jms-pool:5.17.3") - dependency("org.apache.activemq:activemq-kahadb-store:5.17.3") - // legacy compatibility dependency("de.flapdoodle.embed:de.flapdoodle.embed.mongo.spring30x:4.11.0") dependency("org.apache.activemq:artemis-jms-server:2.31.2") diff --git a/examples/messaging-jms-activemq/src/test/kotlin/example/spring/boot/jms/utils/InitializeWithContainerizedActiveMq.kt b/examples/messaging-jms-activemq/src/test/kotlin/example/spring/boot/jms/utils/InitializeWithContainerizedActiveMq.kt index e4cc076..1250e3e 100644 --- a/examples/messaging-jms-activemq/src/test/kotlin/example/spring/boot/jms/utils/InitializeWithContainerizedActiveMq.kt +++ b/examples/messaging-jms-activemq/src/test/kotlin/example/spring/boot/jms/utils/InitializeWithContainerizedActiveMq.kt @@ -34,7 +34,7 @@ class ActiveMqInitializer : ApplicationContextInitializer = GenericContainer("apache/activemq-classic:5.18.2") + val container: GenericContainer<*> = GenericContainer("apache/activemq-classic:5.18.3") .withEnv("ACTIVEMQ_CONNECTION_USER", "tester") .withEnv("ACTIVEMQ_CONNECTION_PASSWORD", "test-password") .withExposedPorts(61616) diff --git a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/bulkhead/DownstreamServiceWithAnnotationBasedBulkhead.kt b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/bulkhead/DownstreamServiceWithAnnotationBasedBulkhead.kt index d8f63d5..a8d0f1e 100644 --- a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/bulkhead/DownstreamServiceWithAnnotationBasedBulkhead.kt +++ b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/bulkhead/DownstreamServiceWithAnnotationBasedBulkhead.kt @@ -21,7 +21,8 @@ class DownstreamServiceWithAnnotationBasedBulkhead { return 42 } - private fun getNumberOfPagesFallback(isbn: String, ex: Throwable): Int? { + // Needs to be public because otherwise a CGLIB proxy is used where the `log` is null + fun getNumberOfPagesFallback(isbn: String, ex: Throwable): Int? { log.warn("retrieval of number of pages for ISBN [$isbn] failed - falling back to null", ex) return null } diff --git a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/circuitbreaker/DownstreamServiceWithAnnotationBasedCircuitBreaker.kt b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/circuitbreaker/DownstreamServiceWithAnnotationBasedCircuitBreaker.kt index 8c3bc98..78143e3 100644 --- a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/circuitbreaker/DownstreamServiceWithAnnotationBasedCircuitBreaker.kt +++ b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/circuitbreaker/DownstreamServiceWithAnnotationBasedCircuitBreaker.kt @@ -24,7 +24,8 @@ class DownstreamServiceWithAnnotationBasedCircuitBreaker( return 42 } - private fun getNumberOfPagesFallback(isbn: String, ex: Throwable): Int? { + // Needs to be public because otherwise a CGLIB proxy is used where the `log` is null + fun getNumberOfPagesFallback(isbn: String, ex: Throwable): Int? { log.warn("retrieval of number of pages for ISBN [$isbn] failed - falling back to null", ex) return null } diff --git a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/ratelimiter/DownstreamServiceWithAnnotationBasedRateLimiter.kt b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/ratelimiter/DownstreamServiceWithAnnotationBasedRateLimiter.kt index 941a712..0ebf2ec 100644 --- a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/ratelimiter/DownstreamServiceWithAnnotationBasedRateLimiter.kt +++ b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/ratelimiter/DownstreamServiceWithAnnotationBasedRateLimiter.kt @@ -20,7 +20,8 @@ class DownstreamServiceWithAnnotationBasedRateLimiter { return 42 } - private fun getNumberOfPagesFallback(isbn: String, ex: Throwable): Int? { + // Needs to be public because otherwise a CGLIB proxy is used where the `log` is null + fun getNumberOfPagesFallback(isbn: String, ex: Throwable): Int? { log.warn("retrieval of number of pages for ISBN [$isbn] failed - falling back to null", ex) return null } diff --git a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/retry/DownstreamServiceWithAnnotationBasedRetry.kt b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/retry/DownstreamServiceWithAnnotationBasedRetry.kt index e425839..d5c66d5 100644 --- a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/retry/DownstreamServiceWithAnnotationBasedRetry.kt +++ b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/retry/DownstreamServiceWithAnnotationBasedRetry.kt @@ -24,7 +24,8 @@ class DownstreamServiceWithAnnotationBasedRetry( return 42 } - private fun getNumberOfPagesFallback(isbn: String, ex: Throwable): Int? { + // Needs to be public because otherwise a CGLIB proxy is used where the `log` is null + fun getNumberOfPagesFallback(isbn: String, ex: Throwable): Int? { log.warn("retrieval of number of pages for ISBN [$isbn] failed - falling back to null", ex) return null } diff --git a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/timelimiter/DownstreamServiceWithAnnotationBasedTimeLimiter.kt b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/timelimiter/DownstreamServiceWithAnnotationBasedTimeLimiter.kt index f7fd811..a8f0d10 100644 --- a/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/timelimiter/DownstreamServiceWithAnnotationBasedTimeLimiter.kt +++ b/examples/resilience4j/src/main/kotlin/example/spring/boot/resilience/timelimiter/DownstreamServiceWithAnnotationBasedTimeLimiter.kt @@ -28,7 +28,8 @@ class DownstreamServiceWithAnnotationBasedTimeLimiter( 42 } - private fun getNumberOfPagesFallback(isbn: String, ex: Throwable): CompletableFuture { + // Needs to be public because otherwise a CGLIB proxy is used where the `log` is null + fun getNumberOfPagesFallback(isbn: String, ex: Throwable): CompletableFuture { log.warn("retrieval of number of pages for ISBN [$isbn] failed - falling back to null", ex) return completedFuture(null) }