Upgrade sample to logback 1.5.3

We do not want to upgrade the version of logback we compile against but we want to upgrade the version we test against for compatibility with the latest. Closes micrometer-metricsgh-4842
dynatrace-oss-contrib · Mar 7, 2024 · b22be11 · b22be11
1 parent ab7b79c
commit b22be11
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -59,6 +59,7 @@ kafka = "2.8.2"
 kafka-junit = "4.2.10"
 latency-utils = "2.0.3"
 logback12 = "1.2.13"
+logback-latest = "1.5.3"
 log4j = "2.22.1"
 maven-resolver = "1.9.18"
 mockito = "5.11.0"
@@ -170,7 +171,7 @@ kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core",
 latencyUtils = { module = "org.latencyutils:LatencyUtils", version.ref = "latency-utils" }
 lmaxDisruptor = "com.lmax:disruptor:3.4.4"
 logback12 = { module = "ch.qos.logback:logback-classic", version.ref = "logback12" }
-logback14 = {module = "ch.qos.logback:logback-classic", version = "1.4.14" }
+logbackLatest = {module = "ch.qos.logback:logback-classic", version.ref = "logback-latest" }
 log4j = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 mavenResolverConnectorBasic = { module = "org.apache.maven.resolver:maven-resolver-connector-basic", version.ref = "maven-resolver" }
 mavenResolverTransportHttp = { module = "org.apache.maven.resolver:maven-resolver-transport-http", version.ref = "maven-resolver" }

diff --git a/micrometer-jetty12/build.gradle b/micrometer-jetty12/build.gradle
@@ -11,9 +11,9 @@ dependencies {
     optionalApi libs.jetty12Server
     optionalApi libs.jetty12Client
 
-    testRuntimeOnly(libs.logback14) {
+    testRuntimeOnly(libs.logbackLatest) {
         version {
-            strictly libs.logback14.get().version
+            strictly libs.logbackLatest.get().version
         }
     }
 

diff --git a/samples/micrometer-samples-jersey3/build.gradle b/samples/micrometer-samples-jersey3/build.gradle
@@ -5,15 +5,15 @@ plugins {
 dependencies {
     implementation project(":micrometer-core")
 
-    // Test sample project with SLFJ4 2.x / Logback 1.4; see gh-3415
-    runtimeOnly(libs.logback14) {
+    // Test sample project with SLFJ4 2.x / Logback; see gh-3415
+    runtimeOnly(libs.logbackLatest) {
         version {
-            strictly libs.logback14.get().version
+            strictly libs.logbackLatest.get().version
         }
     }
-    testRuntimeOnly(libs.logback14) {
+    testRuntimeOnly(libs.logbackLatest) {
         version {
-            strictly libs.logback14.get().version
+            strictly libs.logbackLatest.get().version
         }
     }