From 87aeab121be1d3b4d6d143a0a94883a2c699c091 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 7 Jan 2022 16:46:02 -0800 Subject: [PATCH] Updates --- agent/agent-bootstrap/gradle.lockfile | 11 +++-- .../gc-monitor-api/gradle.lockfile | 4 +- .../gc-monitor-core/gradle.lockfile | 4 +- .../gc-monitor-tests/gradle.lockfile | 4 +- .../agent-alerting-api/gradle.lockfile | 4 +- .../agent-alerting/gradle.lockfile | 4 +- .../agent-profiler-api/gradle.lockfile | 4 +- .../agent-service-profiler/gradle.lockfile | 4 +- agent/agent-tooling/gradle.lockfile | 43 +++++++++---------- agent/agent/gradle.lockfile | 11 +++-- agent/instrumentation/gradle.lockfile | 37 ++++++++-------- dependencyManagement/build.gradle.kts | 5 +-- etw/java/gradle.lockfile | 4 +- 13 files changed, 67 insertions(+), 72 deletions(-) diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index a64626a5a77..fdbf1205962 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -17,12 +17,11 @@ io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-commo io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-undertow-1.4-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-api-metrics:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-semconv:1.10.0-alpha-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-semconv:1.10.0-alpha=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath org.slf4j:slf4j-api:1.7.32=runtimeClasspath empty= diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 5517963499b..caf22aafc31 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -4,8 +4,8 @@ com.google.errorprone:error_prone_annotations:2.9.0=runtimeClasspath com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath org.slf4j:slf4j-api:1.7.30=runtimeClasspath empty= diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 5517963499b..caf22aafc31 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -4,8 +4,8 @@ com.google.errorprone:error_prone_annotations:2.9.0=runtimeClasspath com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath org.slf4j:slf4j-api:1.7.30=runtimeClasspath empty= diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 31137a043c2..dc588149891 100644 --- a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 31137a043c2..dc588149891 100644 --- a/agent/agent-profiler/agent-alerting-api/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting-api/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 5fce3437dde..3afb3d9079c 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -3,8 +3,8 @@ # This file is expected to be part of source control. com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath org.slf4j:slf4j-api:1.7.30=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-profiler-api/gradle.lockfile b/agent/agent-profiler/agent-profiler-api/gradle.lockfile index de8b318a948..aa1931b0c1e 100644 --- a/agent/agent-profiler/agent-profiler-api/gradle.lockfile +++ b/agent/agent-profiler/agent-profiler-api/gradle.lockfile @@ -15,8 +15,8 @@ com.squareup.moshi:moshi:1.11.0=runtimeClasspath com.squareup.okio:okio:1.17.5=runtimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.43.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath io.projectreactor:reactor-core:3.4.10=runtimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath diff --git a/agent/agent-profiler/agent-service-profiler/gradle.lockfile b/agent/agent-profiler/agent-service-profiler/gradle.lockfile index 6d6e563228c..3c1860d5253 100644 --- a/agent/agent-profiler/agent-service-profiler/gradle.lockfile +++ b/agent/agent-profiler/agent-service-profiler/gradle.lockfile @@ -37,8 +37,8 @@ io.netty:netty-transport-native-kqueue:4.1.67.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.1.67.Final=runtimeClasspath io.netty:netty-transport:4.1.67.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.0.10=runtimeClasspath io.projectreactor.netty:reactor-netty-http-brave:1.0.10=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.0.10=runtimeClasspath diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 2a5737568de..604f0b7702e 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -66,26 +66,25 @@ io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.10.0+ai io.opentelemetry.javaagent:opentelemetry-javaagent-tooling-java9:1.10.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:1.10.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent:opentelemetry-muzzle:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-api-metrics:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-exporter-logging:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-extension-aws:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-extension-kotlin:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-extension-noop-api:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-extension-trace-propagators:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-resources:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-semconv:1.10.0-alpha-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-exporter-logging:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-extension-aws:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-extension-kotlin:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-extension-noop-api:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-extension-trace-propagators:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-resources:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-semconv:1.10.0-alpha=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.0.10=runtimeClasspath io.projectreactor.netty:reactor-netty-http-brave:1.0.10=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.0.10=runtimeClasspath @@ -98,7 +97,7 @@ io.zipkin.reporter2:zipkin-reporter:2.16.3=runtimeClasspath io.zipkin.zipkin2:zipkin:2.23.2=runtimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath -net.bytebuddy:byte-buddy-dep:1.12.3=runtimeClasspath +net.bytebuddy:byte-buddy-dep:1.12.6=runtimeClasspath net.bytebuddy:byte-buddy:1.11.2=runtimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath net.java.dev.jna:jna:5.8.0=runtimeClasspath @@ -110,7 +109,7 @@ org.apache.commons:commons-text:1.9=runtimeClasspath org.checkerframework:checker-qual:3.14.0=runtimeClasspath org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath org.jctools:jctools-core:3.3.0=runtimeClasspath -org.jetbrains.kotlin:kotlin-bom:1.4.10=runtimeClasspath +org.jetbrains.kotlin:kotlin-bom:1.5.31=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath org.ow2.asm:asm-commons:9.2=runtimeClasspath org.ow2.asm:asm:9.2=runtimeClasspath diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index a64626a5a77..fdbf1205962 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -17,12 +17,11 @@ io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-servlet-commo io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-undertow-1.4-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap:1.10.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent:opentelemetry-javaagent-instrumentation-api:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-api-metrics:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-semconv:1.10.0-alpha-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-semconv:1.10.0-alpha=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath org.slf4j:slf4j-api:1.7.32=runtimeClasspath empty= diff --git a/agent/instrumentation/gradle.lockfile b/agent/instrumentation/gradle.lockfile index 9b327961bc3..e42bdf28639 100644 --- a/agent/instrumentation/gradle.lockfile +++ b/agent/instrumentation/gradle.lockfile @@ -181,30 +181,29 @@ io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:1.10.0+ai.patch io.opentelemetry.javaagent:opentelemetry-javaagent-tooling-java9:1.10.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:1.10.0+ai.patches-alpha=runtimeClasspath io.opentelemetry.javaagent:opentelemetry-muzzle:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-api-metrics:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-exporter-logging:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-extension-aws:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-extension-kotlin:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-extension-noop-api:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-extension-trace-propagators:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-resources:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.10.0-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-exporter-logging:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-extension-aws:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-extension-kotlin:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-extension-noop-api:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-extension-trace-propagators:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-resources:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-tracing-incubator:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.10.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.10.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.0.10=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.0.10=runtimeClasspath io.projectreactor.netty:reactor-netty:1.0.10=runtimeClasspath io.projectreactor:reactor-core:3.4.10=runtimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=runtimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=runtimeClasspath -net.bytebuddy:byte-buddy-dep:1.12.3=runtimeClasspath +net.bytebuddy:byte-buddy-dep:1.12.6=runtimeClasspath net.bytebuddy:byte-buddy:1.11.2=runtimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath net.java.dev.jna:jna:5.8.0=runtimeClasspath @@ -216,7 +215,7 @@ org.apache.commons:commons-text:1.9=runtimeClasspath org.checkerframework:checker-qual:3.14.0=runtimeClasspath org.codehaus.woodstox:stax2-api:4.2.1=runtimeClasspath org.jctools:jctools-core:3.3.0=runtimeClasspath -org.jetbrains.kotlin:kotlin-bom:1.4.10=runtimeClasspath +org.jetbrains.kotlin:kotlin-bom:1.5.31=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath org.ow2.asm:asm-commons:9.2=runtimeClasspath org.ow2.asm:asm:9.2=runtimeClasspath diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index b982fc2c894..cd09fdb83dc 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -11,8 +11,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelVersion = "1.10.0-rc.1" -val otelAlphaVersion = "1.10.0-alpha-rc.1" +val otelVersion = "1.10.0" rootProject.extra["otelVersion"] = otelVersion // IMPORTANT when updating opentelemetry version, be sure to update bytebuddy version to match @@ -21,7 +20,7 @@ val otelInstrumentationVersionAlpha = "1.10.0+ai.patches-alpha" val DEPENDENCY_BOMS = listOf( "com.google.guava:guava-bom:30.1.1-jre", "io.opentelemetry:opentelemetry-bom:${otelVersion}", - "io.opentelemetry:opentelemetry-bom-alpha:${otelAlphaVersion}", + "io.opentelemetry:opentelemetry-bom-alpha:${otelVersion}-alpha", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationVersionAlpha}", "org.junit:junit-bom:5.7.2" ) diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 5fce3437dde..3afb3d9079c 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -3,8 +3,8 @@ # This file is expected to be part of source control. com.google.guava:guava-bom:30.1.1-jre=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.10.0+ai.patches-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha-rc.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.10.0-rc.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.10.0=runtimeClasspath org.junit:junit-bom:5.7.2=runtimeClasspath org.slf4j:slf4j-api:1.7.30=runtimeClasspath empty=