Reactor, Reactor Netty, and Spring Framework Version Upgrades (#19563)

Reactor, Reactor Netty, and Spring Framework Version Upgrades

common/perf-test-core/pom.xml

@@ -56,7 +56,7 @@
                 <!-- 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.3.12.RELEASE]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
+                <include>io.projectreactor:reactor-core:[3.4.3]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
               </includes>
             </bannedDependencies>
           </rules>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-core</artifactId>
-      <version>3.3.12.RELEASE</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
+      <version>3.4.3</version> <!-- {x-version-update;io.projectreactor:reactor-core;external_dependency} -->
     </dependency>
   </dependencies>
 </project>

eng/code-quality-reports/src/main/resources/revapi/revapi.json

@@ -14,6 +14,7 @@
             "com\\.azure\\..+\\.implementation(\\..+)?",
             "com\\.azure\\..+\\.samples(\\..+)?",
             "com\\.fasterxml\\.jackson\\..+",
+            "reactor\\.core\\..+",
             "reactor\\.netty\\..+",
             "reactor\\.util\\..+",
             "io\\.netty\\..+",

eng/pipelines/templates/stages/cosmos-sdk-client.yml

@@ -132,23 +132,6 @@ stages:
           # but we don't include them in the Maven site commands (so that we don't generate reports for the non-shipping modules).
           - template: ../steps/install-reporting-tools.yml
 
-          PostSteps:
-            - script: |
-                python --version
-                python -m pip install setuptools termcolor in_place
-                python sdk/spring/scripts/replace_util.py --module cosmos --log debug --color false
-              condition: and(succeededOrFailed(), eq(variables['DisplayName'], 'Spring Emulator only Integration Tests'))
-              displayName: 'Run replace_util.py'
-            - task: Maven@3
-              condition: and(succeededOrFailed(), eq(variables['DisplayName'], 'Spring Emulator only Integration Tests'))
-              displayName: 'Run tests again: $(DisplayName)'
-              inputs:
-                mavenPomFile: pom.xml
-                goals: clean verify
-                options: '$(ProfileFlag) -Dgpg.skip $(AdditionalArgs) -pl com.azure:azure-spring-data-cosmos-test'
-                mavenAuthenticateFeed: true
-                jdkVersionOption: $(JavaTestVersion)
-
   # The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
   - ${{if and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'internal'))}}:
     - template: archetype-java-release.yml

eng/versioning/external_dependencies.txt

@@ -34,32 +34,32 @@ com.microsoft.azure:azure-servicebus-jms;0.0.7
 com.microsoft.azure:qpid-proton-j-extensions;1.2.3
 com.microsoft.rest:client-runtime;1.7.4
 com.microsoft.rest.v2:client-runtime;2.1.1
-com.microsoft.sqlserver:mssql-jdbc;7.4.1.jre8
+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.zaxxer:HikariCP;3.4.5
-commons-codec:commons-codec;1.14
+commons-codec:commons-codec;1.15
 commons-net:commons-net;3.6
 io.fabric8:kubernetes-client;4.10.3
 io.github.bonigarcia:webdrivermanager;4.3.1
-io.micrometer:micrometer-core;1.5.6
-io.micrometer:micrometer-registry-azure-monitor;1.5.6
-io.micrometer:micrometer-registry-graphite;1.5.6
-io.netty:netty-buffer;4.1.54.Final
-io.netty:netty-common;4.1.54.Final
-io.netty:netty-codec-http;4.1.54.Final
-io.netty:netty-codec-http2;4.1.54.Final
-io.netty:netty-transport;4.1.54.Final
-io.netty:netty-handler;4.1.54.Final
-io.netty:netty-handler-proxy;4.1.54.Final
-io.netty:netty-tcnative;2.0.35.Final
-io.netty:netty-tcnative-boringssl-static;2.0.35.Final
-io.netty:netty-transport-native-epoll;4.1.54.Final
-io.netty:netty-transport-native-unix-common;4.1.54.Final
-io.netty:netty-transport-native-kqueue;4.1.54.Final
-io.projectreactor.netty:reactor-netty;0.9.15.RELEASE
-io.projectreactor:reactor-core;3.3.12.RELEASE
+io.micrometer:micrometer-core;1.6.1
+io.micrometer:micrometer-registry-azure-monitor;1.6.1
+io.micrometer:micrometer-registry-graphite;1.6.1
+io.netty:netty-buffer;4.1.59.Final
+io.netty:netty-common;4.1.59.Final
+io.netty:netty-codec-http;4.1.59.Final
+io.netty:netty-codec-http2;4.1.59.Final
+io.netty:netty-transport;4.1.59.Final
+io.netty:netty-handler;4.1.59.Final
+io.netty:netty-handler-proxy;4.1.59.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.59.Final
+io.netty:netty-transport-native-unix-common;4.1.59.Final
+io.netty:netty-transport-native-kqueue;4.1.59.Final
+io.projectreactor.netty:reactor-netty;1.0.4
+io.projectreactor:reactor-core;3.4.3
 io.reactivex:rxjava;1.3.8
 javax.annotation:javax.annotation-api;1.3.2
 javax.servlet:javax.servlet-api;4.0.1
