Clean up logback dependencies (#2292)

trask · web-flow · commit 2a0f4691e7af · 2022-05-18T09:30:55.000-07:00
diff --git a/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts b/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts
@@ -31,7 +31,6 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("codegen", "ch.qos.logback:logback-classic:1.2.3")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
diff --git a/agent/instrumentation/azure-functions/build.gradle.kts b/agent/instrumentation/azure-functions/build.gradle.kts
@@ -17,7 +17,6 @@ val otelInstrumentationAlphaVersion: String by project
 dependencies {
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("codegen", "ch.qos.logback:logback-classic:1.2.3")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
diff --git a/agent/instrumentation/micrometer-1.0/build.gradle.kts b/agent/instrumentation/micrometer-1.0/build.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("codegen", "ch.qos.logback:logback-classic:1.2.3")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
diff --git a/agent/instrumentation/netty-4.0/build.gradle.kts b/agent/instrumentation/netty-4.0/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("codegen", "ch.qos.logback:logback-classic:1.2.3")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
diff --git a/agent/instrumentation/netty-4.1/build.gradle.kts b/agent/instrumentation/netty-4.1/build.gradle.kts
@@ -16,7 +16,6 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("codegen", "ch.qos.logback:logback-classic:1.2.3")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
diff --git a/agent/instrumentation/servlet/build.gradle.kts b/agent/instrumentation/servlet/build.gradle.kts
@@ -22,7 +22,6 @@ dependencies {
 
   // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
   add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
-  add("codegen", "ch.qos.logback:logback-classic:1.2.3")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-annotation-support:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:$otelInstrumentationAlphaVersion")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
diff --git a/smoke-tests/apps/TraceLogBack/build.gradle.kts b/smoke-tests/apps/TraceLogBack/build.gradle.kts
@@ -13,5 +13,5 @@ dependencies {
     // and duplicate class files produces lots of warning messages on jetty
     exclude("com.microsoft.azure", "applicationinsights-core")
   }
-  implementation("ch.qos.logback:logback-classic:1.2.8")
+  implementation("ch.qos.logback:logback-classic")
 }
diff --git a/smoke-tests/apps/TraceLogBackUsingAgent/build.gradle.kts b/smoke-tests/apps/TraceLogBackUsingAgent/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
   implementation("com.microsoft.azure:applicationinsights-web-auto")
-  implementation("ch.qos.logback:logback-classic:1.2.8")
+  implementation("ch.qos.logback:logback-classic")
 }

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`	`// and duplicate class files produces lots of warning messages on jetty`
`14`	`14`	`exclude("com.microsoft.azure", "applicationinsights-core")`
`15`	`15`	`}`
`16`		`- implementation("ch.qos.logback:logback-classic:1.2.8")`
	`16`	`+ implementation("ch.qos.logback:logback-classic")`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ plugins {`
`4`	`4`
`5`	`5`	`dependencies {`
`6`	`6`	`implementation("com.microsoft.azure:applicationinsights-web-auto")`
`7`		`- implementation("ch.qos.logback:logback-classic:1.2.8")`
	`7`	`+ implementation("ch.qos.logback:logback-classic")`
`8`	`8`	`}`