Bump byteBuddyVersion from 1.12.20 to 1.12.22 (#7568)

open-telemetry · Jan 18, 2023 · 6741c95 · 6741c95
1 parent bc92fb3
commit 6741c95
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 16 deletions.
diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
@@ -47,7 +47,7 @@ dependencies {
   implementation("org.owasp:dependency-check-gradle:8.0.0")
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.6.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.12.20")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.12.22")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.0")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.8")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.0.1")

diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
   `java-library`
 
-  id("net.bytebuddy.byte-buddy")
-
   id("io.opentelemetry.instrumentation.base")
   id("io.opentelemetry.instrumentation.muzzle-generation")
   id("io.opentelemetry.instrumentation.javaagent-shadowing")

diff --git a/conventions/src/main/kotlin/otel.javaagent-testing.gradle.kts b/conventions/src/main/kotlin/otel.javaagent-testing.gradle.kts
@@ -1,6 +1,4 @@
 plugins {
-  id("net.bytebuddy.byte-buddy")
-
   id("io.opentelemetry.instrumentation.javaagent-testing")
 
   id("otel.java-conventions")

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -39,7 +39,7 @@ val DEPENDENCY_BOMS = listOf(
 val autoServiceVersion = "1.0.1"
 val autoValueVersion = "1.10.1"
 val errorProneVersion = "2.18.0"
-val byteBuddyVersion = "1.12.20"
+val byteBuddyVersion = "1.12.22"
 val asmVersion = "9.4"
 val jmhVersion = "1.36"
 val mockitoVersion = "4.11.0"

diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts
@@ -23,7 +23,7 @@ configurations.named("compileOnly") {
   extendsFrom(bbGradlePlugin)
 }
 
-val byteBuddyVersion = "1.12.20"
+val byteBuddyVersion = "1.12.22"
 val aetherVersion = "1.1.0"
 
 dependencies {

diff --git a/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts b/gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts
@@ -54,12 +54,8 @@ val languageTasks = LANGUAGES.map { language ->
 }.filterNotNull()
 
 tasks {
-  val byteBuddy by registering {
-    dependsOn(languageTasks)
-  }
-
   named(sourceSet.classesTaskName) {
-    dependsOn(byteBuddy)
+    dependsOn(languageTasks)
   }
 }
 

diff --git a/...te-buddy-dep-1.12.20.jar/META-INF/LICENSE → ...te-buddy-dep-1.12.22.jar/META-INF/LICENSE b/...te-buddy-dep-1.12.20.jar/META-INF/LICENSE → ...te-buddy-dep-1.12.22.jar/META-INF/LICENSE
diff --git a/...yte-buddy-dep-1.12.20.jar/META-INF/NOTICE → ...yte-buddy-dep-1.12.22.jar/META-INF/NOTICE b/...yte-buddy-dep-1.12.20.jar/META-INF/NOTICE → ...yte-buddy-dep-1.12.22.jar/META-INF/NOTICE
diff --git a/licenses/licenses.md b/licenses/licenses.md