Cherry pick changes from main

Azure · Dec 7, 2021 · 62b79a0 · 62b79a0
1 parent 47251b2
commit 62b79a0
Show file tree

Hide file tree

Showing 181 changed files with 4,330 additions and 1,744 deletions.
diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml
@@ -55,12 +55,12 @@
           <rules>
             <bannedDependencies>
               <includes>
-                <include>com.fasterxml.jackson.core:jackson-databind:[2.12.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
+                <include>com.fasterxml.jackson.core:jackson-databind:[2.13.0]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
 
                 <!-- special allowance for perf-test-core as it is not a shipping library: -->
                 <include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->
 
-                <include>io.projectreactor:reactor-core:[3.4.10]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
+                <include>io.projectreactor:reactor-core:[3.4.12]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.12.5</version>  <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
+      <version>2.13.0</version>  <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>

diff --git 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.5
-com.fasterxml.jackson.core:jackson-core;2.12.5
-com.fasterxml.jackson.core:jackson-databind;2.12.5
-com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.12.5
-com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.12.5
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.12.5
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.12.5
-com.fasterxml.jackson.module:jackson-module-parameter-names;2.12.5
+com.fasterxml.jackson.core:jackson-annotations;2.13.0
+com.fasterxml.jackson.core:jackson-core;2.13.0
+com.fasterxml.jackson.core:jackson-databind;2.13.0
+com.fasterxml.jackson.dataformat:jackson-dataformat-avro;2.13.0
+com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.13.0
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.13.0
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.13.0
+com.fasterxml.jackson.module:jackson-module-parameter-names;2.13.0
 com.github.spotbugs:spotbugs;4.2.2
 com.github.spotbugs:spotbugs-annotations;4.2.2
 com.github.spotbugs:spotbugs-maven-plugin;4.2.2
@@ -35,39 +35,40 @@ com.microsoft.azure:qpid-proton-j-extensions;1.2.4
 com.microsoft.azure.sdk.iot:iot-service-client;1.30.0
 com.microsoft.rest:client-runtime;1.7.4
 com.microsoft.rest.v2:client-runtime;2.1.1
-com.microsoft.sqlserver:mssql-jdbc;9.2.1.jre8
+com.microsoft.sqlserver:mssql-jdbc;9.4.0.jre8
 com.microsoft.azure:spring-data-cosmosdb;2.3.0
 com.squareup.okhttp3:okhttp;4.9.2
 com.zaxxer:HikariCP;4.0.3
 commons-codec:commons-codec;1.15
 commons-net:commons-net;3.6
 io.fabric8:kubernetes-client;4.13.3
 io.github.bonigarcia:webdrivermanager;4.3.1
-io.micrometer:micrometer-core;1.7.3
-io.micrometer:micrometer-registry-azure-monitor;1.7.3
-io.micrometer:micrometer-registry-graphite;1.7.3
-io.netty:netty-buffer;4.1.68.Final
-io.netty:netty-common;4.1.68.Final
-io.netty:netty-codec-http;4.1.68.Final
-io.netty:netty-codec-http2;4.1.68.Final
-io.netty:netty-transport;4.1.68.Final
-io.netty:netty-handler;4.1.68.Final
-io.netty:netty-handler-proxy;4.1.68.Final
-io.netty:netty-tcnative;2.0.43.Final
-io.netty:netty-tcnative-boringssl-static;2.0.43.Final
-io.netty:netty-transport-native-epoll;4.1.68.Final
-io.netty:netty-transport-native-unix-common;4.1.68.Final
-io.netty:netty-transport-native-kqueue;4.1.68.Final
-io.projectreactor.netty:reactor-netty;1.0.11
-io.projectreactor.netty:reactor-netty-http;1.0.11
-io.projectreactor:reactor-core;3.4.10
+io.micrometer:micrometer-core;1.8.0
+io.micrometer:micrometer-registry-azure-monitor;1.8.0
+io.micrometer:micrometer-registry-graphite;1.8.0
+io.netty:netty-buffer;4.1.70.Final
+io.netty:netty-common;4.1.70.Final
+io.netty:netty-codec-http;4.1.70.Final
+io.netty:netty-codec-http2;4.1.70.Final
+io.netty:netty-transport;4.1.70.Final
+io.netty:netty-handler;4.1.70.Final
+io.netty:netty-handler-proxy;4.1.70.Final
+io.netty:netty-tcnative;2.0.46.Final
+io.netty:netty-tcnative-boringssl-static;2.0.46.Final
+io.netty:netty-transport-native-epoll;4.1.70.Final
+io.netty:netty-transport-native-unix-common;4.1.70.Final
+io.netty:netty-transport-native-kqueue;4.1.70.Final
+io.projectreactor.netty:reactor-netty;1.0.13
+io.projectreactor.netty:reactor-netty-http;1.0.13
+io.projectreactor:reactor-core;3.4.12
 io.reactivex:rxjava;1.3.8
+jakarta.xml.bind:jakarta.xml.bind-api;2.3.3
 javax.annotation:javax.annotation-api;1.3.2
 javax.json:javax.json-api;1.1.4
 javax.servlet:javax.servlet-api;4.0.1
 javax.validation:validation-api;2.0.1.Final
 javax.websocket:javax.websocket-api;1.1
-mysql:mysql-connector-java;8.0.26
+mysql:mysql-connector-java;8.0.27
 net.minidev:json-smart;2.4.7
 org.apache.ant:ant;1.9.4
 org.apache.avro:avro;1.10.1
@@ -93,63 +94,63 @@ org.javatuples:javatuples;1.2
 org.linguafranca.pwdb:KeePassJava2;2.1.4
 org.powermock:powermock-api-mockito2;2.0.9
 org.powermock:powermock-module-junit4;2.0.9
-org.postgresql:postgresql;42.2.23
+org.postgresql:postgresql;42.3.1
 org.slf4j:slf4j-api;1.7.32
 org.slf4j:slf4j-nop;1.7.32
 org.slf4j:slf4j-simple;1.7.32
 
 ## Spring boot dependency versions
-org.springframework.boot:spring-boot-dependencies;2.5.4
-org.springframework.boot:spring-boot-actuator-autoconfigure;2.5.4
-org.springframework.boot:spring-boot-autoconfigure-processor;2.5.4
-org.springframework.boot:spring-boot-autoconfigure;2.5.4
-org.springframework.boot:spring-boot-configuration-processor;2.5.4
-org.springframework.boot:spring-boot-starter-actuator;2.5.4
-org.springframework.boot:spring-boot-starter-aop;2.5.4
-org.springframework.boot:spring-boot-starter-cache;2.5.4
-org.springframework.boot:spring-boot-starter-data-redis;2.5.4
-org.springframework.boot:spring-boot-starter-logging;2.5.4
-org.springframework.boot:spring-boot-starter-test;2.5.4
-org.springframework.boot:spring-boot-starter-validation;2.5.4
-org.springframework.boot:spring-boot-starter-web;2.5.4
-org.springframework.boot:spring-boot-starter-webflux;2.5.4
-org.springframework.boot:spring-boot-starter;2.5.4
-org.springframework.boot:spring-boot;2.5.4
-org.springframework.data:spring-data-commons;2.5.4
-org.springframework.data:spring-data-mongodb;3.2.4
-org.springframework.data:spring-data-redis;2.5.4
-org.springframework.integration:spring-integration-core;5.5.3
-org.springframework.kafka:spring-kafka;2.7.6
+org.springframework.boot:spring-boot-dependencies;2.6.1
+org.springframework.boot:spring-boot-actuator-autoconfigure;2.6.1
+org.springframework.boot:spring-boot-autoconfigure-processor;2.6.1
+org.springframework.boot:spring-boot-autoconfigure;2.6.1
+org.springframework.boot:spring-boot-configuration-processor;2.6.1
+org.springframework.boot:spring-boot-starter-actuator;2.6.1
+org.springframework.boot:spring-boot-starter-aop;2.6.1
+org.springframework.boot:spring-boot-starter-cache;2.6.1
+org.springframework.boot:spring-boot-starter-data-redis;2.6.1
+org.springframework.boot:spring-boot-starter-logging;2.6.1
+org.springframework.boot:spring-boot-starter-test;2.6.1
+org.springframework.boot:spring-boot-starter-validation;2.6.1
+org.springframework.boot:spring-boot-starter-web;2.6.1
+org.springframework.boot:spring-boot-starter-webflux;2.6.1
+org.springframework.boot:spring-boot-starter;2.6.1
+org.springframework.boot:spring-boot;2.6.1
+org.springframework.data:spring-data-commons;2.6.0
+org.springframework.data:spring-data-mongodb;3.3.0
+org.springframework.data:spring-data-redis;2.6.0
+org.springframework.integration:spring-integration-core;5.5.6
+org.springframework.kafka:spring-kafka;2.8.0
 org.springframework.security:spring-security-config;5.6.0
 org.springframework.security:spring-security-core;5.6.0
 org.springframework.security:spring-security-oauth2-client;5.6.0
 org.springframework.security:spring-security-oauth2-resource-server;5.6.0
 org.springframework.security:spring-security-oauth2-core;5.6.0
 org.springframework.security:spring-security-oauth2-jose;5.6.0
 org.springframework.security:spring-security-web;5.6.0
-org.springframework:spring-beans;5.3.9
-org.springframework:spring-context-support;5.3.9
-org.springframework:spring-context;5.3.9
-org.springframework:spring-core;5.3.9
-org.springframework:spring-expression;5.3.9
-org.springframework:spring-jdbc;5.3.9
-org.springframework:spring-jms;5.3.9
-org.springframework:spring-messaging;5.3.9
-org.springframework:spring-tx;5.3.9
-org.springframework:spring-web;5.3.9
-org.springframework:spring-webmvc;5.3.9
-org.springframework:spring-webflux;5.3.9
+org.springframework:spring-beans;5.3.13
+org.springframework:spring-context-support;5.3.13
+org.springframework:spring-context;5.3.13
+org.springframework:spring-core;5.3.13
+org.springframework:spring-expression;5.3.13
+org.springframework:spring-jdbc;5.3.13
+org.springframework:spring-jms;5.3.13
+org.springframework:spring-messaging;5.3.13
+org.springframework:spring-tx;5.3.13
+org.springframework:spring-web;5.3.13
+org.springframework:spring-webmvc;5.3.13
+org.springframework:spring-webflux;5.3.13
 
-org.springframework.boot:spring-boot-starter-parent;2.5.4
+org.springframework.boot:spring-boot-starter-parent;2.6.1
 
 ## Spring cloud dependency versions
-org.springframework.cloud:spring-cloud-dependencies;2020.0.3
-org.springframework.cloud:spring-cloud-starter-bootstrap;3.0.3
+org.springframework.cloud:spring-cloud-dependencies;2020.0.4
+org.springframework.cloud:spring-cloud-starter-bootstrap;3.0.4
 org.springframework.cloud:spring-cloud-bus;3.0.3
-org.springframework.cloud:spring-cloud-context;3.0.3
-org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.3
-org.springframework.cloud:spring-cloud-stream-binder-test;3.1.3
-org.springframework.cloud:spring-cloud-stream;3.1.3
+org.springframework.cloud:spring-cloud-context;3.0.4
+org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.4
+org.springframework.cloud:spring-cloud-stream-binder-test;3.1.4
+org.springframework.cloud:spring-cloud-stream;3.1.4
 
 pl.pragmatists:JUnitParams;1.1.1
 
@@ -177,37 +178,37 @@ 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.10
+io.projectreactor:reactor-test;3.4.12
 junit:junit;4.13.2
 commons-cli:commons-cli;1.3
 org.apache.maven:maven-compat;3.6.2
 org.apache.maven:maven-embedder;3.6.2
 org.apache.maven.wagon:wagon-http;3.3.4
 org.apache.maven.wagon:wagon-provider-api;3.3.4
-org.assertj:assertj-core;3.19.0
+org.assertj:assertj-core;3.21.0
 org.bouncycastle:bcprov-jdk15on;1.68
 org.eclipse.aether:aether-connector-basic;1.1.0
 org.eclipse.aether:aether-transport-wagon;1.1.0
-org.eclipse.jetty:jetty-http;9.4.43.v20210629
-org.eclipse.jetty:jetty-server;9.4.43.v20210629
+org.eclipse.jetty:jetty-http;9.4.44.v20210927
+org.eclipse.jetty:jetty-server;9.4.44.v20210927
 org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
 org.glassfish:javax.json;1.1.4
 org.hamcrest:hamcrest-all;1.3
 org.hamcrest:hamcrest-library;2.2
-org.junit.jupiter:junit-jupiter;5.7.2
-org.junit.jupiter:junit-jupiter-api;5.7.2
-org.junit.jupiter:junit-jupiter-engine;5.7.2
-org.junit.jupiter:junit-jupiter-migrationsupport;5.7.2
-org.junit.jupiter:junit-jupiter-params;5.7.2
-org.junit.platform:junit-platform-commons;1.7.2
-org.junit.platform:junit-platform-console;1.7.2
-org.junit.platform:junit-platform-engine;1.7.2
-org.junit.platform:junit-platform-launcher;1.7.2
-org.junit.platform:junit-platform-reporting;1.7.2
-org.junit.platform:junit-platform-runner;1.7.2
-org.junit.platform:junit-platform-suite-api;1.7.2
-org.junit.platform:junit-platform-testkit;1.7.2
-org.junit.vintage:junit-vintage-engine;5.7.2
+org.junit.jupiter:junit-jupiter;5.8.1
+org.junit.jupiter:junit-jupiter-api;5.8.1
+org.junit.jupiter:junit-jupiter-engine;5.8.1
+org.junit.jupiter:junit-jupiter-migrationsupport;5.8.1
+org.junit.jupiter:junit-jupiter-params;5.8.1
+org.junit.platform:junit-platform-commons;1.8.1
+org.junit.platform:junit-platform-console;1.8.1
+org.junit.platform:junit-platform-engine;1.8.1
+org.junit.platform:junit-platform-launcher;1.8.1
+org.junit.platform:junit-platform-reporting;1.8.1
+org.junit.platform:junit-platform-runner;1.8.1
+org.junit.platform:junit-platform-suite-api;1.8.1
+org.junit.platform:junit-platform-testkit;1.8.1
+org.junit.vintage:junit-vintage-engine;5.8.1
 org.openjdk.jmh:jmh-core;1.22
 org.openjdk.jmh:jmh-generator-annprocess;1.22
 org.spockframework:spock-core;2.0-M4-groovy-2.5
@@ -224,9 +225,9 @@ com.nimbusds:nimbus-jose-jwt;9.10.1
 com.puppycrawl.tools:checkstyle;8.42
 commons-io:commons-io;2.7
 commons-validator:commons-validator;1.6
-io.dropwizard.metrics:metrics-core;4.1.25
-io.dropwizard.metrics:metrics-graphite;4.1.25
-io.dropwizard.metrics:metrics-jvm;4.1.25
+io.dropwizard.metrics:metrics-core;4.2.4
+io.dropwizard.metrics:metrics-graphite;4.2.4
+io.dropwizard.metrics:metrics-jvm;4.2.4
 io.reactivex.rxjava2:rxjava;2.2.21
 net.java.dev.jna:jna-platform;5.6.0
 net.jonathangiles.tools:dependencyChecker-maven-plugin;1.0.6
@@ -264,8 +265,8 @@ org.eclipse.m2e:lifecycle-mapping;1.0.0
 org.hdrhistogram:HdrHistogram;2.1.12
 org.jacoco:jacoco-maven-plugin;0.8.7
 org.jacoco:org.jacoco.agent;0.8.7
-org.mockito:mockito-core;3.12.4
-org.mockito:mockito-inline;3.12.4
+org.mockito:mockito-core;4.0.0
+org.mockito:mockito-inline;4.0.0
 org.revapi:revapi-java;0.20.0
 org.revapi:revapi-maven-plugin;0.11.2
 org.moditect:moditect-maven-plugin;1.0.0.RC1
@@ -356,7 +357,6 @@ storage_com.microsoft.azure:azure-storage;8.4.0
 
 # sdk\spring\azure-spring-boot\pom.xml
 spring_com.microsoft.azure:azure;1.34.0
-spring_org.springframework.kafka:spring-kafka;2.6.6
 
 # sdk\appconfiguration\azure-spring-cloud-appconfiguration-config\pom.xml
 # sdk\appconfiguration\azure-spring-cloud-feature-management\pom.xml

diff --git a/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml b/sdk/agrifood/azure-verticals-agrifood-farming/pom.xml
@@ -58,19 +58,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml
@@ -50,19 +50,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml
@@ -71,19 +71,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.7.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
+      <version>5.8.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.4.10</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.4.12</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>