diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index d568e722d10..ae528730fef 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:agent-bootstrap:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 5290e1a45f0..b0c92ddba36 100644 --- a/agent/agent-for-testing/gradle.lockfile +++ b/agent/agent-for-testing/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:agent-for-testing:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 0aa71ba1270..be01a56432e 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:agent-gc-monitor:gc-monitor-api:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath @@ -11,6 +11,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtim io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath -org.slf4j:slf4j-api:2.0.19=runtimeClasspath +org.slf4j:slf4j-api:2.0.20=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=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 22be3c730f3..c2e4c5f64e9 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:agent-gc-monitor:gc-monitor-core:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath @@ -11,6 +11,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtim io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath -org.slf4j:slf4j-api:2.0.19=runtimeClasspath +org.slf4j:slf4j-api:2.0.20=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=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 5ed0a22787d..c904d6a2c70 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. # To regenerate this file, run: ./gradlew :agent:agent-gc-monitor:gc-monitor-tests:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 77707e2a769..6e7a8b57f55 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. # To regenerate this file, run: ./gradlew :agent:agent-profiler:agent-alerting-api:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 39ad68132a1..1e44ef10a38 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -4,13 +4,13 @@ # To regenerate this file, run: ./gradlew :agent:agent-profiler:agent-alerting:dependencies --write-locks com.azure:azure-json:1.5.1=runtimeClasspath com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath -org.slf4j:slf4j-api:2.0.19=runtimeClasspath +org.slf4j:slf4j-api:2.0.20=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 16c81bddd23..5f015fd38b4 100644 --- a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:agent-profiler:agent-diagnostics-api:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index d8d90c36d27..c5c561100a2 100644 --- a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:agent-profiler:agent-diagnostics-jfr:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 753d2d94643..4655d7b5871 100644 --- a/agent/agent-profiler/agent-diagnostics/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:agent-profiler:agent-diagnostics:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index f1f95ca0735..a4df97e34d6 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -17,10 +17,10 @@ com.azure:azure-storage-common:12.34.0=runtimeClasspath com.azure:azure-storage-internal-avro:12.20.0=runtimeClasspath com.azure:azure-xml:1.2.1=runtimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.22=runtimeClasspath -com.fasterxml.jackson.core:jackson-core:2.22.2=runtimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.22.2=runtimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.2=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.3=runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.3=runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.3=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath com.github.oshi:oshi-common:7.6.1=runtimeClasspath com.github.oshi:oshi-core:7.6.1=runtimeClasspath com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath @@ -79,7 +79,7 @@ org.apache.commons:commons-lang3:3.20.0=runtimeClasspath org.apache.commons:commons-text:1.15.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath -org.slf4j:jcl-over-slf4j:2.0.19=runtimeClasspath -org.slf4j:slf4j-api:2.0.19=runtimeClasspath +org.slf4j:jcl-over-slf4j:2.0.20=runtimeClasspath +org.slf4j:slf4j-api:2.0.20=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 88c59b83707..2f17c4b9891 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:agent:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 9d156dd0c27..3082ad075b7 100644 --- a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile +++ b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:instrumentation:applicationinsights-web-2.3:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 1c3ca6f7a18..9477d1e3c5a 100644 --- a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile +++ b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:instrumentation:azure-functions-worker-stub:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 36bf6daf9ad..6563980b335 100644 --- a/agent/instrumentation/azure-functions/gradle.lockfile +++ b/agent/instrumentation/azure-functions/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:instrumentation:azure-functions:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 09d7bb51d85..b0f1c2040e8 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:instrumentation:methods:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 3481441c5cb..270324aa102 100644 --- a/agent/instrumentation/micrometer-1.0/gradle.lockfile +++ b/agent/instrumentation/micrometer-1.0/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:instrumentation:micrometer-1.0:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 9698c026acb..d28f46ed7b4 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :agent:runtime-attach:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.60.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index edbdd179e8f..08c3510b684 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :classic-sdk:core:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index e38995a7a8e..3c0f59ad8b7 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -3,7 +3,7 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :classic-sdk:web:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 5afd98e911f..b207e5bca0b 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -18,7 +18,7 @@ rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion val DEPENDENCY_BOMS = listOf( - "com.fasterxml.jackson:jackson-bom:2.22.2", + "com.fasterxml.jackson:jackson-bom:2.22.3", "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}", "io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${otelInstrumentationVersion}", @@ -34,7 +34,7 @@ val autoValueVersion = "1.11.1" val errorProneVersion = "2.50.0" val jmhVersion = "1.37" val mockitoVersion = "4.11.0" -val slf4jVersion = "2.0.19" +val slf4jVersion = "2.0.20" val CORE_DEPENDENCIES = listOf( "io.opentelemetry.semconv:opentelemetry-semconv:1.44.0", diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 55603fdc3c9..4f878d4ff4f 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -3,13 +3,13 @@ # This file is expected to be part of source control. # To regenerate this file, run: ./gradlew :etw:java:dependencies --write-locks com.azure:azure-sdk-bom:1.3.8=runtimeClasspath -com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.18.Final=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath -org.slf4j:slf4j-api:2.0.19=runtimeClasspath +org.slf4j:slf4j-api:2.0.20=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index eddabd2eef8..5097068a8d3 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ad7845be306..9b7cb4af38a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew.bat b/gradlew.bat index 8508ef684d4..03754c4c3d9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,33 @@ @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line @@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2 @rem Execute gradlew @rem endlocal doesn't take effect until after the line is parsed and variables are expanded @rem which allows us to clear the local environment before executing the java command -endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :exitWithErrorLevel @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts "%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/licenses/jackson-core-2.22.2.jar/META-INF/LICENSE b/licenses/jackson-core-2.22.3.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-core-2.22.2.jar/META-INF/LICENSE rename to licenses/jackson-core-2.22.3.jar/META-INF/LICENSE diff --git a/licenses/jackson-core-2.22.2.jar/META-INF/NOTICE b/licenses/jackson-core-2.22.3.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-core-2.22.2.jar/META-INF/NOTICE rename to licenses/jackson-core-2.22.3.jar/META-INF/NOTICE diff --git a/licenses/jackson-databind-2.22.2.jar/META-INF/LICENSE b/licenses/jackson-databind-2.22.3.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-databind-2.22.2.jar/META-INF/LICENSE rename to licenses/jackson-databind-2.22.3.jar/META-INF/LICENSE diff --git a/licenses/jackson-databind-2.22.2.jar/META-INF/NOTICE b/licenses/jackson-databind-2.22.3.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-databind-2.22.2.jar/META-INF/NOTICE rename to licenses/jackson-databind-2.22.3.jar/META-INF/NOTICE diff --git a/licenses/jackson-datatype-jsr310-2.22.2.jar/META-INF/LICENSE b/licenses/jackson-datatype-jsr310-2.22.3.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-datatype-jsr310-2.22.2.jar/META-INF/LICENSE rename to licenses/jackson-datatype-jsr310-2.22.3.jar/META-INF/LICENSE diff --git a/licenses/jackson-datatype-jsr310-2.22.2.jar/META-INF/NOTICE b/licenses/jackson-datatype-jsr310-2.22.3.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-datatype-jsr310-2.22.2.jar/META-INF/NOTICE rename to licenses/jackson-datatype-jsr310-2.22.3.jar/META-INF/NOTICE diff --git a/licenses/jcl-over-slf4j-2.0.19.jar/META-INF/LICENSE.txt b/licenses/jcl-over-slf4j-2.0.20.jar/META-INF/LICENSE.txt similarity index 100% rename from licenses/jcl-over-slf4j-2.0.19.jar/META-INF/LICENSE.txt rename to licenses/jcl-over-slf4j-2.0.20.jar/META-INF/LICENSE.txt diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index f9a59654c9a..e9975a7c954 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -10,26 +10,26 @@ > - **Embedded license files**: [jackson-annotations-2.22.jar/META-INF/LICENSE](jackson-annotations-2.22.jar/META-INF/LICENSE) - [jackson-annotations-2.22.jar/META-INF/NOTICE](jackson-annotations-2.22.jar/META-INF/NOTICE) -**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.22.2` +**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.22.3` > - **Project URL**: [https://github.com/FasterXML/jackson-core](https://github.com/FasterXML/jackson-core) > - **Manifest License**: [https://www.apache.org/licenses/LICENSE-2.0](Apache License, Version 2.0) > - **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**: [jackson-core-2.22.2.jar/META-INF/LICENSE](jackson-core-2.22.2.jar/META-INF/LICENSE) - - [jackson-core-2.22.2.jar/META-INF/NOTICE](jackson-core-2.22.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-core-2.22.3.jar/META-INF/LICENSE](jackson-core-2.22.3.jar/META-INF/LICENSE) + - [jackson-core-2.22.3.jar/META-INF/NOTICE](jackson-core-2.22.3.jar/META-INF/NOTICE) -**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.22.2` +**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.22.3` > - **Project URL**: [https://github.com/FasterXML/jackson](https://github.com/FasterXML/jackson) > - **Manifest License**: [https://www.apache.org/licenses/LICENSE-2.0](Apache License, Version 2.0) > - **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**: [jackson-databind-2.22.2.jar/META-INF/LICENSE](jackson-databind-2.22.2.jar/META-INF/LICENSE) - - [jackson-databind-2.22.2.jar/META-INF/NOTICE](jackson-databind-2.22.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-databind-2.22.3.jar/META-INF/LICENSE](jackson-databind-2.22.3.jar/META-INF/LICENSE) + - [jackson-databind-2.22.3.jar/META-INF/NOTICE](jackson-databind-2.22.3.jar/META-INF/NOTICE) -**4** **Group:** `com.fasterxml.jackson.datatype` **Name:** `jackson-datatype-jsr310` **Version:** `2.22.2` +**4** **Group:** `com.fasterxml.jackson.datatype` **Name:** `jackson-datatype-jsr310` **Version:** `2.22.3` > - **Manifest Project URL**: [https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310](https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310) > - **Manifest License**: [https://www.apache.org/licenses/LICENSE-2.0](Apache License, Version 2.0) > - **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**: [jackson-datatype-jsr310-2.22.2.jar/META-INF/LICENSE](jackson-datatype-jsr310-2.22.2.jar/META-INF/LICENSE) - - [jackson-datatype-jsr310-2.22.2.jar/META-INF/NOTICE](jackson-datatype-jsr310-2.22.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-datatype-jsr310-2.22.3.jar/META-INF/LICENSE](jackson-datatype-jsr310-2.22.3.jar/META-INF/LICENSE) + - [jackson-datatype-jsr310-2.22.3.jar/META-INF/NOTICE](jackson-datatype-jsr310-2.22.3.jar/META-INF/NOTICE) **5** **Group:** `com.google.errorprone` **Name:** `error_prone_annotations` **Version:** `2.50.0` > - **Manifest Project URL**: [https://errorprone.info/error_prone_annotations](https://errorprone.info/error_prone_annotations) @@ -266,12 +266,12 @@ > - **Embedded license files**: [commons-text-1.15.0.jar/META-INF/LICENSE.txt](commons-text-1.15.0.jar/META-INF/LICENSE.txt) - [commons-text-1.15.0.jar/META-INF/NOTICE.txt](commons-text-1.15.0.jar/META-INF/NOTICE.txt) -**52** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.19` +**52** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.20` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **Manifest License**: [https://www.apache.org/licenses/LICENSE-2.0](Apache License, Version 2.0) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -> - **Embedded license files**: [jcl-over-slf4j-2.0.19.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.19.jar/META-INF/LICENSE.txt) +> - **Embedded license files**: [jcl-over-slf4j-2.0.20.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.20.jar/META-INF/LICENSE.txt) ## Eclipse Public License - v 1.0 @@ -401,17 +401,17 @@ > - **POM Project URL**: [https://github.com/AzureAD/microsoft-authentication-library-for-java](https://github.com/AzureAD/microsoft-authentication-library-for-java) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -**78** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.19` +**78** **Group:** `org.slf4j` **Name:** `jcl-over-slf4j` **Version:** `2.0.20` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **Manifest License**: [https://www.apache.org/licenses/LICENSE-2.0](Apache License, Version 2.0) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -> - **Embedded license files**: [jcl-over-slf4j-2.0.19.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.19.jar/META-INF/LICENSE.txt) +> - **Embedded license files**: [jcl-over-slf4j-2.0.20.jar/META-INF/LICENSE.txt](jcl-over-slf4j-2.0.20.jar/META-INF/LICENSE.txt) -**79** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.19` +**79** **Group:** `org.slf4j` **Name:** `slf4j-api` **Version:** `2.0.20` > - **Project URL**: [http://www.slf4j.org](http://www.slf4j.org) > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT) -> - **Embedded license files**: [slf4j-api-2.0.19.jar/META-INF/LICENSE.txt](slf4j-api-2.0.19.jar/META-INF/LICENSE.txt) +> - **Embedded license files**: [slf4j-api-2.0.20.jar/META-INF/LICENSE.txt](slf4j-api-2.0.20.jar/META-INF/LICENSE.txt) ## MIT-0 diff --git a/licenses/slf4j-api-2.0.19.jar/META-INF/LICENSE.txt b/licenses/slf4j-api-2.0.20.jar/META-INF/LICENSE.txt similarity index 100% rename from licenses/slf4j-api-2.0.19.jar/META-INF/LICENSE.txt rename to licenses/slf4j-api-2.0.20.jar/META-INF/LICENSE.txt