update dependencies

test-automation-in-practice · Feb 6, 2024 · 0d2010d · 0d2010d
1 parent 18390fc
commit 0d2010d
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git 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/...vemq/src/test/kotlin/example/spring/boot/jms/utils/InitializeWithContainerizedActiveMq.kt b/...vemq/src/test/kotlin/example/spring/boot/jms/utils/InitializeWithContainerizedActiveMq.kt
@@ -34,7 +34,7 @@ class ActiveMqInitializer : ApplicationContextInitializer<ConfigurableApplicatio
     //  - Find some way to drop all queues of the broker programmatically after each test (class).
 
     override fun initialize(applicationContext: ConfigurableApplicationContext) {
-        val container: GenericContainer<*> = 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/...n/example/spring/boot/resilience/bulkhead/DownstreamServiceWithAnnotationBasedBulkhead.kt b/...n/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/...ring/boot/resilience/circuitbreaker/DownstreamServiceWithAnnotationBasedCircuitBreaker.kt b/...ring/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/...ple/spring/boot/resilience/ratelimiter/DownstreamServiceWithAnnotationBasedRateLimiter.kt b/...ple/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/.../kotlin/example/spring/boot/resilience/retry/DownstreamServiceWithAnnotationBasedRetry.kt b/.../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/...ple/spring/boot/resilience/timelimiter/DownstreamServiceWithAnnotationBasedTimeLimiter.kt b/...ple/spring/boot/resilience/timelimiter/DownstreamServiceWithAnnotationBasedTimeLimiter.kt
@@ -28,7 +28,8 @@ class DownstreamServiceWithAnnotationBasedTimeLimiter(
             42
         }
 
-    private fun getNumberOfPagesFallback(isbn: String, ex: Throwable): CompletableFuture<Int?> {
+    // Needs to be public because otherwise a CGLIB proxy is used where the `log` is null
+    fun getNumberOfPagesFallback(isbn: String, ex: Throwable): CompletableFuture<Int?> {
         log.warn("retrieval of number of pages for ISBN [$isbn] failed - falling back to null", ex)
         return completedFuture(null)
     }