diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts index 2ecdcf8f12..4a033ad21d 100644 --- 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 index 0c7a50530d..3dee574246 100644 --- 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 index fc6f8e66b3..d77ea53610 100644 --- 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 index b49f6daa38..e77305bb1c 100644 --- 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 index 6b16cad72d..e8b7b26b5b 100644 --- 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 index 8d10d59394..6d956dad4a 100644 --- 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/licenses/byte-buddy-dep-1.12.20.jar/META-INF/LICENSE b/licenses/byte-buddy-dep-1.12.22.jar/META-INF/LICENSE similarity index 100% rename from licenses/byte-buddy-dep-1.12.20.jar/META-INF/LICENSE rename to licenses/byte-buddy-dep-1.12.22.jar/META-INF/LICENSE diff --git a/licenses/byte-buddy-dep-1.12.20.jar/META-INF/NOTICE b/licenses/byte-buddy-dep-1.12.22.jar/META-INF/NOTICE similarity index 100% rename from licenses/byte-buddy-dep-1.12.20.jar/META-INF/NOTICE rename to licenses/byte-buddy-dep-1.12.22.jar/META-INF/NOTICE diff --git a/licenses/licenses.md b/licenses/licenses.md index 503fe331da..543e8b5451 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ #javaagent ##Dependency License Report -_2023-01-09 13:08:03 CET_ +_2023-01-17 15:32:22 UTC_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -155,10 +155,10 @@ _2023-01-09 13:08:03 CET_ > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) > - **Embedded license files**: [zipkin-2.23.2.jar/META-INF/LICENSE](zipkin-2.23.2.jar/META-INF/LICENSE) -**35** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.12.20` +**35** **Group:** `net.bytebuddy` **Name:** `byte-buddy-dep` **Version:** `1.12.22` > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -> - **Embedded license files**: [byte-buddy-dep-1.12.20.jar/META-INF/LICENSE](byte-buddy-dep-1.12.20.jar/META-INF/LICENSE) - - [byte-buddy-dep-1.12.20.jar/META-INF/NOTICE](byte-buddy-dep-1.12.20.jar/META-INF/NOTICE) +> - **Embedded license files**: [byte-buddy-dep-1.12.22.jar/META-INF/LICENSE](byte-buddy-dep-1.12.22.jar/META-INF/LICENSE) + - [byte-buddy-dep-1.12.22.jar/META-INF/NOTICE](byte-buddy-dep-1.12.22.jar/META-INF/NOTICE) **36** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0` > - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org)