[release/v1.25.x] Avoid dependency bom conflict (#841)

opentelemetrybot · trask · web-flow · commit 1c85239d128a · 2023-04-21T17:56:29.000Z
Co-authored-by: Trask Stalnaker &lt;trask.stalnaker@gmail.com&gt;
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -17,7 +17,6 @@ val DEPENDENCY_BOMS = listOf(
   "com.linecorp.armeria:armeria-bom:1.23.1",
   "org.junit:junit-bom:5.9.2",
   "io.grpc:grpc-bom:1.54.1",
-  "io.opentelemetry:opentelemetry-bom-alpha:1.24.0-alpha",
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha",
   "org.testcontainers:testcontainers-bom:1.18.0"
 )

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ val DEPENDENCY_BOMS = listOf(`
`17`	`17`	`"com.linecorp.armeria:armeria-bom:1.23.1",`
`18`	`18`	`"org.junit:junit-bom:5.9.2",`
`19`	`19`	`"io.grpc:grpc-bom:1.54.1",`
`20`		`- "io.opentelemetry:opentelemetry-bom-alpha:1.24.0-alpha",`
`21`	`20`	`"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.24.0-alpha",`
`22`	`21`	`"org.testcontainers:testcontainers-bom:1.18.0"`
`23`	`22`	`)`