@@ -70,7 +70,7 @@ 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.commons:commons-compress;1.20
-org.apache.commons:commons-lang3;3.10
+org.apache.commons:commons-lang3;3.11
 org.apache.httpcomponents:httpclient;4.5.13
 org.apache.httpcomponents.client5:httpclient5;5.0.3
 org.apache.logging.log4j:log4j-api;2.13.3
@@ -94,57 +94,57 @@ org.slf4j:slf4j-nop;1.7.30
 org.slf4j:slf4j-simple;1.7.30
 
 ## Spring boot dependency versions
-org.springframework.boot:spring-boot-dependencies;2.3.5.RELEASE
-org.springframework.boot:spring-boot-actuator-autoconfigure;2.3.5.RELEASE
-org.springframework.boot:spring-boot-autoconfigure-processor;2.3.5.RELEASE
-org.springframework.boot:spring-boot-autoconfigure;2.3.5.RELEASE
-org.springframework.boot:spring-boot-configuration-processor;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-actuator;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-aop;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-cache;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-data-redis;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-logging;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-test;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-validation;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-web;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter-webflux;2.3.5.RELEASE
-org.springframework.boot:spring-boot-starter;2.3.5.RELEASE
-org.springframework.boot:spring-boot;2.3.5.RELEASE
-org.springframework.data:spring-data-commons;2.3.5.RELEASE
-org.springframework.data:spring-data-mongodb;3.0.5.RELEASE
-org.springframework.data:spring-data-redis;2.3.5.RELEASE
-org.springframework.integration:spring-integration-core;5.3.3.RELEASE
-org.springframework.kafka:spring-kafka;2.5.7.RELEASE
-org.springframework.security:spring-security-config;5.3.5.RELEASE
-org.springframework.security:spring-security-core;5.3.5.RELEASE
-org.springframework.security:spring-security-oauth2-client;5.3.5.RELEASE
-org.springframework.security:spring-security-oauth2-resource-server;5.3.5.RELEASE
-org.springframework.security:spring-security-oauth2-core;5.3.5.RELEASE
-org.springframework.security:spring-security-oauth2-jose;5.3.5.RELEASE
-org.springframework.security:spring-security-web;5.3.5.RELEASE
-org.springframework:spring-beans;5.2.10.RELEASE
-org.springframework:spring-context-support;5.2.10.RELEASE
-org.springframework:spring-context;5.2.10.RELEASE
-org.springframework:spring-core;5.2.10.RELEASE
-org.springframework:spring-expression;5.2.10.RELEASE
-org.springframework:spring-jdbc;5.2.10.RELEASE
-org.springframework:spring-jms;5.2.10.RELEASE
-org.springframework:spring-messaging;5.2.10.RELEASE
-org.springframework:spring-tx;5.2.10.RELEASE
-org.springframework:spring-web;5.2.10.RELEASE
-org.springframework:spring-webmvc;5.2.10.RELEASE
-org.springframework:spring-webflux;5.2.10.RELEASE
+org.springframework.boot:spring-boot-dependencies;2.4.0
+org.springframework.boot:spring-boot-actuator-autoconfigure;2.4.0
+org.springframework.boot:spring-boot-autoconfigure-processor;2.4.0
+org.springframework.boot:spring-boot-autoconfigure;2.4.0
+org.springframework.boot:spring-boot-configuration-processor;2.4.0
+org.springframework.boot:spring-boot-starter-actuator;2.4.0
+org.springframework.boot:spring-boot-starter-aop;2.4.0
+org.springframework.boot:spring-boot-starter-cache;2.4.0
+org.springframework.boot:spring-boot-starter-data-redis;2.4.0
+org.springframework.boot:spring-boot-starter-logging;2.4.0
+org.springframework.boot:spring-boot-starter-test;2.4.0
+org.springframework.boot:spring-boot-starter-validation;2.4.0
+org.springframework.boot:spring-boot-starter-web;2.4.0
+org.springframework.boot:spring-boot-starter-webflux;2.4.0
+org.springframework.boot:spring-boot-starter;2.4.0
+org.springframework.boot:spring-boot;2.4.0
+org.springframework.data:spring-data-commons;2.4.0
+org.springframework.data:spring-data-mongodb;3.1.0
+org.springframework.data:spring-data-redis;2.4.0
+org.springframework.integration:spring-integration-core;5.4.0
+org.springframework.kafka:spring-kafka;2.6.0
+org.springframework.security:spring-security-config;5.4.0
+org.springframework.security:spring-security-core;5.4.0
+org.springframework.security:spring-security-oauth2-client;5.4.0
+org.springframework.security:spring-security-oauth2-resource-server;5.4.0
+org.springframework.security:spring-security-oauth2-core;5.4.0
+org.springframework.security:spring-security-oauth2-jose;5.4.0
+org.springframework.security:spring-security-web;5.4.0
+org.springframework:spring-beans;5.3.0
+org.springframework:spring-context-support;5.3.0
+org.springframework:spring-context;5.3.0
+org.springframework:spring-core;5.3.0
+org.springframework:spring-expression;5.3.0
+org.springframework:spring-jdbc;5.3.0
+org.springframework:spring-jms;5.3.0
+org.springframework:spring-messaging;5.3.0
+org.springframework:spring-tx;5.3.0
+org.springframework:spring-web;5.3.0
+org.springframework:spring-webmvc;5.3.0
+org.springframework:spring-webflux;5.3.0
 
 # spring-boot-starter-parent is not managed by spring-boot-dependencies or spring-cloud-dependencies.
