Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-leftovers

Author: SylvainJuge

conventions/build.gradle.kts

@@ -64,9 +64,9 @@ dependencies {
   implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.0")
   implementation("org.spdx:spdx-gradle-plugin:0.8.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.16.1")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.17.0")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
-  implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
+  implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
   implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.5")

dependencyManagement/build.gradle.kts

@@ -41,7 +41,7 @@ val DEPENDENCY_BOMS = listOf(
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
 val errorProneVersion = "2.36.0"
-val byteBuddyVersion = "1.16.1"
+val byteBuddyVersion = "1.17.0"
 val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"

gradle-plugins/build.gradle.kts

@@ -25,7 +25,7 @@ configurations.named("compileOnly") {
   extendsFrom(bbGradlePlugin)
 }
 
-val byteBuddyVersion = "1.16.1"
+val byteBuddyVersion = "1.17.0"
 val aetherVersion = "1.1.0"
 
 dependencies {

instrumentation/restlet/restlet-1.1/javaagent/build.gradle.kts

@@ -9,7 +9,7 @@ muzzle {
     versions.set("[1.1.0, 1.2-M1)")
     extraDependency("com.noelios.restlet:com.noelios.restlet")
     // missing dependencies
-    skip("2.5.0")
+    skip("2.5.0", "2.5.1")
     assertInverse.set(true)
   }
 }