From 32586a870ad3e367e6951b2f2000454fa77f25a5 Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Mon, 30 Mar 2026 15:27:30 -0400 Subject: [PATCH 1/4] Update Jackson, Netty, Reactor, and Vert.x dependencies --- common/perf-test-core/pom.xml | 6 +- eng/bomgenerator/pom.xml | 2 +- eng/versioning/external_dependencies.txt | 58 +++++++++---------- sdk/batch/microsoft-azure-batch/pom.xml | 2 +- sdk/clientcore/http-netty4/pom.xml | 48 +++++++-------- .../azure-communication-common/pom.xml | 2 +- sdk/core/azure-core-experimental/pom.xml | 2 +- .../azure-core-http-jdk-httpclient/pom.xml | 2 +- sdk/core/azure-core-http-netty/pom.xml | 50 ++++++++-------- sdk/core/azure-core-http-okhttp/pom.xml | 2 +- sdk/core/azure-core-http-vertx/pom.xml | 10 ++-- sdk/core/azure-core-management/pom.xml | 2 +- sdk/core/azure-core-perf/pom.xml | 2 +- .../azure-core-serializer-avro-apache/pom.xml | 2 +- .../azure-core-serializer-json-gson/pom.xml | 2 +- .../pom.xml | 22 +++---- sdk/core/azure-core-test/pom.xml | 4 +- .../azure-core-tracing-opentelemetry/pom.xml | 2 +- sdk/core/azure-core-version-tests/pom.xml | 24 ++++---- sdk/core/azure-core/pom.xml | 26 ++++----- sdk/cosmos/azure-cosmos-encryption/pom.xml | 2 +- .../pom.xml | 12 ++-- .../azure-cosmos-spark_3-3_2-12/pom.xml | 4 +- .../azure-cosmos-spark_3-4_2-12/pom.xml | 4 +- sdk/cosmos/azure-cosmos-spark_3-5/pom.xml | 2 +- sdk/cosmos/azure-cosmos-spark_3/pom.xml | 14 ++--- .../azure-cosmos-spark_4-0_2-13/pom.xml | 4 +- sdk/cosmos/azure-cosmos-tests/pom.xml | 6 +- sdk/cosmos/azure-cosmos/pom.xml | 8 +-- sdk/cosmos/fabric-cosmos-spark-auth_3/pom.xml | 10 ++-- sdk/e2e/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-messaging-eventhubs/docs/pom.xml | 2 +- .../azure-security-test-keyvault-jca/pom.xml | 2 +- .../azure-iot-modelsrepository/pom.xml | 10 ++-- sdk/openai/azure-ai-openai-realtime/pom.xml | 4 +- .../azure-client-sdk-parent-v2/pom.xml | 2 +- sdk/parents/azure-client-sdk-parent/pom.xml | 2 +- sdk/parents/clientcore-parent/pom.xml | 2 +- sdk/serialization/azure-json/pom.xml | 4 +- sdk/template/azure-template-stress/pom.xml | 4 +- sdk/tools/azure-openrewrite/pom.xml | 6 +- sdk/tools/linting-extensions/pom.xml | 2 +- sdk/voicelive/azure-ai-voicelive/pom.xml | 2 +- .../azure-messaging-webpubsub-client/pom.xml | 4 +- 45 files changed, 193 insertions(+), 193 deletions(-) diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml index 63be69b1f23b..f284f8bb2b60 100644 --- a/common/perf-test-core/pom.xml +++ b/common/perf-test-core/pom.xml @@ -55,8 +55,8 @@ com.beust:jcommander:[1.82] - io.vertx:vertx-codegen:[4.5.23] - io.projectreactor:reactor-core:[3.7.14] + io.vertx:vertx-codegen:[4.5.26] + io.projectreactor:reactor-core:[3.7.17] @@ -94,7 +94,7 @@ io.vertx vertx-codegen - 4.5.23 + 4.5.26 provided diff --git a/eng/bomgenerator/pom.xml b/eng/bomgenerator/pom.xml index cb59ea95a875..189079082146 100644 --- a/eng/bomgenerator/pom.xml +++ b/eng/bomgenerator/pom.xml @@ -38,7 +38,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.18.4 + 2.18.6 diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 2b6c2998e16a..2799276698a9 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -11,16 +11,16 @@ ch.qos.logback:logback-classic;1.3.14 com.azure:azure-servicebus-jms;2.1.0 com.azure.tools:azure-autorest-customization;1.0.0-beta.11 com.fasterxml:aalto-xml;1.3.3 -com.fasterxml.jackson.core:jackson-annotations;2.18.4 -com.fasterxml.jackson.core:jackson-core;2.18.4.1 -com.fasterxml.jackson.core:jackson-databind;2.18.4 -com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.18.4 -com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.18.4 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.18.4 -com.fasterxml.jackson.module:jackson-module-afterburner;2.18.4 -com.fasterxml.jackson.module:jackson-module-blackbird;2.18.4 -com.fasterxml.jackson.module:jackson-module-scala_2.12;2.18.4 -com.fasterxml.jackson.module:jackson-module-scala_2.13;2.18.4 +com.fasterxml.jackson.core:jackson-annotations;2.18.6 +com.fasterxml.jackson.core:jackson-core;2.18.6 +com.fasterxml.jackson.core:jackson-databind;2.18.6 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.18.6 +com.fasterxml.jackson.dataformat:jackson-dataformat-smile;2.18.6 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.18.6 +com.fasterxml.jackson.module:jackson-module-afterburner;2.18.6 +com.fasterxml.jackson.module:jackson-module-blackbird;2.18.6 +com.fasterxml.jackson.module:jackson-module-scala_2.12;2.18.6 +com.fasterxml.jackson.module:jackson-module-scala_2.13;2.18.6 com.github.spotbugs:spotbugs;4.8.3 com.github.spotbugs:spotbugs-annotations;4.8.3 com.github.spotbugs:spotbugs-maven-plugin;4.8.3.1 @@ -43,24 +43,24 @@ commons-net:commons-net;3.9.0 io.cloudevents:cloudevents-api;2.2.0 io.cloudevents:cloudevents-core;2.2.0 io.fabric8:kubernetes-client;6.12.1 -io.netty:netty-buffer;4.1.130.Final -io.netty:netty-common;4.1.130.Final -io.netty:netty-codec;4.1.130.Final -io.netty:netty-codec-http;4.1.130.Final -io.netty:netty-codec-http2;4.1.130.Final -io.netty:netty-handler;4.1.130.Final -io.netty:netty-handler-proxy;4.1.130.Final -io.netty:netty-resolver;4.1.130.Final -io.netty:netty-resolver-dns;4.1.130.Final -io.netty:netty-tcnative-boringssl-static;2.0.74.Final -io.netty:netty-transport;4.1.130.Final -io.netty:netty-transport-native-epoll;4.1.130.Final -io.netty:netty-transport-native-unix-common;4.1.130.Final -io.netty:netty-transport-native-kqueue;4.1.130.Final -io.projectreactor.netty:reactor-netty-http;1.2.13 -io.projectreactor:reactor-core;3.7.14 -io.vertx:vertx-codegen;4.5.23 -io.vertx:vertx-core;4.5.23 +io.netty:netty-buffer;4.1.132.Final +io.netty:netty-common;4.1.132.Final +io.netty:netty-codec;4.1.132.Final +io.netty:netty-codec-http;4.1.132.Final +io.netty:netty-codec-http2;4.1.132.Final +io.netty:netty-handler;4.1.132.Final +io.netty:netty-handler-proxy;4.1.132.Final +io.netty:netty-resolver;4.1.132.Final +io.netty:netty-resolver-dns;4.1.132.Final +io.netty:netty-tcnative-boringssl-static;2.0.75.Final +io.netty:netty-transport;4.1.132.Final +io.netty:netty-transport-native-epoll;4.1.132.Final +io.netty:netty-transport-native-unix-common;4.1.132.Final +io.netty:netty-transport-native-kqueue;4.1.132.Final +io.projectreactor.netty:reactor-netty-http;1.2.16 +io.projectreactor:reactor-core;3.7.17 +io.vertx:vertx-codegen;4.5.26 +io.vertx:vertx-core;4.5.26 javax.websocket:javax.websocket-api;1.1 org.apache.ant:ant;1.10.15 org.apache.avro:avro;1.11.4 @@ -124,7 +124,7 @@ io.opentelemetry:opentelemetry-bom;1.58.0 io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;2.24.0-alpha io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.24.0 io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.24.0-alpha -io.projectreactor:reactor-test;3.7.11 +io.projectreactor:reactor-test;3.7.17 io.github.hakky54:logcaptor;2.9.3 com.squareup.okio:okio;3.16.0 com.squareup.okio:okio-jvm;3.16.0 diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml index 7ea171671427..42f1545683b1 100644 --- a/sdk/batch/microsoft-azure-batch/pom.xml +++ b/sdk/batch/microsoft-azure-batch/pom.xml @@ -71,7 +71,7 @@ com.fasterxml.jackson.core jackson-core - 2.18.4.1 + 2.18.6 test diff --git a/sdk/clientcore/http-netty4/pom.xml b/sdk/clientcore/http-netty4/pom.xml index 7590e0004aa0..1aa8ea04ce52 100644 --- a/sdk/clientcore/http-netty4/pom.xml +++ b/sdk/clientcore/http-netty4/pom.xml @@ -69,52 +69,52 @@ io.netty netty-buffer - 4.1.130.Final + 4.1.132.Final io.netty netty-codec - 4.1.130.Final + 4.1.132.Final io.netty netty-codec-http - 4.1.130.Final + 4.1.132.Final io.netty netty-codec-http2 - 4.1.130.Final + 4.1.132.Final io.netty netty-common - 4.1.130.Final + 4.1.132.Final io.netty netty-handler - 4.1.130.Final + 4.1.132.Final io.netty netty-handler-proxy - 4.1.130.Final + 4.1.132.Final io.netty netty-resolver - 4.1.130.Final + 4.1.132.Final io.netty netty-resolver-dns - 4.1.130.Final + 4.1.132.Final io.netty netty-transport - 4.1.130.Final + 4.1.132.Final @@ -129,14 +129,14 @@ io.netty netty-transport-native-unix-common - 4.1.130.Final + 4.1.132.Final linux-x86_64 test io.netty netty-transport-native-epoll - 4.1.130.Final + 4.1.132.Final linux-x86_64 test @@ -144,14 +144,14 @@ io.netty netty-transport-native-unix-common - 4.1.130.Final + 4.1.132.Final osx-x86_64 test io.netty netty-transport-native-kqueue - 4.1.130.Final + 4.1.132.Final osx-x86_64 test @@ -223,16 +223,16 @@ - io.netty:netty-buffer:[4.1.130.Final] - io.netty:netty-codec:[4.1.130.Final] - io.netty:netty-codec-http:[4.1.130.Final] - io.netty:netty-codec-http2:[4.1.130.Final] - io.netty:netty-common:[4.1.130.Final] - io.netty:netty-handler:[4.1.130.Final] - io.netty:netty-handler-proxy:[4.1.130.Final] - io.netty:netty-resolver:[4.1.130.Final] - io.netty:netty-resolver-dns:[4.1.130.Final] - io.netty:netty-transport:[4.1.130.Final] + io.netty:netty-buffer:[4.1.132.Final] + io.netty:netty-codec:[4.1.132.Final] + io.netty:netty-codec-http:[4.1.132.Final] + io.netty:netty-codec-http2:[4.1.132.Final] + io.netty:netty-common:[4.1.132.Final] + io.netty:netty-handler:[4.1.132.Final] + io.netty:netty-handler-proxy:[4.1.132.Final] + io.netty:netty-resolver:[4.1.132.Final] + io.netty:netty-resolver-dns:[4.1.132.Final] + io.netty:netty-transport:[4.1.132.Final] diff --git a/sdk/communication/azure-communication-common/pom.xml b/sdk/communication/azure-communication-common/pom.xml index 4baef2ee9386..d82990c7b192 100644 --- a/sdk/communication/azure-communication-common/pom.xml +++ b/sdk/communication/azure-communication-common/pom.xml @@ -83,7 +83,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index de901482d942..0e016c8cb176 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -100,7 +100,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index 0ff8f1b68371..6c7799eaf7ae 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -89,7 +89,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 1bc538843e11..f0cdd910bacd 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -85,69 +85,69 @@ io.netty netty-handler - 4.1.130.Final + 4.1.132.Final io.netty netty-handler-proxy - 4.1.130.Final + 4.1.132.Final io.netty netty-buffer - 4.1.130.Final + 4.1.132.Final io.netty netty-codec - 4.1.130.Final + 4.1.132.Final io.netty netty-codec-http - 4.1.130.Final + 4.1.132.Final io.netty netty-codec-http2 - 4.1.130.Final + 4.1.132.Final io.netty netty-transport-native-unix-common - 4.1.130.Final + 4.1.132.Final io.netty netty-transport-native-epoll - 4.1.130.Final + 4.1.132.Final linux-x86_64 io.netty netty-transport-native-kqueue - 4.1.130.Final + 4.1.132.Final osx-x86_64 io.netty netty-tcnative-boringssl-static - 2.0.74.Final + 2.0.75.Final ${boring-ssl-classifier} io.projectreactor.netty reactor-netty-http - 1.2.13 + 1.2.16 io.netty netty-common - 4.1.130.Final + 4.1.132.Final @@ -161,7 +161,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test @@ -208,18 +208,18 @@ - io.netty:netty-tcnative-boringssl-static:[2.0.74.Final] - io.projectreactor.netty:reactor-netty-http:[1.2.13] - io.netty:netty-buffer:[4.1.130.Final] - io.netty:netty-common:[4.1.130.Final] - io.netty:netty-codec:[4.1.130.Final] - io.netty:netty-codec-http:[4.1.130.Final] - io.netty:netty-codec-http2:[4.1.130.Final] - io.netty:netty-handler:[4.1.130.Final] - io.netty:netty-handler-proxy:[4.1.130.Final] - io.netty:netty-transport-native-unix-common:[4.1.130.Final] - io.netty:netty-transport-native-epoll:[4.1.130.Final] - io.netty:netty-transport-native-kqueue:[4.1.130.Final] + io.netty:netty-tcnative-boringssl-static:[2.0.75.Final] + io.projectreactor.netty:reactor-netty-http:[1.2.16] + io.netty:netty-buffer:[4.1.132.Final] + io.netty:netty-common:[4.1.132.Final] + io.netty:netty-codec:[4.1.132.Final] + io.netty:netty-codec-http:[4.1.132.Final] + io.netty:netty-codec-http2:[4.1.132.Final] + io.netty:netty-handler:[4.1.132.Final] + io.netty:netty-handler-proxy:[4.1.132.Final] + io.netty:netty-transport-native-unix-common:[4.1.132.Final] + io.netty:netty-transport-native-epoll:[4.1.132.Final] + io.netty:netty-transport-native-kqueue:[4.1.132.Final] diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 7907d0a5af9e..b3a560382b54 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -108,7 +108,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-http-vertx/pom.xml b/sdk/core/azure-core-http-vertx/pom.xml index 054f602bc874..63c296b45ea2 100644 --- a/sdk/core/azure-core-http-vertx/pom.xml +++ b/sdk/core/azure-core-http-vertx/pom.xml @@ -82,14 +82,14 @@ io.vertx vertx-codegen - 4.5.23 + 4.5.26 provided io.vertx vertx-core - 4.5.23 + 4.5.26 @@ -104,7 +104,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test @@ -172,8 +172,8 @@ - io.vertx:vertx-codegen:[4.5.23] - io.vertx:vertx-core:[4.5.23] + io.vertx:vertx-codegen:[4.5.26] + io.vertx:vertx-core:[4.5.26] diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index d15f700e865b..cc2aea83ef27 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -103,7 +103,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-perf/pom.xml b/sdk/core/azure-core-perf/pom.xml index 625445b2da9a..8d2c0f29123f 100644 --- a/sdk/core/azure-core-perf/pom.xml +++ b/sdk/core/azure-core-perf/pom.xml @@ -68,7 +68,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index 13372df25c6c..821af524e8c5 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -102,7 +102,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index 7129993d16ce..5b76e90d9514 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -118,7 +118,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index e9f6b1a9c99e..398edf65dfb7 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -94,28 +94,28 @@ com.fasterxml.jackson.core jackson-annotations - 2.18.4 + 2.18.6 com.fasterxml.jackson.core jackson-core - 2.18.4.1 + 2.18.6 com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.18.4 + 2.18.6 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.18.4 + 2.18.6 test @@ -148,7 +148,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test @@ -163,11 +163,11 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.18.4] - com.fasterxml.jackson.core:jackson-core:[2.18.4.1] - com.fasterxml.jackson.core:jackson-databind:[2.18.4] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.4] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.4] + com.fasterxml.jackson.core:jackson-annotations:[2.18.6] + com.fasterxml.jackson.core:jackson-core:[2.18.6] + com.fasterxml.jackson.core:jackson-databind:[2.18.6] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.6] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.6] diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 5937ee13a6cf..51a29acec3e2 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -99,7 +99,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 @@ -142,7 +142,7 @@ org.junit.jupiter:junit-jupiter-api:[5.13.4] org.junit.jupiter:junit-jupiter-engine:[5.13.4] org.junit.jupiter:junit-jupiter-params:[5.13.4] - io.projectreactor:reactor-test:[3.7.11] + io.projectreactor:reactor-test:[3.7.17] org.apache.ant:ant:[1.10.15] diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index e2e64a9a8e47..66139a806933 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -100,7 +100,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/core/azure-core-version-tests/pom.xml b/sdk/core/azure-core-version-tests/pom.xml index 4bdf1b207eeb..aa48b36e6766 100644 --- a/sdk/core/azure-core-version-tests/pom.xml +++ b/sdk/core/azure-core-version-tests/pom.xml @@ -70,32 +70,32 @@ com.fasterxml.jackson.core jackson-annotations - 2.18.4 + 2.18.6 com.fasterxml.jackson.core jackson-core - 2.18.4.1 + 2.18.6 com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.18.4 + 2.18.6 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.18.4 + 2.18.6 io.projectreactor reactor-core - 3.7.14 + 3.7.17 - com.fasterxml.jackson.core:jackson-annotations:[2.18.4] - com.fasterxml.jackson.core:jackson-core:[2.18.4.1] - com.fasterxml.jackson.core:jackson-databind:[2.18.4] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.4] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.4] + io.projectreactor:reactor-core:[3.7.17] + com.fasterxml.jackson.core:jackson-annotations:[2.18.6] + com.fasterxml.jackson.core:jackson-core:[2.18.6] + com.fasterxml.jackson.core:jackson-databind:[2.18.6] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.6] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.6] org.slf4j:slf4j-api:[1.7.36] diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 9377db2f093b..a18c13a1c8e2 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -110,22 +110,22 @@ com.fasterxml.jackson.core jackson-annotations - 2.18.4 + 2.18.6 com.fasterxml.jackson.core jackson-core - 2.18.4.1 + 2.18.6 com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.18.4 + 2.18.6 org.slf4j @@ -146,7 +146,7 @@ io.projectreactor reactor-core - 3.7.14 + 3.7.17 @@ -159,14 +159,14 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.18.4 + 2.18.6 test io.projectreactor reactor-test - 3.7.11 + 3.7.17 test @@ -223,12 +223,12 @@ - io.projectreactor:reactor-core:[3.7.14] - com.fasterxml.jackson.core:jackson-annotations:[2.18.4] - com.fasterxml.jackson.core:jackson-core:[2.18.4.1] - com.fasterxml.jackson.core:jackson-databind:[2.18.4] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.4] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.4] + io.projectreactor:reactor-core:[3.7.17] + com.fasterxml.jackson.core:jackson-annotations:[2.18.6] + com.fasterxml.jackson.core:jackson-core:[2.18.6] + com.fasterxml.jackson.core:jackson-databind:[2.18.6] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.6] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.6] org.slf4j:slf4j-api:[1.7.36] diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index be23c1556377..266782a98b1c 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -178,7 +178,7 @@ Licensed under the MIT License. io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml b/sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml index b55f086cdcd4..eb064ec269b9 100644 --- a/sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml @@ -75,12 +75,12 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.module jackson-module-scala_2.12 - 2.18.4 + 2.18.6 org.scala-lang @@ -159,7 +159,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test @@ -286,9 +286,9 @@ org.scalatest:scalatest_2.12:[3.2.2] org.apache.maven.plugins:maven-antrun-plugin:[3.1.0] org.scalastyle:scalastyle-maven-plugin:[1.0.0] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.4] - com.fasterxml.jackson.core:jackson-databind:[2.18.4] - com.fasterxml.jackson.module:jackson-module-scala_2.12:[2.18.4] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.6] + com.fasterxml.jackson.core:jackson-databind:[2.18.6] + com.fasterxml.jackson.module:jackson-module-scala_2.12:[2.18.6] com.globalmentor:hadoop-bare-naked-local-fs:[0.1.0] com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12:[4.47.0-beta.1] diff --git a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml index c978e5ea7f18..1095c39f0aa6 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-3_2-12/pom.xml @@ -209,12 +209,12 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.module jackson-module-scala_2.12 - 2.18.4 + 2.18.6 diff --git a/sdk/cosmos/azure-cosmos-spark_3-4_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-4_2-12/pom.xml index 1ffb6d25f1c9..634a658caa99 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-4_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-4_2-12/pom.xml @@ -209,12 +209,12 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.module jackson-module-scala_2.12 - 2.18.4 + 2.18.6 diff --git a/sdk/cosmos/azure-cosmos-spark_3-5/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-5/pom.xml index 85337b09b220..007843403ef8 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-5/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-5/pom.xml @@ -130,7 +130,7 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.module diff --git a/sdk/cosmos/azure-cosmos-spark_3/pom.xml b/sdk/cosmos/azure-cosmos-spark_3/pom.xml index 6102dd4faa1a..bf5441984a96 100644 --- a/sdk/cosmos/azure-cosmos-spark_3/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3/pom.xml @@ -139,12 +139,12 @@ com.fasterxml.jackson.module jackson-module-afterburner - 2.18.4 + 2.18.6 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.18.4 + 2.18.6 io.opentelemetry @@ -198,7 +198,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test @@ -333,10 +333,10 @@ org.apache.maven.plugins:maven-antrun-plugin:[3.1.0] net.alchim31.maven:scala-maven-plugin:[4.8.1] org.scalastyle:scalastyle-maven-plugin:[1.0.0] - com.fasterxml.jackson.core:jackson-databind:[2.18.4] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.4] - com.fasterxml.jackson.module:jackson-module-afterburner:[2.18.4] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.4] + com.fasterxml.jackson.core:jackson-databind:[2.18.6] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.6] + com.fasterxml.jackson.module:jackson-module-afterburner:[2.18.6] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.6] com.fasterxml.jackson.module:jackson-module-scala_2.12:[${scala-jackson.version}] com.fasterxml.jackson.module:jackson-module-scala_2.13:[${scala-jackson.version}] io.micrometer:micrometer-registry-azure-monitor:[1.15.1] diff --git a/sdk/cosmos/azure-cosmos-spark_4-0_2-13/pom.xml b/sdk/cosmos/azure-cosmos-spark_4-0_2-13/pom.xml index 25506370a44f..6e2c1649773c 100644 --- a/sdk/cosmos/azure-cosmos-spark_4-0_2-13/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_4-0_2-13/pom.xml @@ -207,12 +207,12 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.module jackson-module-scala_2.13 - 2.18.4 + 2.18.6 diff --git a/sdk/cosmos/azure-cosmos-tests/pom.xml b/sdk/cosmos/azure-cosmos-tests/pom.xml index 448c391910f6..ae569bc7be09 100644 --- a/sdk/cosmos/azure-cosmos-tests/pom.xml +++ b/sdk/cosmos/azure-cosmos-tests/pom.xml @@ -181,7 +181,7 @@ Licensed under the MIT License. io.projectreactor reactor-test - 3.7.11 + 3.7.17 test @@ -214,13 +214,13 @@ Licensed under the MIT License. com.fasterxml.jackson.module jackson-module-afterburner test - 2.18.4 + 2.18.6 com.fasterxml.jackson.module jackson-module-blackbird test - 2.18.4 + 2.18.6 diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index fbc6846d4158..75440be01a13 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -85,14 +85,14 @@ Licensed under the MIT License. jackson-module-afterburner true runtime - 2.18.4 + 2.18.6 com.fasterxml.jackson.module jackson-module-blackbird true runtime - 2.18.4 + 2.18.6 org.slf4j @@ -177,8 +177,8 @@ Licensed under the MIT License. - com.fasterxml.jackson.module:jackson-module-afterburner:[2.18.4] - com.fasterxml.jackson.module:jackson-module-blackbird:[2.18.4] + com.fasterxml.jackson.module:jackson-module-afterburner:[2.18.6] + com.fasterxml.jackson.module:jackson-module-blackbird:[2.18.6] io.dropwizard.metrics:metrics-core:[4.1.0] io.micrometer:micrometer-core:[1.15.1] org.slf4j:slf4j-api:[1.7.36] diff --git a/sdk/cosmos/fabric-cosmos-spark-auth_3/pom.xml b/sdk/cosmos/fabric-cosmos-spark-auth_3/pom.xml index 22a9ffe98d31..3567ec487552 100644 --- a/sdk/cosmos/fabric-cosmos-spark-auth_3/pom.xml +++ b/sdk/cosmos/fabric-cosmos-spark-auth_3/pom.xml @@ -66,12 +66,12 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 com.fasterxml.jackson.module jackson-module-scala_2.12 - 2.18.4 + 2.18.6 org.scala-lang @@ -180,9 +180,9 @@ org.scalatest:scalatest_2.12:[3.2.2] org.apache.maven.plugins:maven-antrun-plugin:[3.1.0] org.scalastyle:scalastyle-maven-plugin:[1.0.0] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.4] - com.fasterxml.jackson.core:jackson-databind:[2.18.4] - com.fasterxml.jackson.module:jackson-module-scala_2.12:[2.18.4] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.6] + com.fasterxml.jackson.core:jackson-databind:[2.18.6] + com.fasterxml.jackson.module:jackson-module-scala_2.12:[2.18.6] com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12:[4.47.0-beta.1] com.microsoft.azure.synapse:synapseutils_2.12:[1.5.4] diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index 8c086a26e696..3b97d7305cb9 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -82,7 +82,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml index 10a0f5a4902e..f4679a541a6e 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml @@ -81,7 +81,7 @@ io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml index f46543617a70..a0d9bf85f390 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml @@ -25,7 +25,7 @@ io.projectreactor reactor-core - 3.7.14 + 3.7.17 diff --git a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml index b5fe7d152ad3..31326cf42da6 100644 --- a/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-test-keyvault-jca/pom.xml @@ -45,7 +45,7 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 test diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml index 2e6b0d5aeca9..026aba184ae8 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml +++ b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml @@ -79,7 +79,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.18.4 + 2.18.6 test @@ -88,12 +88,12 @@ com.fasterxml.jackson.core jackson-core - 2.18.4.1 + 2.18.6 com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 commons-cli @@ -113,8 +113,8 @@ - com.fasterxml.jackson.core:jackson-core:[2.18.4.1] - com.fasterxml.jackson.core:jackson-databind:[2.18.4] + com.fasterxml.jackson.core:jackson-core:[2.18.6] + com.fasterxml.jackson.core:jackson-databind:[2.18.6] diff --git a/sdk/openai/azure-ai-openai-realtime/pom.xml b/sdk/openai/azure-ai-openai-realtime/pom.xml index 587bd1e96dea..b7c5ff66116f 100644 --- a/sdk/openai/azure-ai-openai-realtime/pom.xml +++ b/sdk/openai/azure-ai-openai-realtime/pom.xml @@ -66,7 +66,7 @@ io.netty netty-codec-http - 4.1.130.Final + 4.1.132.Final @@ -102,7 +102,7 @@ - io.netty:netty-codec-http:[4.1.130.Final] + io.netty:netty-codec-http:[4.1.132.Final] diff --git a/sdk/parents/azure-client-sdk-parent-v2/pom.xml b/sdk/parents/azure-client-sdk-parent-v2/pom.xml index 99c659dd90fc..bc9dd5e985c5 100644 --- a/sdk/parents/azure-client-sdk-parent-v2/pom.xml +++ b/sdk/parents/azure-client-sdk-parent-v2/pom.xml @@ -948,7 +948,7 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml index fb194a4906c6..7e329e6b1002 100644 --- a/sdk/parents/azure-client-sdk-parent/pom.xml +++ b/sdk/parents/azure-client-sdk-parent/pom.xml @@ -1021,7 +1021,7 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 diff --git a/sdk/parents/clientcore-parent/pom.xml b/sdk/parents/clientcore-parent/pom.xml index 9c7d2b840391..10d0b338fad7 100644 --- a/sdk/parents/clientcore-parent/pom.xml +++ b/sdk/parents/clientcore-parent/pom.xml @@ -1020,7 +1020,7 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 diff --git a/sdk/serialization/azure-json/pom.xml b/sdk/serialization/azure-json/pom.xml index 389a9dd48edb..1d86ddc18de8 100644 --- a/sdk/serialization/azure-json/pom.xml +++ b/sdk/serialization/azure-json/pom.xml @@ -172,7 +172,7 @@ com.fasterxml.jackson.core jackson-core - 2.18.4.1 + 2.18.6 @@ -220,7 +220,7 @@ - com.fasterxml.jackson.core:jackson-core:[2.18.4.1] + com.fasterxml.jackson.core:jackson-core:[2.18.6] diff --git a/sdk/template/azure-template-stress/pom.xml b/sdk/template/azure-template-stress/pom.xml index 12ae49239aa4..e6e3c0fe813b 100644 --- a/sdk/template/azure-template-stress/pom.xml +++ b/sdk/template/azure-template-stress/pom.xml @@ -59,7 +59,7 @@ io.vertx vertx-codegen - 4.5.23 + 4.5.26 provided @@ -98,7 +98,7 @@ io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8:[2.24.0-alpha] io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0:[2.24.0-alpha] ch.qos.logback:logback-classic:[1.3.14] - io.vertx:vertx-codegen:[4.5.23] + io.vertx:vertx-codegen:[4.5.26] diff --git a/sdk/tools/azure-openrewrite/pom.xml b/sdk/tools/azure-openrewrite/pom.xml index 439c0f20635a..a589d8b0410e 100644 --- a/sdk/tools/azure-openrewrite/pom.xml +++ b/sdk/tools/azure-openrewrite/pom.xml @@ -176,18 +176,18 @@ com.fasterxml.jackson.core jackson-core - 2.18.4.1 + 2.18.6 com.fasterxml.jackson.dataformat jackson-dataformat-smile - 2.18.4 + 2.18.6 com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 diff --git a/sdk/tools/linting-extensions/pom.xml b/sdk/tools/linting-extensions/pom.xml index 6793b3db8067..a1208e87101a 100644 --- a/sdk/tools/linting-extensions/pom.xml +++ b/sdk/tools/linting-extensions/pom.xml @@ -75,7 +75,7 @@ com.fasterxml.jackson.core jackson-databind - 2.18.4 + 2.18.6 diff --git a/sdk/voicelive/azure-ai-voicelive/pom.xml b/sdk/voicelive/azure-ai-voicelive/pom.xml index 3eea97993716..e2ca1f28fc94 100644 --- a/sdk/voicelive/azure-ai-voicelive/pom.xml +++ b/sdk/voicelive/azure-ai-voicelive/pom.xml @@ -79,7 +79,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator. io.projectreactor reactor-test - 3.7.11 + 3.7.17 test diff --git a/sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml b/sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml index 7b4f07bc8f1f..e34f6fa6ba55 100644 --- a/sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml +++ b/sdk/webpubsub/azure-messaging-webpubsub-client/pom.xml @@ -55,7 +55,7 @@ io.netty netty-codec-http - 4.1.130.Final + 4.1.132.Final @@ -101,7 +101,7 @@ - io.netty:netty-codec-http:[4.1.130.Final] + io.netty:netty-codec-http:[4.1.132.Final] From 8d38cfb7a83b183cc998c9db94980591ec5b37dd Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Mon, 30 Mar 2026 15:44:21 -0400 Subject: [PATCH 2/4] Update POM validation versions --- sdk/clientcore/http-netty4/pom.xml | 2 +- sdk/core/azure-core-http-netty/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/clientcore/http-netty4/pom.xml b/sdk/clientcore/http-netty4/pom.xml index 1aa8ea04ce52..bf16014f3838 100644 --- a/sdk/clientcore/http-netty4/pom.xml +++ b/sdk/clientcore/http-netty4/pom.xml @@ -56,7 +56,7 @@ io.clientcore.core.implementation*,io.clientcore.core.models,io.clientcore.core.util,io.clientcore.core.util* - 4.1.130.Final + 4.1.132.Final diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index f0cdd910bacd..43b9f848b12b 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -64,8 +64,8 @@ false false - 4.1.130.Final - 2.0.74.Final + 4.1.132.Final + 2.0.75.Final From 3ab1969f756bb6561874e24bbd279ccc1423168e Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 2 Apr 2026 13:32:30 -0400 Subject: [PATCH 3/4] Try to fix failing Batch tests --- .../compute/batch/BatchClientTestBase.java | 6 +- .../com/azure/compute/batch/TaskTests.java | 94 ++++++++++--------- 2 files changed, 52 insertions(+), 48 deletions(-) diff --git a/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java b/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java index 8db3d4537ee9..43da70abd577 100644 --- a/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java +++ b/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java @@ -9,13 +9,12 @@ import com.azure.compute.batch.models.BatchPoolCreateParameters; import com.azure.compute.batch.models.BatchTask; import com.azure.compute.batch.models.BatchTaskState; -import com.azure.compute.batch.models.ElevationLevel; import com.azure.compute.batch.models.BatchTasksListOptions; import com.azure.compute.batch.models.BatchVmImageReference; +import com.azure.compute.batch.models.ElevationLevel; import com.azure.compute.batch.models.NetworkConfiguration; import com.azure.compute.batch.models.UserAccount; import com.azure.compute.batch.models.VirtualMachineConfiguration; -import com.azure.core.credential.AccessToken; import com.azure.core.credential.AzureNamedKeyCredential; import com.azure.core.credential.TokenCredential; import com.azure.core.http.policy.HttpLogDetailLevel; @@ -30,6 +29,7 @@ import com.azure.core.test.models.TestProxyRequestMatcher; import com.azure.core.test.models.TestProxySanitizer; import com.azure.core.test.models.TestProxySanitizerType; +import com.azure.core.test.utils.MockTokenCredential; import com.azure.core.util.Configuration; import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.resourcemanager.network.NetworkManager; @@ -76,7 +76,7 @@ protected void beforeTest() { .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.PLAYBACK) { batchClientBuilder.httpClient(interceptorManager.getPlaybackClient()) - .credential(request -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX))); + .credential(new MockTokenCredential()); addTestRulesOnPlayback(interceptorManager); } else if (getTestMode() == TestMode.RECORD) { diff --git a/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/TaskTests.java b/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/TaskTests.java index 702ed74a385d..980b0ca7cf9e 100644 --- a/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/TaskTests.java +++ b/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/TaskTests.java @@ -36,26 +36,25 @@ import com.azure.json.JsonProviders; import com.azure.json.JsonReader; import com.azure.storage.blob.BlobContainerClient; - -import reactor.core.publisher.Mono; - import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIf; import org.junit.jupiter.api.parallel.Execution; import org.junit.jupiter.api.parallel.ExecutionMode; import org.junit.jupiter.api.parallel.Isolated; +import reactor.core.publisher.Mono; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.io.StringReader; import java.nio.charset.StandardCharsets; import java.time.Duration; import java.time.OffsetDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Locale; @Execution(ExecutionMode.SAME_THREAD) @Isolated @@ -76,9 +75,7 @@ protected void beforeTest() { } } - /* - * Test TypeSpec Shared model among GET-PUT Roundtrip operation - * */ + // Test TypeSpec Shared model among GET-PUT Roundtrip operation @SyncAsyncTest public void testTaskUnifiedModel() { String testModeSuffix = SyncAsyncExtension.execute(() -> "sync", () -> Mono.just("async")); @@ -429,16 +426,15 @@ public void testAddMultiTasksWithError() { Assertions.assertTrue(true, "Should not here"); } catch (RuntimeException ex) { - System.out.printf("Expect exception %s", ex.toString()); + System.out.printf("Expect exception %s", ex); } } + // This test will temporarily only run in Live/Record mode. It runs fine in Playback mode too on Mac and Windows machines. + // Linux machines are causing issues. This issue is under investigation. + @DisabledIf(value = "skipInPlayback") @Test - public void failIfPoisonTaskTooLargeSync() throws Exception { - //This test will temporarily only run in Live/Record mode. It runs fine in Playback mode too on Mac and Windows machines. - // Linux machines are causing issues. This issue is under investigation. - Assumptions.assumeFalse(getTestMode() == TestMode.PLAYBACK, "This Test only runs in Live/Record mode"); - + public void failIfPoisonTaskTooLargeSync() { String jobId = getStringIdWithUserNamePrefix("-failIfPoisonTaskTooLarge-sync"); String taskId = "mytask-sync"; @@ -447,9 +443,9 @@ public void failIfPoisonTaskTooLargeSync() throws Exception { BatchJobCreateParameters parameters = new BatchJobCreateParameters(jobId, poolInfo); batchClient.createJob(parameters); - List tasksToAdd = new ArrayList(); + List tasksToAdd = new ArrayList<>(); BatchTaskCreateParameters taskToAdd = new BatchTaskCreateParameters(taskId, "sleep 1"); - List resourceFiles = new ArrayList(); + List resourceFiles = new ArrayList<>(); ResourceFile resourceFile; // If this test fails try increasing the size of the Task in case maximum size increase @@ -501,12 +497,11 @@ public void failIfPoisonTaskTooLargeSync() throws Exception { } } + // This test will temporarily only run in Live/Record mode. It runs fine in Playback mode too on Mac and Windows machines. + // Linux machines are causing issues. This issue is under investigation. + @DisabledIf(value = "skipInPlayback") @Test - public void failIfPoisonTaskTooLargeAsync() throws Exception { - //This test will temporarily only run in Live/Record mode. It runs fine in Playback mode too on Mac and Windows machines. - // Linux machines are causing issues. This issue is under investigation. - Assumptions.assumeFalse(getTestMode() == TestMode.PLAYBACK, "This Test only runs in Live/Record mode"); - + public void failIfPoisonTaskTooLargeAsync() { String jobId = getStringIdWithUserNamePrefix("-failIfPoisonTaskTooLarge-async"); String taskId = "mytask-async"; @@ -515,9 +510,9 @@ public void failIfPoisonTaskTooLargeAsync() throws Exception { BatchJobCreateParameters parameters = new BatchJobCreateParameters(jobId, poolInfo); batchAsyncClient.createJob(parameters).block(); - List tasksToAdd = new ArrayList(); + List tasksToAdd = new ArrayList<>(); BatchTaskCreateParameters taskToAdd = new BatchTaskCreateParameters(taskId, "sleep 1"); - List resourceFiles = new ArrayList(); + List resourceFiles = new ArrayList<>(); ResourceFile resourceFile; // If this test fails try increasing the size of the Task in case maximum size increase @@ -560,13 +555,12 @@ public void failIfPoisonTaskTooLargeAsync() throws Exception { } } + // This test does not run in Playback mode. It only runs in Record/Live mode. + // This test uses multi threading. Playing back the test doesn't match its recorded sequence always. + // Hence Playback of this test is disabled. + @DisabledIf(value = "skipInPlayback") @Test public void succeedWithRetrySync() { - //This test does not run in Playback mode. It only runs in Record/Live mode. - // This test uses multi threading. Playing back the test doesn't match its recorded sequence always. - // Hence Playback of this test is disabled. - Assumptions.assumeFalse(getTestMode() == TestMode.PLAYBACK, "This Test only runs in Live/Record mode"); - String jobId = getStringIdWithUserNamePrefix("-succeedWithRetry-sync"); String taskId = "mytask-sync"; @@ -575,9 +569,9 @@ public void succeedWithRetrySync() { BatchJobCreateParameters jobToCreate = new BatchJobCreateParameters(jobId, poolInfo); batchClient.createJob(jobToCreate); - List tasksToAdd = new ArrayList(); + List tasksToAdd = new ArrayList<>(); BatchTaskCreateParameters taskToAdd; - List resourceFiles = new ArrayList(); + List resourceFiles = new ArrayList<>(); ResourceFile resourceFile; BatchTaskBulkCreateOptions option = new BatchTaskBulkCreateOptions(); @@ -612,13 +606,12 @@ public void succeedWithRetrySync() { } } + // This test does not run in Playback mode. It only runs in Record/Live mode. + // This test uses multi threading. Playing back the test doesn't match its recorded sequence always. + // Hence Playback of this test is disabled. + @DisabledIf(value = "skipInPlayback") @Test public void succeedWithRetryAsync() { - //This test does not run in Playback mode. It only runs in Record/Live mode. - // This test uses multi threading. Playing back the test doesn't match its recorded sequence always. - // Hence Playback of this test is disabled. - Assumptions.assumeFalse(getTestMode() == TestMode.PLAYBACK, "This Test only runs in Live/Record mode"); - String jobId = getStringIdWithUserNamePrefix("-succeedWithRetry-async"); String taskId = "mytask-async"; @@ -627,9 +620,9 @@ public void succeedWithRetryAsync() { BatchJobCreateParameters jobToCreate = new BatchJobCreateParameters(jobId, poolInfo); batchAsyncClient.createJob(jobToCreate).block(); - List tasksToAdd = new ArrayList(); + List tasksToAdd = new ArrayList<>(); BatchTaskCreateParameters taskToAdd; - List resourceFiles = new ArrayList(); + List resourceFiles = new ArrayList<>(); ResourceFile resourceFile; BatchTaskBulkCreateOptions option = new BatchTaskBulkCreateOptions(); @@ -879,16 +872,15 @@ public void testCreateTasks() { } @Test - public void testDeserializationOfBatchTaskStatistics() { + public void testDeserializationOfBatchTaskStatistics() throws IOException { // Simulated JSON response with numbers as strings - String jsonResponse = "{" + "\"url\":\"http://example.com/statistics\"," - + "\"startTime\":\"2022-01-01T00:00:00Z\"," + "\"lastUpdateTime\":\"2022-01-01T01:00:00Z\"," - + "\"userCPUTime\":\"PT1H\"," + "\"kernelCPUTime\":\"PT2H\"," + "\"wallClockTime\":\"PT3H\"," - + "\"readIOps\":\"1000\"," + "\"writeIOps\":\"500\"," + "\"readIOGiB\":0.5," + "\"writeIOGiB\":0.25," - + "\"waitTime\":\"PT30M\"" + "}"; + String jsonResponse = "{\"url\":\"http://example.com/statistics\",\"startTime\":\"2022-01-01T00:00:00Z\"," + + "\"lastUpdateTime\":\"2022-01-01T01:00:00Z\",\"userCPUTime\":\"PT1H\",\"kernelCPUTime\":\"PT2H\"," + + "\"wallClockTime\":\"PT3H\",\"readIOps\":\"1000\",\"writeIOps\":\"500\",\"readIOGiB\":0.5," + + "\"writeIOGiB\":0.25,\"waitTime\":\"PT30M\"}"; // Deserialize JSON response using JsonReader from JsonProviders - try (JsonReader jsonReader = JsonProviders.createReader(new StringReader(jsonResponse))) { + try (JsonReader jsonReader = JsonProviders.createReader(jsonResponse)) { BatchTaskStatistics stats = BatchTaskStatistics.fromJson(jsonReader); // Assertions @@ -904,8 +896,20 @@ public void testDeserializationOfBatchTaskStatistics() { Assertions.assertEquals(0.5, stats.getReadIoGiB()); Assertions.assertEquals(0.25, stats.getWriteIoGiB()); Assertions.assertEquals(Duration.parse("PT30M"), stats.getWaitTime()); - } catch (IOException e) { - throw new RuntimeException(e); } } + + private static boolean skipInPlayback() { + final String azureTestMode = Configuration.getGlobalConfiguration().get("AZURE_TEST_MODE"); + + if (azureTestMode != null) { + try { + return TestMode.valueOf(azureTestMode.toUpperCase(Locale.US)) == TestMode.PLAYBACK; + } catch (IllegalArgumentException e) { + return true; // TestMode unknown, default is PLAYBACK. + } + } + + return true; // TestMode unknown, default is PLAYBACK. + } } From 468921fc54435a20df7bc811053d83df75d998e8 Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 2 Apr 2026 17:22:15 -0400 Subject: [PATCH 4/4] Clean up linting --- .../test/java/com/azure/compute/batch/BatchClientTestBase.java | 3 +-- .../src/test/java/com/azure/compute/batch/TaskTests.java | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java b/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java index 43da70abd577..a472bafccfeb 100644 --- a/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java +++ b/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/BatchClientTestBase.java @@ -75,8 +75,7 @@ protected void beforeTest() { .httpClient(getHttpClientOrUsePlayback(getHttpClients().findFirst().orElse(null))) .httpLogOptions(new HttpLogOptions().setLogLevel(HttpLogDetailLevel.BASIC)); if (getTestMode() == TestMode.PLAYBACK) { - batchClientBuilder.httpClient(interceptorManager.getPlaybackClient()) - .credential(new MockTokenCredential()); + batchClientBuilder.httpClient(interceptorManager.getPlaybackClient()).credential(new MockTokenCredential()); addTestRulesOnPlayback(interceptorManager); } else if (getTestMode() == TestMode.RECORD) { diff --git a/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/TaskTests.java b/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/TaskTests.java index 980b0ca7cf9e..ce62ac834e59 100644 --- a/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/TaskTests.java +++ b/sdk/batch/azure-compute-batch/src/test/java/com/azure/compute/batch/TaskTests.java @@ -37,7 +37,6 @@ import com.azure.json.JsonReader; import com.azure.storage.blob.BlobContainerClient; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledIf; import org.junit.jupiter.api.parallel.Execution;