From eb43ea9a1e9cd0c7f0df57e37b295f3bff30e3f1 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Tue, 6 Sep 2022 23:17:34 -0700
Subject: [PATCH] Update logback test dependencies (#6554)

---
 .../logback-appender-1.0/javaagent/build.gradle.kts    |  6 ++----
 .../logback-appender-1.0/library/build.gradle.kts      | 10 ++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts
index 1a51eeb4645b..0fd4232118d5 100644
--- a/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts
+++ b/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts
@@ -18,7 +18,7 @@ dependencies {
   // pin the version strictly to avoid overriding by dependencyManagement versions
   compileOnly("ch.qos.logback:logback-classic") {
     version {
-      strictly("0.9.16")
+      strictly("1.0.0")
     }
   }
   compileOnly("org.slf4j:slf4j-api") {
@@ -30,11 +30,9 @@ dependencies {
   if (findProperty("testLatestDeps") as Boolean) {
     testImplementation("ch.qos.logback:logback-classic:+")
   } else {
-    // TODO these versions are actually used during test
-    // currently our tests fail for logback-classic 0.9.16
     testImplementation("ch.qos.logback:logback-classic") {
       version {
-        strictly("1.2.11")
+        strictly("1.0.0")
       }
     }
     testImplementation("org.slf4j:slf4j-api") {
diff --git a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts
index a17598e19802..14e6a5f24fb3 100644
--- a/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts
+++ b/instrumentation/logback/logback-appender-1.0/library/build.gradle.kts
@@ -9,28 +9,26 @@ dependencies {
   // pin the version strictly to avoid overriding by dependencyManagement versions
   compileOnly("ch.qos.logback:logback-classic") {
     version {
-      strictly("0.9.16")
+      strictly("1.0.0")
     }
   }
   compileOnly("org.slf4j:slf4j-api") {
     version {
-      strictly("1.5.8")
+      strictly("1.6.4")
     }
   }
 
   if (findProperty("testLatestDeps") as Boolean) {
     testImplementation("ch.qos.logback:logback-classic:+")
   } else {
-    // TODO these versions are actually used during test
-    // currently our tests fail for logback-classic 0.9.16
     testImplementation("ch.qos.logback:logback-classic") {
       version {
-        strictly("1.2.11")
+        strictly("1.0.0")
       }
     }
     testImplementation("org.slf4j:slf4j-api") {
       version {
-        strictly("1.7.36")
+        strictly("1.6.4")
       }
     }
   }