-org.springframework.boot:spring-boot-starter-parent;2.3.7.RELEASE
+org.springframework.boot:spring-boot-starter-parent;2.4.0
 
 ## Spring cloud dependency versions
-org.springframework.cloud:spring-cloud-dependencies;Hoxton.SR8
-org.springframework.cloud:spring-cloud-bus;2.2.3.RELEASE
-org.springframework.cloud:spring-cloud-context;2.2.5.RELEASE
-org.springframework.cloud:spring-cloud-starter-stream-kafka;3.0.8.RELEASE
-org.springframework.cloud:spring-cloud-stream-binder-test;3.0.8.RELEASE
-org.springframework.cloud:spring-cloud-stream;3.0.8.RELEASE
+org.springframework.cloud:spring-cloud-dependencies;2020.0.0
+org.springframework.cloud:spring-cloud-bus;3.0.0
+org.springframework.cloud:spring-cloud-context;3.0.0
+org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.0
+org.springframework.cloud:spring-cloud-stream-binder-test;3.1.0
+org.springframework.cloud:spring-cloud-stream;3.1.0
 
 pl.pragmatists:JUnitParams;1.1.1
 
@@ -165,48 +165,43 @@ com.microsoft.azure:azure-mgmt-resources;1.3.0
 com.microsoft.azure:azure-mgmt-search;1.24.1
 com.microsoft.azure:azure-mgmt-storage;1.3.0
 com.microsoft.azure:azure-storage;8.0.0
-com.microsoft.azure:msal4j;1.8.1
-com.microsoft.azure:msal4j-persistence-extension;1.0.0
+com.microsoft.azure:msal4j;1.9.1
+com.microsoft.azure:msal4j-persistence-extension;1.1.0
 com.sun.activation:jakarta.activation;1.2.2
 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.3.12.RELEASE
+io.projectreactor:reactor-test;3.4.3
 junit:junit;4.13.1
 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.16.1
+org.assertj:assertj-core;3.18.1
 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.33.v20201020
-org.eclipse.jetty:jetty-server;9.4.33.v20201020
+org.eclipse.jetty:jetty-http;9.4.36.v20210114
+org.eclipse.jetty:jetty-server;9.4.36.v20210114
 org.eclipse.jgit:org.eclipse.jgit;4.5.7.201904151645-r
 org.hamcrest:hamcrest-all;1.3
 org.hamcrest:hamcrest-library;2.2
