From 4d7b523805c64fea2f6630fe61c804fa3985988b Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Wed, 14 Apr 2021 14:46:52 -0700 Subject: [PATCH 1/4] Update Jackson, Netty, OkHttp, and Reactor Dependencies --- common/perf-test-core/pom.xml | 8 +-- eng/versioning/external_dependencies.txt | 54 +++++++++---------- .../azure-data-appconfiguration/pom.xml | 2 +- .../pom.xml | 8 +-- .../pom.xml | 12 ++--- sdk/batch/microsoft-azure-batch/pom.xml | 2 +- .../azure-communication-common/pom.xml | 2 +- .../azure-communication-identity/pom.xml | 2 +- .../azure-communication-phonenumbers/pom.xml | 2 +- .../azure-communication-sms/pom.xml | 2 +- .../pom.xml | 2 +- sdk/core/azure-core-amqp-experimental/pom.xml | 2 +- sdk/core/azure-core-amqp/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 | 38 ++++++------- sdk/core/azure-core-http-okhttp/pom.xml | 6 +-- sdk/core/azure-core-management/pom.xml | 2 +- .../azure-core-serializer-avro-apache/pom.xml | 8 +-- .../pom.xml | 6 +-- .../azure-core-serializer-json-gson/pom.xml | 2 +- .../pom.xml | 2 +- sdk/core/azure-core-test/pom.xml | 4 +- sdk/core/azure-core/pom.xml | 30 +++++------ sdk/cosmos/azure-cosmos-encryption/pom.xml | 2 +- .../azure-cosmos-spark_3-1_2-12/pom.xml | 10 ++-- sdk/cosmos/azure-cosmos/pom.xml | 22 ++++---- sdk/cosmos/azure-spring-data-cosmos/pom.xml | 14 ++--- .../azure-digitaltwins-core/pom.xml | 4 +- sdk/e2e/pom.xml | 2 +- .../azure-messaging-eventgrid/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-messaging-eventhubs/pom.xml | 2 +- sdk/identity/azure-identity/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-security-keyvault-jca/pom.xml | 4 +- .../azure-security-keyvault-keys/pom.xml | 2 +- .../azure-security-keyvault-secrets/pom.xml | 2 +- .../pom.xml | 2 +- .../microsoft-azure-keyvault-webkey/pom.xml | 6 +-- .../microsoft-azure-media/pom.xml | 6 +-- .../azure-mixedreality-authentication/pom.xml | 2 +- .../azure-iot-modelsrepository/pom.xml | 2 +- .../pom.xml | 2 +- .../azure-resourcemanager-resources/pom.xml | 2 +- .../azure-data-schemaregistry-avro/pom.xml | 6 +-- .../azure-data-schemaregistry/pom.xml | 4 +- sdk/search/azure-search-documents/pom.xml | 2 +- .../azure-messaging-servicebus/pom.xml | 2 +- .../pom.xml | 8 +-- .../pom.xml | 4 +- .../pom.xml | 28 +++++----- sdk/spring/azure-spring-boot/pom.xml | 4 +- .../azure-spring-cloud-autoconfigure/pom.xml | 4 +- .../azure-spring-cloud-telemetry/pom.xml | 4 +- sdk/spring/azure-spring-data-gremlin/pom.xml | 4 +- .../azure-spring-integration-test/pom.xml | 4 +- sdk/storage/azure-storage-blob-batch/pom.xml | 2 +- .../azure-storage-blob-changefeed/pom.xml | 2 +- sdk/storage/azure-storage-blob-nio/pom.xml | 2 +- sdk/storage/azure-storage-blob/pom.xml | 2 +- sdk/storage/azure-storage-common/pom.xml | 2 +- .../azure-storage-file-datalake/pom.xml | 2 +- sdk/storage/azure-storage-file-share/pom.xml | 2 +- .../azure-storage-internal-avro/pom.xml | 2 +- sdk/storage/azure-storage-queue/pom.xml | 2 +- sdk/tables/azure-data-tables/pom.xml | 2 +- 68 files changed, 196 insertions(+), 196 deletions(-) diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml index aa16ff913d88..71520b19f0dd 100644 --- a/common/perf-test-core/pom.xml +++ b/common/perf-test-core/pom.xml @@ -51,12 +51,12 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] com.beust:jcommander:[1.78] - io.projectreactor:reactor-core:[3.4.3] + io.projectreactor:reactor-core:[3.4.5] @@ -120,7 +120,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 com.beust @@ -130,7 +130,7 @@ io.projectreactor reactor-core - 3.4.3 + 3.4.5 diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index b0c73eb9ed3e..07751fdabfae 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -7,14 +7,14 @@ # Format; # groupId:artifactId;dependency-version -com.fasterxml.jackson.core:jackson-annotations;2.12.2 -com.fasterxml.jackson.core:jackson-core;2.12.2 -com.fasterxml.jackson.core:jackson-databind;2.12.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.2 -com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.2 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.2 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.2 -com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.2 +com.fasterxml.jackson.core:jackson-annotations;2.12.3 +com.fasterxml.jackson.core:jackson-core;2.12.3 +com.fasterxml.jackson.core:jackson-databind;2.12.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.3 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.3 +com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.3 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.3 +com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.3 com.github.spotbugs:spotbugs;4.2.0 com.github.spotbugs:spotbugs-annotations;4.2.0 com.github.spotbugs:spotbugs-maven-plugin;4.2.0 @@ -37,7 +37,7 @@ com.microsoft.rest.v2:client-runtime;2.1.1 com.microsoft.sqlserver:mssql-jdbc;8.4.1.jre8 com.microsoft.azure:spring-data-cosmosdb;2.3.0 com.microsoft.spring.data.gremlin:spring-data-gremlin;2.3.0 -com.squareup.okhttp3:okhttp;4.8.1 +com.squareup.okhttp3:okhttp;4.9.1 com.zaxxer:HikariCP;3.4.5 commons-codec:commons-codec;1.15 commons-net:commons-net;3.6 @@ -46,20 +46,20 @@ io.github.bonigarcia:webdrivermanager;4.3.1 io.micrometer:micrometer-core;1.6.4 io.micrometer:micrometer-registry-azure-monitor;1.6.4 io.micrometer:micrometer-registry-graphite;1.6.4 -io.netty:netty-buffer;4.1.60.Final -io.netty:netty-common;4.1.60.Final -io.netty:netty-codec-http;4.1.60.Final -io.netty:netty-codec-http2;4.1.60.Final -io.netty:netty-transport;4.1.60.Final -io.netty:netty-handler;4.1.60.Final -io.netty:netty-handler-proxy;4.1.60.Final -io.netty:netty-tcnative;2.0.36.Final -io.netty:netty-tcnative-boringssl-static;2.0.36.Final -io.netty:netty-transport-native-epoll;4.1.60.Final -io.netty:netty-transport-native-unix-common;4.1.60.Final -io.netty:netty-transport-native-kqueue;4.1.60.Final -io.projectreactor.netty:reactor-netty;1.0.4 -io.projectreactor:reactor-core;3.4.3 +io.netty:netty-buffer;4.1.63.Final +io.netty:netty-common;4.1.63.Final +io.netty:netty-codec-http;4.1.63.Final +io.netty:netty-codec-http2;4.1.63.Final +io.netty:netty-transport;4.1.63.Final +io.netty:netty-handler;4.1.63.Final +io.netty:netty-handler-proxy;4.1.63.Final +io.netty:netty-tcnative;2.0.38.Final +io.netty:netty-tcnative-boringssl-static;2.0.38.Final +io.netty:netty-transport-native-epoll;4.1.63.Final +io.netty:netty-transport-native-unix-common;4.1.63.Final +io.netty:netty-transport-native-kqueue;4.1.63.Final +io.projectreactor.netty:reactor-netty;1.0.6 +io.projectreactor:reactor-core;3.4.5 io.reactivex:rxjava;1.3.8 javax.annotation:javax.annotation-api;1.3.2 javax.json:javax.json-api;1.1.4 @@ -69,8 +69,8 @@ javax.websocket:javax.websocket-api;1.1 mysql:mysql-connector-java;8.0.23 net.minidev:json-smart;2.3 org.apache.ant:ant;1.9.4 -org.apache.avro:avro;1.10.1 -org.apache.avro:avro-maven-plugin;1.10.1 +org.apache.avro:avro;1.10.2 +org.apache.avro:avro-maven-plugin;1.10.2 org.apache.commons:commons-compress;1.20 org.apache.commons:commons-lang3;3.11 org.apache.httpcomponents:httpclient;4.5.13 @@ -175,7 +175,7 @@ io.opentelemetry:opentelemetry-api;1.0.0 io.opentelemetry:opentelemetry-sdk;1.0.0 io.opentelemetry:opentelemetry-exporter-logging;1.0.0 io.opentelemetry:opentelemetry-exporter-jaeger;1.0.0 -io.projectreactor:reactor-test;3.4.3 +io.projectreactor:reactor-test;3.4.5 junit:junit;4.13.2 commons-cli:commons-cli;1.3 org.apache.maven:maven-compat;3.6.2 @@ -281,7 +281,7 @@ org.revapi:revapi-maven-plugin;0.11.2 test_jar_com.microsoft.azure:azure-mgmt-resources;1.3.1-SNAPSHOT # everything under sdk\cosmos -cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.12.2 +cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.12.3 cosmos_com.google.guava:guava;25.0-jre cosmos_com.microsoft.data.encryption:cryptography;0.1.0.jre8-preview cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;0.1.0.jre8-preview diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index cbc53c9ad017..1802f1111e0a 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -84,7 +84,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml index 96e8509254b9..e308fe1a1524 100644 --- a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml @@ -46,12 +46,12 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 org.springframework @@ -160,8 +160,8 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.12.2] - com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.core:jackson-annotations:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.11] org.apache.httpcomponents:httpclient:[4.5.13] diff --git a/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml b/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml index ad44c251ed4d..256ad2f75087 100644 --- a/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml @@ -29,17 +29,17 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 io.projectreactor.netty reactor-netty - 1.0.4 + 1.0.6 junit @@ -82,9 +82,9 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.12.2] - com.fasterxml.jackson.core:jackson-databind:[2.12.2] - io.projectreactor.netty:reactor-netty:[1.0.4] + com.fasterxml.jackson.core:jackson-annotations:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] + io.projectreactor.netty:reactor-netty:[1.0.6] org.springframework.boot:spring-boot-starter:[2.4.3] org.springframework:spring-context:[5.3.4] diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml index 5574eda80dcf..7612b7ae31f6 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.12.2 + 2.12.3 test diff --git a/sdk/communication/azure-communication-common/pom.xml b/sdk/communication/azure-communication-common/pom.xml index a9f551f9e755..1deaefc3e216 100644 --- a/sdk/communication/azure-communication-common/pom.xml +++ b/sdk/communication/azure-communication-common/pom.xml @@ -81,7 +81,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/communication/azure-communication-identity/pom.xml b/sdk/communication/azure-communication-identity/pom.xml index 06c97db003b8..39da196d58c7 100644 --- a/sdk/communication/azure-communication-identity/pom.xml +++ b/sdk/communication/azure-communication-identity/pom.xml @@ -86,7 +86,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml index 36bc975a8f91..6b8bae7f8d8e 100644 --- a/sdk/communication/azure-communication-phonenumbers/pom.xml +++ b/sdk/communication/azure-communication-phonenumbers/pom.xml @@ -86,7 +86,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/communication/azure-communication-sms/pom.xml b/sdk/communication/azure-communication-sms/pom.xml index db9b2e487835..81921c33f982 100644 --- a/sdk/communication/azure-communication-sms/pom.xml +++ b/sdk/communication/azure-communication-sms/pom.xml @@ -90,7 +90,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/containerregistry/azure-containers-containerregistry/pom.xml b/sdk/containerregistry/azure-containers-containerregistry/pom.xml index 0b73a46c7b73..7dc00f0168ca 100644 --- a/sdk/containerregistry/azure-containers-containerregistry/pom.xml +++ b/sdk/containerregistry/azure-containers-containerregistry/pom.xml @@ -73,7 +73,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/core/azure-core-amqp-experimental/pom.xml b/sdk/core/azure-core-amqp-experimental/pom.xml index dd80afcdba3c..507d7388d5a4 100644 --- a/sdk/core/azure-core-amqp-experimental/pom.xml +++ b/sdk/core/azure-core-amqp-experimental/pom.xml @@ -82,7 +82,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 1a6318c51ae1..e2d392f38f55 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -74,7 +74,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index 6de377ae56bb..8210c4ba0ba0 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -82,7 +82,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index 788dc9cac392..cbdf789c42fe 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.4.3 + 3.4.5 test diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 0bec43d29361..f75811d0d799 100644 --- a/sdk/core/azure-core-http-netty/pom.xml +++ b/sdk/core/azure-core-http-netty/pom.xml @@ -66,51 +66,51 @@ io.netty netty-handler - 4.1.60.Final + 4.1.63.Final io.netty netty-handler-proxy - 4.1.60.Final + 4.1.63.Final io.netty netty-buffer - 4.1.60.Final + 4.1.63.Final io.netty netty-codec-http - 4.1.60.Final + 4.1.63.Final io.netty netty-codec-http2 - 4.1.60.Final + 4.1.63.Final io.netty netty-transport-native-unix-common - 4.1.60.Final + 4.1.63.Final io.netty netty-transport-native-epoll - 4.1.60.Final + 4.1.63.Final linux-x86_64 io.netty netty-transport-native-kqueue - 4.1.60.Final + 4.1.63.Final osx-x86_64 io.projectreactor.netty reactor-netty - 1.0.4 + 1.0.6 @@ -137,7 +137,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -184,15 +184,15 @@ - io.netty:netty-buffer:[4.1.60.Final] - io.netty:netty-codec-http:[4.1.60.Final] - io.netty:netty-codec-http2:[4.1.60.Final] - io.netty:netty-handler:[4.1.60.Final] - io.netty:netty-handler-proxy:[4.1.60.Final] - io.netty:netty-transport-native-unix-common:[4.1.60.Final] - io.netty:netty-transport-native-epoll:[4.1.60.Final] - io.projectreactor.netty:reactor-netty:[1.0.4] - io.netty:netty-transport-native-kqueue:[4.1.60.Final] + io.netty:netty-buffer:[4.1.63.Final] + io.netty:netty-codec-http:[4.1.63.Final] + io.netty:netty-codec-http2:[4.1.63.Final] + io.netty:netty-handler:[4.1.63.Final] + io.netty:netty-handler-proxy:[4.1.63.Final] + io.netty:netty-transport-native-unix-common:[4.1.63.Final] + io.netty:netty-transport-native-epoll:[4.1.63.Final] + io.projectreactor.netty:reactor-netty:[1.0.6] + io.netty:netty-transport-native-kqueue:[4.1.63.Final] diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 20ee2ad5dca2..a36001c7697a 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -66,7 +66,7 @@ com.squareup.okhttp3 okhttp - 4.8.1 + 4.9.1 @@ -93,7 +93,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -140,7 +140,7 @@ - com.squareup.okhttp3:okhttp:[4.8.1] + com.squareup.okhttp3:okhttp:[4.9.1] diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index 83162e690476..231e3e44fbcf 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -77,7 +77,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index c564733fe657..d323cd1b2044 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -69,13 +69,13 @@ org.apache.avro avro - 1.10.1 + 1.10.2 io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -108,7 +108,7 @@ - org.apache.avro:avro:[1.10.1] + org.apache.avro:avro:[1.10.2] @@ -118,7 +118,7 @@ org.apache.avro avro-maven-plugin - 1.10.1 + 1.10.2 generate-test-sources diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index 3bd0ad950044..611b98695558 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -69,13 +69,13 @@ com.fasterxml.jackson.dataformat jackson-dataformat-avro - 2.12.2 + 2.12.3 io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -108,7 +108,7 @@ - com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.12.2] + com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.12.3] diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index daf27ace218e..55c6133e16e3 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -94,7 +94,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index feea268c9796..4a503d374271 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -88,7 +88,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index d961e24976b5..53229ca33163 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -43,7 +43,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 @@ -107,7 +107,7 @@ - io.projectreactor:reactor-test:[3.4.3] + io.projectreactor:reactor-test:[3.4.5] org.junit.jupiter:junit-jupiter-api:[5.7.1] diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 7d0e11faeb9a..06a79a5b4275 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -60,27 +60,27 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-core - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.12.2 + 2.12.3 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.12.2 + 2.12.3 org.slf4j @@ -101,18 +101,18 @@ io.projectreactor reactor-core - 3.4.3 + 3.4.5 io.projectreactor reactor-test - 3.4.3 + 3.4.5 test io.netty netty-tcnative-boringssl-static - 2.0.36.Final + 2.0.38.Final org.junit.jupiter @@ -190,13 +190,13 @@ - io.netty:netty-tcnative-boringssl-static:[2.0.36.Final] - io.projectreactor:reactor-core:[3.4.3] - com.fasterxml.jackson.core:jackson-annotations:[2.12.2] - com.fasterxml.jackson.core:jackson-core:[2.12.2] - com.fasterxml.jackson.core:jackson-databind:[2.12.2] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.12.2] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.2] + io.netty:netty-tcnative-boringssl-static:[2.0.38.Final] + io.projectreactor:reactor-core:[3.4.5] + com.fasterxml.jackson.core:jackson-annotations:[2.12.3] + com.fasterxml.jackson.core:jackson-core:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.12.3] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.3] org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index 559eb067a6ad..e81ec87d7227 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -159,7 +159,7 @@ Licensed under the MIT License. io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml index 1f2641d7c350..c7fc29d53ace 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml @@ -90,7 +90,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -227,12 +227,12 @@ javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.11] org.slf4j:slf4j-api:[1.7.30] - org.apache.spark:spark-sql_2.12:[3.1.1] + org.apache.spark:spark-sql:[3.1.1] commons-io:commons-io:[2.4] org.scala-lang:scala-library:[2.12.10] - org.scala-lang.modules:scala-java8-compat_2.12:[0.8.0] - io.projectreactor:reactor-scala-extensions_2.12:[0.8.0] - org.scalatest:scalatest_2.12:[3.2.2] + org.scala-lang.modules:scala-java8-compat:[0.8.0] + io.projectreactor:reactor-scala-extensions:[0.8.0] + org.scalatest:scalatest:[3.2.2] net.alchim31.maven:scala-maven-plugin:[4.4.0] org.scalastyle:scalastyle-maven-plugin:[1.0.0] diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index 08c1ea7eae61..65532878db72 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -89,29 +89,29 @@ Licensed under the MIT License. com.fasterxml.jackson.module jackson-module-afterburner - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-annotations - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-core - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.12.2 + 2.12.3 @@ -196,7 +196,7 @@ Licensed under the MIT License. io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -268,11 +268,11 @@ Licensed under the MIT License. - com.fasterxml.jackson.core:jackson-annotations:[2.12.2] - com.fasterxml.jackson.core:jackson-core:[2.12.2] - com.fasterxml.jackson.core:jackson-databind:[2.12.2] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.2] - com.fasterxml.jackson.module:jackson-module-afterburner:[2.12.2] + com.fasterxml.jackson.core:jackson-annotations:[2.12.3] + com.fasterxml.jackson.core:jackson-core:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.3] + com.fasterxml.jackson.module:jackson-module-afterburner:[2.12.3] io.dropwizard.metrics:metrics-core:[4.1.0] io.micrometer:micrometer-core:[1.6.4] org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml index 5b873266f03b..c02c6e39ab9e 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos/pom.xml @@ -80,17 +80,17 @@ com.fasterxml.jackson.module jackson-module-parameter-names - 2.12.2 + 2.12.3 com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.12.2 + 2.12.3 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.12.2 + 2.12.3 org.javatuples @@ -142,7 +142,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -189,9 +189,9 @@ org.springframework:spring-context:[5.3.4] org.springframework.data:spring-data-commons:[2.4.5] org.javatuples:javatuples:[1.2] - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.12.2] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.2] - com.fasterxml.jackson.module:jackson-module-parameter-names:[2.12.2] + com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.12.3] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.3] + com.fasterxml.jackson.module:jackson-module-parameter-names:[2.12.3] javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.11] org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml index 2cbec93586e0..9837d2c72be2 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml +++ b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml @@ -51,7 +51,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.2 + 2.12.3 @@ -123,7 +123,7 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.12.2] + com.fasterxml.jackson.core:jackson-annotations:[2.12.3] diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index 2ab21248bbc6..002de8363e1b 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -76,7 +76,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 3b9d3135bbb3..3c85764a7098 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -116,7 +116,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml index f70a178ea632..598a774f6e47 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml @@ -76,7 +76,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index 5b7c68f58950..f302febf8401 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -80,7 +80,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index e39364db408b..eee9439aa147 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -87,7 +87,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml index fb26e7505972..bf1cbf7237dc 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml @@ -71,7 +71,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index 905eea50a2f6..1f9ac205c283 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -77,7 +77,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 3eed18576ef7..2d4132502e84 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -109,7 +109,7 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] org.conscrypt:conscrypt-openjdk-uber:[2.2.1] org.apache.httpcomponents:httpclient:[4.5.13] org.slf4j:slf4j-nop:[1.7.30] @@ -138,7 +138,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 true diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index 281e0725cba1..834489cb6d30 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -87,7 +87,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index 203741cb7950..7b90cc2a876f 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -91,7 +91,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml index 75bad6675363..3d7c64095cdd 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml @@ -59,7 +59,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 diff --git a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml index 402059dff675..71a483ecaf0c 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml @@ -45,17 +45,17 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-core - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-annotations - 2.12.2 + 2.12.3 diff --git a/sdk/mediaservices/microsoft-azure-media/pom.xml b/sdk/mediaservices/microsoft-azure-media/pom.xml index 5da3864c5a59..2057cc13f4d5 100644 --- a/sdk/mediaservices/microsoft-azure-media/pom.xml +++ b/sdk/mediaservices/microsoft-azure-media/pom.xml @@ -108,17 +108,17 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-annotations - 2.12.2 + 2.12.3 com.fasterxml.jackson.core jackson-core - 2.12.2 + 2.12.3 io.jsonwebtoken diff --git a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml index 257d30cc3868..c6b9836aedf0 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml +++ b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml @@ -82,7 +82,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml index 05b22f9b5b46..31436e4a5f9f 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml +++ b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml @@ -118,7 +118,7 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.12.2] + com.fasterxml.jackson.core:jackson-annotations:[2.12.3] diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml index b4e7515932f4..221c63c9a423 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml @@ -79,7 +79,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml index 73e218852a67..0a30ba688dfb 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml @@ -86,7 +86,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml index bb3b9477ad7c..4410d4462add 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml @@ -51,7 +51,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -96,7 +96,7 @@ - org.apache.avro:avro:[1.10.1] + org.apache.avro:avro:[1.10.2] @@ -105,7 +105,7 @@ org.apache.avro avro-maven-plugin - 1.10.1 + 1.10.2 generate-test-sources diff --git a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml index 1d63a9f79cc9..44b6628fc0d2 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml @@ -54,7 +54,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test @@ -84,7 +84,7 @@ org.apache.avro avro - 1.10.1 + 1.10.2 test diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml index 55c06fbf400c..df5e6eb82fc9 100644 --- a/sdk/search/azure-search-documents/pom.xml +++ b/sdk/search/azure-search-documents/pom.xml @@ -92,7 +92,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml index 42f074f8f441..acf0697cdcc8 100644 --- a/sdk/servicebus/azure-messaging-servicebus/pom.xml +++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml @@ -95,7 +95,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml index 4f30dcfce590..7451b2ab9579 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml @@ -73,12 +73,12 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 io.projectreactor.netty reactor-netty - 1.0.4 + 1.0.6 @@ -92,10 +92,10 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] com.microsoft.azure:msal4j:[1.9.1] com.nimbusds:nimbus-jose-jwt:[8.20.2] - io.projectreactor.netty:reactor-netty:[1.0.4] + io.projectreactor.netty:reactor-netty:[1.0.6] org.springframework.boot:spring-boot-starter-validation:[2.4.3] org.springframework.boot:spring-boot-starter-webflux:[2.4.3] org.springframework.boot:spring-boot-starter:[2.4.3] diff --git a/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml b/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml index 65af5b29232e..5074b8921697 100644 --- a/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml @@ -42,7 +42,7 @@ com.fasterxml.jackson.core jackson-core - 2.12.2 + 2.12.3 @@ -56,7 +56,7 @@ - com.fasterxml.jackson.core:jackson-core:[2.12.2] + com.fasterxml.jackson.core:jackson-core:[2.12.3] com.microsoft.spring.data.gremlin:spring-data-gremlin:[2.3.0] org.springframework.boot:spring-boot-starter:[2.4.3] org.springframework.boot:spring-boot-starter-validation:[2.4.3] diff --git a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml index 23624e7657ed..c6f79191b9f0 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml @@ -50,37 +50,37 @@ io.netty netty-buffer - 4.1.60.Final + 4.1.63.Final io.netty netty-common - 4.1.60.Final + 4.1.63.Final io.netty netty-handler - 4.1.60.Final + 4.1.63.Final io.netty netty-transport - 4.1.60.Final + 4.1.63.Final io.netty netty-transport-native-epoll - 4.1.60.Final + 4.1.63.Final io.netty netty-transport-native-kqueue - 4.1.60.Final + 4.1.63.Final io.netty netty-codec-http - 4.1.60.Final + 4.1.63.Final @@ -96,13 +96,13 @@ com.microsoft.azure:azure-servicebus-jms:[0.0.7] org.apache.qpid:qpid-jms-client:[0.53.0] - io.netty:netty-buffer:[4.1.60.Final] - io.netty:netty-common:[4.1.60.Final] - io.netty:netty-handler:[4.1.60.Final] - io.netty:netty-transport:[4.1.60.Final] - io.netty:netty-transport-native-epoll:[4.1.60.Final] - io.netty:netty-transport-native-kqueue:[4.1.60.Final] - io.netty:netty-codec-http:[4.1.60.Final] + io.netty:netty-buffer:[4.1.63.Final] + io.netty:netty-common:[4.1.63.Final] + io.netty:netty-handler:[4.1.63.Final] + io.netty:netty-transport:[4.1.63.Final] + io.netty:netty-transport-native-epoll:[4.1.63.Final] + io.netty:netty-transport-native-kqueue:[4.1.63.Final] + io.netty:netty-codec-http:[4.1.63.Final] org.springframework:spring-jms:[5.3.4] org.springframework.boot:spring-boot-starter-validation:[2.4.3] diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml index eb862626b6f6..d369a5035326 100644 --- a/sdk/spring/azure-spring-boot/pom.xml +++ b/sdk/spring/azure-spring-boot/pom.xml @@ -207,7 +207,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 com.github.spotbugs:spotbugs-annotations:[4.2.0] - com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] net.minidev:json-smart:[2.3] com.microsoft.azure:msal4j:[1.9.1] com.microsoft.spring.data.gremlin:spring-data-gremlin:[2.3.0] diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml index 34ef8926597d..2ce5fb78b09a 100644 --- a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml +++ b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml @@ -144,7 +144,7 @@ com.fasterxml.jackson.core jackson-core - 2.12.2 + 2.12.3 @@ -209,7 +209,7 @@ - com.fasterxml.jackson.core:jackson-core:[2.12.2] + com.fasterxml.jackson.core:jackson-core:[2.12.3] com.microsoft.sqlserver:mssql-jdbc:[8.4.1.jre8] mysql:mysql-connector-java:[8.0.23] org.hibernate.validator:hibernate-validator:[6.1.7.Final] diff --git a/sdk/spring/azure-spring-cloud-telemetry/pom.xml b/sdk/spring/azure-spring-cloud-telemetry/pom.xml index 2903c1050d13..3f654460d960 100644 --- a/sdk/spring/azure-spring-cloud-telemetry/pom.xml +++ b/sdk/spring/azure-spring-cloud-telemetry/pom.xml @@ -52,7 +52,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 junit @@ -78,7 +78,7 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] commons-io:commons-io:[2.5] org.springframework.boot:spring-boot-configuration-processor:[2.4.3] org.springframework.boot:spring-boot-starter-aop:[2.4.3] diff --git a/sdk/spring/azure-spring-data-gremlin/pom.xml b/sdk/spring/azure-spring-data-gremlin/pom.xml index 326c6e6868f9..97be3a130b74 100644 --- a/sdk/spring/azure-spring-data-gremlin/pom.xml +++ b/sdk/spring/azure-spring-data-gremlin/pom.xml @@ -108,7 +108,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 + com.fasterxml.jackson.core:jackson-databind:[2.12.3] javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.11] org.apache.tinkerpop:gremlin-driver:[3.2.4] diff --git a/sdk/spring/azure-spring-integration-test/pom.xml b/sdk/spring/azure-spring-integration-test/pom.xml index 032911631a0e..ad81def5e275 100644 --- a/sdk/spring/azure-spring-integration-test/pom.xml +++ b/sdk/spring/azure-spring-integration-test/pom.xml @@ -51,7 +51,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.2 + 2.12.3 org.springframework.boot @@ -75,7 +75,7 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.3] junit:junit:[4.13.2] org.hibernate.validator:hibernate-validator:[6.1.7.Final] org.mockito:mockito-core:[3.6.28] diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index 6ac0a8902ba1..fa55a3ed7202 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -93,7 +93,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml index d54e42f57a99..1af8379726fe 100644 --- a/sdk/storage/azure-storage-blob-changefeed/pom.xml +++ b/sdk/storage/azure-storage-blob-changefeed/pom.xml @@ -93,7 +93,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml index f44bb3e6d814..7183b7ff9a00 100644 --- a/sdk/storage/azure-storage-blob-nio/pom.xml +++ b/sdk/storage/azure-storage-blob-nio/pom.xml @@ -76,7 +76,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index 9e9e65072d49..c29ba00aefb9 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -97,7 +97,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index 98d926153365..f3f46275a318 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -86,7 +86,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index 8c7e10bdffe6..ef03b5522435 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -93,7 +93,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml index 062a59ed4610..a1e3dadb5988 100644 --- a/sdk/storage/azure-storage-file-share/pom.xml +++ b/sdk/storage/azure-storage-file-share/pom.xml @@ -68,7 +68,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/storage/azure-storage-internal-avro/pom.xml b/sdk/storage/azure-storage-internal-avro/pom.xml index 699aae5b89f3..85e3f9341359 100644 --- a/sdk/storage/azure-storage-internal-avro/pom.xml +++ b/sdk/storage/azure-storage-internal-avro/pom.xml @@ -56,7 +56,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index 291352232fbf..2d50f37a5200 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -64,7 +64,7 @@ io.projectreactor reactor-test - 3.4.3 + 3.4.5 test diff --git a/sdk/tables/azure-data-tables/pom.xml b/sdk/tables/azure-data-tables/pom.xml index 47381dc43193..1a1a60581fa7 100644 --- a/sdk/tables/azure-data-tables/pom.xml +++ b/sdk/tables/azure-data-tables/pom.xml @@ -68,7 +68,7 @@ Licensed under the MIT License. io.projectreactor reactor-test - 3.4.3 + 3.4.5 test From e9df73c36c94aa425a6d5f341e41900d41900fde Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Wed, 14 Apr 2021 15:07:33 -0700 Subject: [PATCH 2/4] Fix failing enforcer validation --- sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml index c7fc29d53ace..2f72afe0cef6 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml @@ -227,12 +227,12 @@ javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.11] org.slf4j:slf4j-api:[1.7.30] - org.apache.spark:spark-sql:[3.1.1] + org.apache.spark:spark-sql_2.12:[3.1.1] commons-io:commons-io:[2.4] org.scala-lang:scala-library:[2.12.10] - org.scala-lang.modules:scala-java8-compat:[0.8.0] - io.projectreactor:reactor-scala-extensions:[0.8.0] - org.scalatest:scalatest:[3.2.2] + org.scala-lang.modules:scala-java8-compat_2.12:[0.8.0] + io.projectreactor:reactor-scala-extensions_2.12:[0.8.0] + org.scalatest:scalatest_2.12:[3.2.2] net.alchim31.maven:scala-maven-plugin:[4.4.0] org.scalastyle:scalastyle-maven-plugin:[1.0.0] From dcd2f23053931d7fce207d021feb623fcfe0c3ae Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:20:58 -0700 Subject: [PATCH 3/4] Reverted Jackson and OkHttp version changes --- common/perf-test-core/pom.xml | 4 ++-- eng/versioning/external_dependencies.txt | 20 +++++++++---------- .../pom.xml | 8 ++++---- .../pom.xml | 8 ++++---- sdk/batch/microsoft-azure-batch/pom.xml | 2 +- sdk/core/azure-core-http-okhttp/pom.xml | 4 ++-- .../pom.xml | 4 ++-- sdk/core/azure-core/pom.xml | 20 +++++++++---------- sdk/cosmos/azure-cosmos/pom.xml | 20 +++++++++---------- sdk/cosmos/azure-spring-data-cosmos/pom.xml | 12 +++++------ .../azure-digitaltwins-core/pom.xml | 4 ++-- .../azure-security-keyvault-jca/pom.xml | 4 ++-- .../pom.xml | 2 +- .../microsoft-azure-keyvault-webkey/pom.xml | 6 +++--- .../microsoft-azure-media/pom.xml | 6 +++--- .../azure-iot-modelsrepository/pom.xml | 2 +- .../pom.xml | 4 ++-- .../pom.xml | 4 ++-- sdk/spring/azure-spring-boot/pom.xml | 4 ++-- .../azure-spring-cloud-autoconfigure/pom.xml | 4 ++-- .../azure-spring-cloud-telemetry/pom.xml | 4 ++-- sdk/spring/azure-spring-data-gremlin/pom.xml | 4 ++-- .../azure-spring-integration-test/pom.xml | 4 ++-- 23 files changed, 77 insertions(+), 77 deletions(-) diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml index 71520b19f0dd..ec6abf6b3f01 100644 --- a/common/perf-test-core/pom.xml +++ b/common/perf-test-core/pom.xml @@ -51,7 +51,7 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] com.beust:jcommander:[1.78] @@ -120,7 +120,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 com.beust diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 07751fdabfae..d52eab5ba0bd 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -7,14 +7,14 @@ # Format; # groupId:artifactId;dependency-version -com.fasterxml.jackson.core:jackson-annotations;2.12.3 -com.fasterxml.jackson.core:jackson-core;2.12.3 -com.fasterxml.jackson.core:jackson-databind;2.12.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.3 -com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.3 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.3 -com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.3 -com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.3 +com.fasterxml.jackson.core:jackson-annotations;2.12.2 +com.fasterxml.jackson.core:jackson-core;2.12.2 +com.fasterxml.jackson.core:jackson-databind;2.12.2 +com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.2 +com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.2 +com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.2 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.2 +com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.2 com.github.spotbugs:spotbugs;4.2.0 com.github.spotbugs:spotbugs-annotations;4.2.0 com.github.spotbugs:spotbugs-maven-plugin;4.2.0 @@ -37,7 +37,7 @@ com.microsoft.rest.v2:client-runtime;2.1.1 com.microsoft.sqlserver:mssql-jdbc;8.4.1.jre8 com.microsoft.azure:spring-data-cosmosdb;2.3.0 com.microsoft.spring.data.gremlin:spring-data-gremlin;2.3.0 -com.squareup.okhttp3:okhttp;4.9.1 +com.squareup.okhttp3:okhttp;4.8.1 com.zaxxer:HikariCP;3.4.5 commons-codec:commons-codec;1.15 commons-net:commons-net;3.6 @@ -281,7 +281,7 @@ org.revapi:revapi-maven-plugin;0.11.2 test_jar_com.microsoft.azure:azure-mgmt-resources;1.3.1-SNAPSHOT # everything under sdk\cosmos -cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.12.3 +cosmos_com.fasterxml.jackson.module:jackson-module-afterburner;2.12.2 cosmos_com.google.guava:guava;25.0-jre cosmos_com.microsoft.data.encryption:cryptography;0.1.0.jre8-preview cosmos_com.microsoft.data.encryption:azure-key-vault-keystoreprovider;0.1.0.jre8-preview diff --git a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml index e308fe1a1524..96e8509254b9 100644 --- a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml @@ -46,12 +46,12 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 org.springframework @@ -160,8 +160,8 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.12.3] - com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.core:jackson-annotations:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.11] org.apache.httpcomponents:httpclient:[4.5.13] diff --git a/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml b/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml index 256ad2f75087..1a1fbb411290 100644 --- a/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml @@ -29,12 +29,12 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 io.projectreactor.netty @@ -82,8 +82,8 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.12.3] - com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.core:jackson-annotations:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] io.projectreactor.netty:reactor-netty:[1.0.6] org.springframework.boot:spring-boot-starter:[2.4.3] org.springframework:spring-context:[5.3.4] diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml index 7612b7ae31f6..5574eda80dcf 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.12.3 + 2.12.2 test diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index a36001c7697a..c0bf5d5d76b3 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -66,7 +66,7 @@ com.squareup.okhttp3 okhttp - 4.9.1 + 4.8.1 @@ -140,7 +140,7 @@ - com.squareup.okhttp3:okhttp:[4.9.1] + com.squareup.okhttp3:okhttp:[4.8.1] diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index 611b98695558..24ff7bf48a21 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -69,7 +69,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-avro - 2.12.3 + 2.12.2 @@ -108,7 +108,7 @@ - com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.12.3] + com.fasterxml.jackson.dataformat:jackson-dataformat-avro:[2.12.2] diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index 06a79a5b4275..e4d08005f160 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -60,27 +60,27 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-core - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.12.3 + 2.12.2 com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.12.3 + 2.12.2 org.slf4j @@ -192,11 +192,11 @@ io.netty:netty-tcnative-boringssl-static:[2.0.38.Final] io.projectreactor:reactor-core:[3.4.5] - com.fasterxml.jackson.core:jackson-annotations:[2.12.3] - com.fasterxml.jackson.core:jackson-core:[2.12.3] - com.fasterxml.jackson.core:jackson-databind:[2.12.3] - com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.12.3] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.3] + com.fasterxml.jackson.core:jackson-annotations:[2.12.2] + com.fasterxml.jackson.core:jackson-core:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.12.2] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.2] org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index 65532878db72..a1bb84ec9e57 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -89,29 +89,29 @@ Licensed under the MIT License. com.fasterxml.jackson.module jackson-module-afterburner - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-annotations - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-core - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.12.3 + 2.12.2 @@ -268,11 +268,11 @@ Licensed under the MIT License. - com.fasterxml.jackson.core:jackson-annotations:[2.12.3] - com.fasterxml.jackson.core:jackson-core:[2.12.3] - com.fasterxml.jackson.core:jackson-databind:[2.12.3] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.3] - com.fasterxml.jackson.module:jackson-module-afterburner:[2.12.3] + com.fasterxml.jackson.core:jackson-annotations:[2.12.2] + com.fasterxml.jackson.core:jackson-core:[2.12.2] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.2] + com.fasterxml.jackson.module:jackson-module-afterburner:[2.12.2] io.dropwizard.metrics:metrics-core:[4.1.0] io.micrometer:micrometer-core:[1.6.4] org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml index c02c6e39ab9e..98d95eb9660f 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos/pom.xml @@ -80,17 +80,17 @@ com.fasterxml.jackson.module jackson-module-parameter-names - 2.12.3 + 2.12.2 com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.12.3 + 2.12.2 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.12.3 + 2.12.2 org.javatuples @@ -189,9 +189,9 @@ org.springframework:spring-context:[5.3.4] org.springframework.data:spring-data-commons:[2.4.5] org.javatuples:javatuples:[1.2] - com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.12.3] - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.3] - com.fasterxml.jackson.module:jackson-module-parameter-names:[2.12.3] + com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.12.2] + com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.2] + com.fasterxml.jackson.module:jackson-module-parameter-names:[2.12.2] javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.11] org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml index 9837d2c72be2..2cbec93586e0 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml +++ b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml @@ -51,7 +51,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.12.3 + 2.12.2 @@ -123,7 +123,7 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.12.3] + com.fasterxml.jackson.core:jackson-annotations:[2.12.2] diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index ed4a6b38ffd6..a276d85a75a7 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -106,7 +106,7 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] org.conscrypt:conscrypt-openjdk-uber:[2.2.1] org.apache.httpcomponents:httpclient:[4.5.13] org.slf4j:slf4j-nop:[1.7.30] @@ -135,7 +135,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 true diff --git a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml index 3d7c64095cdd..75bad6675363 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml @@ -59,7 +59,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 diff --git a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml index 71a483ecaf0c..402059dff675 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml @@ -45,17 +45,17 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-core - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-annotations - 2.12.3 + 2.12.2 diff --git a/sdk/mediaservices/microsoft-azure-media/pom.xml b/sdk/mediaservices/microsoft-azure-media/pom.xml index 2057cc13f4d5..5da3864c5a59 100644 --- a/sdk/mediaservices/microsoft-azure-media/pom.xml +++ b/sdk/mediaservices/microsoft-azure-media/pom.xml @@ -108,17 +108,17 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-annotations - 2.12.3 + 2.12.2 com.fasterxml.jackson.core jackson-core - 2.12.3 + 2.12.2 io.jsonwebtoken diff --git a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml index 31436e4a5f9f..05b22f9b5b46 100644 --- a/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml +++ b/sdk/modelsrepository/azure-iot-modelsrepository/pom.xml @@ -118,7 +118,7 @@ - com.fasterxml.jackson.core:jackson-annotations:[2.12.3] + com.fasterxml.jackson.core:jackson-annotations:[2.12.2] diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml index 7451b2ab9579..77d2e8970b7c 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml @@ -73,7 +73,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 io.projectreactor.netty @@ -92,7 +92,7 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] com.microsoft.azure:msal4j:[1.9.1] com.nimbusds:nimbus-jose-jwt:[8.20.2] io.projectreactor.netty:reactor-netty:[1.0.6] diff --git a/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml b/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml index 5074b8921697..65af5b29232e 100644 --- a/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml @@ -42,7 +42,7 @@ com.fasterxml.jackson.core jackson-core - 2.12.3 + 2.12.2 @@ -56,7 +56,7 @@ - com.fasterxml.jackson.core:jackson-core:[2.12.3] + com.fasterxml.jackson.core:jackson-core:[2.12.2] com.microsoft.spring.data.gremlin:spring-data-gremlin:[2.3.0] org.springframework.boot:spring-boot-starter:[2.4.3] org.springframework.boot:spring-boot-starter-validation:[2.4.3] diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml index d369a5035326..eb862626b6f6 100644 --- a/sdk/spring/azure-spring-boot/pom.xml +++ b/sdk/spring/azure-spring-boot/pom.xml @@ -207,7 +207,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 com.github.spotbugs:spotbugs-annotations:[4.2.0] - com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] net.minidev:json-smart:[2.3] com.microsoft.azure:msal4j:[1.9.1] com.microsoft.spring.data.gremlin:spring-data-gremlin:[2.3.0] diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml index 2ce5fb78b09a..34ef8926597d 100644 --- a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml +++ b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml @@ -144,7 +144,7 @@ com.fasterxml.jackson.core jackson-core - 2.12.3 + 2.12.2 @@ -209,7 +209,7 @@ - com.fasterxml.jackson.core:jackson-core:[2.12.3] + com.fasterxml.jackson.core:jackson-core:[2.12.2] com.microsoft.sqlserver:mssql-jdbc:[8.4.1.jre8] mysql:mysql-connector-java:[8.0.23] org.hibernate.validator:hibernate-validator:[6.1.7.Final] diff --git a/sdk/spring/azure-spring-cloud-telemetry/pom.xml b/sdk/spring/azure-spring-cloud-telemetry/pom.xml index 3f654460d960..2903c1050d13 100644 --- a/sdk/spring/azure-spring-cloud-telemetry/pom.xml +++ b/sdk/spring/azure-spring-cloud-telemetry/pom.xml @@ -52,7 +52,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 junit @@ -78,7 +78,7 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] commons-io:commons-io:[2.5] org.springframework.boot:spring-boot-configuration-processor:[2.4.3] org.springframework.boot:spring-boot-starter-aop:[2.4.3] diff --git a/sdk/spring/azure-spring-data-gremlin/pom.xml b/sdk/spring/azure-spring-data-gremlin/pom.xml index 97be3a130b74..326c6e6868f9 100644 --- a/sdk/spring/azure-spring-data-gremlin/pom.xml +++ b/sdk/spring/azure-spring-data-gremlin/pom.xml @@ -108,7 +108,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 + com.fasterxml.jackson.core:jackson-databind:[2.12.2] javax.annotation:javax.annotation-api:[1.3.2] org.apache.commons:commons-lang3:[3.11] org.apache.tinkerpop:gremlin-driver:[3.2.4] diff --git a/sdk/spring/azure-spring-integration-test/pom.xml b/sdk/spring/azure-spring-integration-test/pom.xml index ad81def5e275..032911631a0e 100644 --- a/sdk/spring/azure-spring-integration-test/pom.xml +++ b/sdk/spring/azure-spring-integration-test/pom.xml @@ -51,7 +51,7 @@ com.fasterxml.jackson.core jackson-databind - 2.12.3 + 2.12.2 org.springframework.boot @@ -75,7 +75,7 @@ - com.fasterxml.jackson.core:jackson-databind:[2.12.3] + com.fasterxml.jackson.core:jackson-databind:[2.12.2] junit:junit:[4.13.2] org.hibernate.validator:hibernate-validator:[6.1.7.Final] org.mockito:mockito-core:[3.6.28] From 6ab138dd9b5ef81980491ceea602459c72630abd Mon Sep 17 00:00:00 2001 From: Alan Zimmer <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 15 Apr 2021 17:42:54 -0700 Subject: [PATCH 4/4] Fix stackoverflow in Search test --- .../batching/SearchIndexingPublisher.java | 53 ++++++++++++------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/batching/SearchIndexingPublisher.java b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/batching/SearchIndexingPublisher.java index 98369549c2aa..76fd17c5f76b 100644 --- a/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/batching/SearchIndexingPublisher.java +++ b/sdk/search/azure-search-documents/src/main/java/com/azure/search/documents/implementation/batching/SearchIndexingPublisher.java @@ -20,6 +20,7 @@ import com.azure.search.documents.options.OnActionErrorOptions; import com.azure.search.documents.options.OnActionSentOptions; import com.azure.search.documents.options.OnActionSucceededOptions; +import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import java.net.HttpURLConnection; @@ -156,10 +157,10 @@ public synchronized Mono addActions(Collection> actions, Co public Mono flush(boolean awaitLock, boolean isClose, Context context) { if (awaitLock) { processingSemaphore.acquireUninterruptibly(); - return createAndProcessBatch(isClose, context) + return flushLoop(isClose, context) .doFinally(ignored -> processingSemaphore.release()); } else if (processingSemaphore.tryAcquire()) { - return createAndProcessBatch(isClose, context) + return flushLoop(isClose, context) .doFinally(ignored -> processingSemaphore.release()); } else { logger.verbose("Batch already in-flight and not waiting for completion. Performing no-op."); @@ -167,7 +168,35 @@ public Mono flush(boolean awaitLock, boolean isClose, Context context) { } } - private Mono createAndProcessBatch(boolean isClose, Context context) { + private Mono flushLoop(boolean isClosed, Context context) { + return createAndProcessBatch(context) + .expand(ignored -> Flux.defer(() -> (batchAvailableForProcessing() || isClosed) + ? createAndProcessBatch(context) + : Flux.empty())) + .then(); + } + + private Mono createAndProcessBatch(Context context) { + List> batchActions = createBatch(); + + // If there are no documents to in the batch to index just return. + if (CoreUtils.isNullOrEmpty(batchActions)) { + return Mono.empty(); + } + + List convertedActions = batchActions.stream() + .map(action -> IndexActionConverter.map(action.getAction(), serializer)) + .collect(Collectors.toList()); + + return sendBatch(convertedActions, batchActions, context) + .map(response -> { + handleResponse(batchActions, response); + + return response; + }); + } + + private List> createBatch() { final List> batchActions; final Set keysInBatch; synchronized (actionsMutex) { @@ -192,23 +221,7 @@ private Mono createAndProcessBatch(boolean isClose, Context context) { } } - // If there are no documents to in the batch to index just return. - if (CoreUtils.isNullOrEmpty(batchActions)) { - return Mono.empty(); - } - - List convertedActions = batchActions.stream() - .map(action -> IndexActionConverter.map(action.getAction(), serializer)) - .collect(Collectors.toList()); - - return sendBatch(convertedActions, batchActions, context) - .map(response -> { - handleResponse(batchActions, response); - - return response; - }).then(Mono.defer(() -> (batchAvailableForProcessing() || isClose) - ? createAndProcessBatch(isClose, context) - : Mono.empty())); + return batchActions; } private int fillFromQueue(List> batch, List> queue,