-# https://junit.org/junit5/docs/current/user-guide/#running-tests-ide-intellij-idea
-# use 5.4.2 now since Version 5.5.2 as of 11.2019 fails to discover tests
-# https://youtrack.jetbrains.com/issue/IDEA-223700
-# org.junit:junit-bom;5.4.2 is a pom file that will add its dependencyManagement section to parent pom's which
-# effectively means that each dependency needs to be listed here.
-org.junit.jupiter:junit-jupiter;5.6.3
-org.junit.jupiter:junit-jupiter-api;5.6.3
-org.junit.jupiter:junit-jupiter-engine;5.6.3
-org.junit.jupiter:junit-jupiter-migrationsupport;5.6.3
-org.junit.jupiter:junit-jupiter-params;5.6.3
-org.junit.platform:junit-platform-commons;1.6.3
-org.junit.platform:junit-platform-console;1.6.3
-org.junit.platform:junit-platform-engine;1.6.3
-org.junit.platform:junit-platform-launcher;1.6.3
-org.junit.platform:junit-platform-reporting;1.6.3
-org.junit.platform:junit-platform-runner;1.6.3
-org.junit.platform:junit-platform-suite-api;1.6.3
-org.junit.platform:junit-platform-testkit;1.6.3
-org.junit.vintage:junit-vintage-engine;5.6.3
+org.junit.jupiter:junit-jupiter;5.7.1
+org.junit.jupiter:junit-jupiter-api;5.7.1
+org.junit.jupiter:junit-jupiter-engine;5.7.1
+org.junit.jupiter:junit-jupiter-migrationsupport;5.7.1
+org.junit.jupiter:junit-jupiter-params;5.7.1
+org.junit.platform:junit-platform-commons;1.7.1
+org.junit.platform:junit-platform-console;1.7.1
+org.junit.platform:junit-platform-engine;1.7.1
+org.junit.platform:junit-platform-launcher;1.7.1
+org.junit.platform:junit-platform-reporting;1.7.1
+org.junit.platform:junit-platform-runner;1.7.1
+org.junit.platform:junit-platform-suite-api;1.7.1
+org.junit.platform:junit-platform-testkit;1.7.1
+org.junit.vintage:junit-vintage-engine;5.7.1
 org.openjdk.jmh:jmh-core;1.22
 org.openjdk.jmh:jmh-generator-annprocess;1.22
 org.spockframework:spock-core;1.3-groovy-2.5
@@ -217,8 +212,8 @@ uk.org.lidalia:slf4j-test;1.2.0
 com.azure:sdk-build-tools;1.0.0
 com.beust:jcommander;1.78
 com.google.code.findbugs:jsr305;3.0.2
-com.nimbusds:nimbus-jose-jwt;8.19
-com.nimbusds:oauth2-oidc-sdk;7.1.1
+com.nimbusds:nimbus-jose-jwt;9.1.2
+com.nimbusds:oauth2-oidc-sdk;8.23.1
 com.puppycrawl.tools:checkstyle;8.40
 commons-io:commons-io;2.5
 commons-validator:commons-validator;1.6
@@ -262,7 +257,7 @@ org.eclipse.m2e:lifecycle-mapping;1.0.0
 org.hdrhistogram:HdrHistogram;2.1.12
 org.jacoco:jacoco-maven-plugin;0.8.5
 org.jacoco:org.jacoco.agent;0.8.5
-org.mockito:mockito-core;3.3.3
+org.mockito:mockito-core;3.6.0
 org.revapi:revapi-java;0.20.0
 org.revapi:revapi-maven-plugin;0.11.2
 

eng/versioning/version_client.txt

@@ -216,11 +216,12 @@ com.azure.resourcemanager:azure-resourcemanager-datadog;1.0.0-beta.1;1.0.0-beta.
 # Format;
 # unreleased_<groupId>:<artifactId>;dependency-version
 # note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
-unreleased_com.azure:azure-core-management;1.2.0-beta.1
-unreleased_com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.8
 unreleased_com.azure:azure-core;1.14.0-beta.1
 unreleased_com.azure:azure-core-amqp;2.1.0-beta.1
+unreleased_com.azure:azure-core-http-netty;1.9.0-beta.1
+unreleased_com.azure:azure-core-management;1.2.0-beta.1
 unreleased_com.azure:azure-core-serializer-json-jackson;1.2.0-beta.1
+unreleased_com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.8
 
 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
 # version and set the version to the released beta. Released beta dependencies are only valid

sdk/anomalydetector/azure-ai-anomalydetector/pom.xml

@@ -50,19 +50,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
+      <version>5.7.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.6.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
+      <version>5.7.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.6.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
+      <version>5.7.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/appconfiguration/azure-data-appconfiguration/pom.xml

@@ -60,19 +60,19 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
+      <version>5.7.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.6.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-engine;external_dependency} -->
+      <version>5.7.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.6.3</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
+      <version>5.7.1</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-params;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>io.projectreactor</groupId>
       <artifactId>reactor-test</artifactId>
-      <version>3.3.12.RELEASE</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
+      <version>3.4.3</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.3.7.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
+    <version>2.4.0</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
     <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
@@ -27,6 +27,12 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.1</version> <!-- {x-version-update;junit:junit;external_dependency} -->
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>