diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml index 8db84344a3ee9..541928398352b 100644 --- a/common/perf-test-core/pom.xml +++ b/common/perf-test-core/pom.xml @@ -56,7 +56,7 @@ com.beust:jcommander:[1.78] - io.projectreactor:reactor-core:[3.3.12.RELEASE] + io.projectreactor:reactor-core:[3.4.3] @@ -79,7 +79,7 @@ io.projectreactor reactor-core - 3.3.12.RELEASE + 3.4.3 diff --git a/eng/code-quality-reports/src/main/resources/revapi/revapi.json b/eng/code-quality-reports/src/main/resources/revapi/revapi.json index 4ffde971cd511..d150125689278 100644 --- a/eng/code-quality-reports/src/main/resources/revapi/revapi.json +++ b/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\\..+", diff --git a/eng/pipelines/templates/stages/cosmos-sdk-client.yml b/eng/pipelines/templates/stages/cosmos-sdk-client.yml index 816b26c336e6d..307d84a79f38f 100644 --- a/eng/pipelines/templates/stages/cosmos-sdk-client.yml +++ b/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 diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 84bcbe9ffe578..60aaf313fdeb1 100644 --- a/eng/versioning/external_dependencies.txt +++ b/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 diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 2b3444a3c8a27..688f28988a6ba 100644 --- a/eng/versioning/version_client.txt +++ b/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_:;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 diff --git a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml index c1f8eb38d0524..d95af5c0e322a 100644 --- a/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml +++ b/sdk/anomalydetector/azure-ai-anomalydetector/pom.xml @@ -50,19 +50,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml index 9ee3fc386ba59..8bde5f3e215b8 100644 --- a/sdk/appconfiguration/azure-data-appconfiguration/pom.xml +++ b/sdk/appconfiguration/azure-data-appconfiguration/pom.xml @@ -60,19 +60,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -84,7 +84,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml index b963f0e58a7c1..e216d44e37ee3 100644 --- a/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 @@ -27,6 +27,12 @@ spring-boot-starter-test test + + junit + junit + 4.13.1 + test + diff --git a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/pom.xml b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/pom.xml index 70601dfbd4e24..dbea81dcd59b0 100644 --- a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/pom.xml @@ -25,19 +25,19 @@ org.springframework.boot spring-boot-starter-web - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-actuator - 2.3.5.RELEASE + 2.4.0 true compile org.springframework.cloud spring-cloud-bus - 2.2.3.RELEASE + 3.0.0 true compile @@ -50,13 +50,13 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -83,10 +83,10 @@ - org.springframework.boot:spring-boot-starter-actuator:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter-actuator:[2.4.0] com.microsoft.azure:spring-cloud-azure-appconfiguration-config:[1.2.8] - org.springframework.boot:spring-boot-starter-web:[2.3.5.RELEASE] - org.springframework.cloud:spring-cloud-bus:[2.2.3.RELEASE] + org.springframework.boot:spring-boot-starter-web:[2.4.0] + org.springframework.cloud:spring-cloud-bus:[3.0.0] diff --git a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml index ec65498bdb112..111795c639866 100644 --- a/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/pom.xml @@ -20,23 +20,23 @@ org.springframework.boot spring-boot-autoconfigure-processor - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-autoconfigure - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true org.springframework.cloud spring-cloud-context - 2.2.5.RELEASE + 3.0.0 com.fasterxml.jackson.core @@ -51,7 +51,7 @@ org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 @@ -82,12 +82,12 @@ org.apache.commons commons-lang3 - 3.10 + 3.11 org.springframework.boot spring-boot-actuator-autoconfigure - 2.3.5.RELEASE + 2.4.0 org.apache.httpcomponents @@ -108,13 +108,13 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -158,15 +158,15 @@ com.fasterxml.jackson.core:jackson-annotations:[2.12.1] com.fasterxml.jackson.core:jackson-databind:[2.12.1] javax.annotation:javax.annotation-api:[1.3.2] - org.apache.commons:commons-lang3:[3.10] + org.apache.commons:commons-lang3:[3.11] org.apache.httpcomponents:httpclient:[4.5.13] org.hibernate.validator:hibernate-validator:[6.1.6.Final] - 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-actuator-autoconfigure:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] - org.springframework.cloud:spring-cloud-context:[2.2.5.RELEASE] - org.springframework:spring-web:[5.2.10.RELEASE] + org.springframework.boot:spring-boot-autoconfigure-processor:[2.4.0] + org.springframework.boot:spring-boot-autoconfigure:[2.4.0] + org.springframework.boot:spring-boot-actuator-autoconfigure:[2.4.0] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] + org.springframework.cloud:spring-cloud-context:[3.0.0] + org.springframework:spring-web:[5.3.0] diff --git a/sdk/appconfiguration/spring-cloud-azure-feature-management-web/pom.xml b/sdk/appconfiguration/spring-cloud-azure-feature-management-web/pom.xml index c978db005f35b..b9a9cb090a8a4 100644 --- a/sdk/appconfiguration/spring-cloud-azure-feature-management-web/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-feature-management-web/pom.xml @@ -19,18 +19,18 @@ org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 org.springframework spring-webmvc - 5.2.10.RELEASE + 5.3.0 javax.servlet @@ -52,6 +52,13 @@ 3.0.2 provided + + + junit + junit + 4.13.1 + test + @@ -65,8 +72,8 @@ com.microsoft.azure:spring-cloud-azure-feature-management:[1.2.8] javax.servlet:javax.servlet-api:[4.0.1] - org.springframework:spring-web:[5.2.10.RELEASE] - org.springframework:spring-webmvc:[5.2.10.RELEASE] + org.springframework:spring-web:[5.3.0] + org.springframework:spring-webmvc:[5.3.0] diff --git a/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml b/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml index 6c8c4d3de0820..0d36f8d24ad82 100644 --- a/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml +++ b/sdk/appconfiguration/spring-cloud-azure-feature-management/pom.xml @@ -19,12 +19,12 @@ org.springframework spring-context - 5.2.10.RELEASE + 5.3.0 org.springframework.boot spring-boot-starter - 2.3.5.RELEASE + 2.4.0 com.fasterxml.jackson.core @@ -39,7 +39,7 @@ io.projectreactor.netty reactor-netty - 0.9.15.RELEASE + 1.0.4 junit @@ -50,13 +50,13 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -84,9 +84,9 @@ com.fasterxml.jackson.core:jackson-annotations:[2.12.1] com.fasterxml.jackson.core:jackson-databind:[2.12.1] - io.projectreactor.netty:reactor-netty:[0.9.15.RELEASE] - org.springframework.boot:spring-boot-starter:[2.3.5.RELEASE] - org.springframework:spring-context:[5.2.10.RELEASE] + io.projectreactor.netty:reactor-netty:[1.0.4] + org.springframework.boot:spring-boot-starter:[2.4.0] + org.springframework:spring-context:[5.3.0] diff --git a/sdk/appconfiguration/tests.yml b/sdk/appconfiguration/tests.yml index 309324b45289f..4396553e41378 100644 --- a/sdk/appconfiguration/tests.yml +++ b/sdk/appconfiguration/tests.yml @@ -14,15 +14,3 @@ stages: AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id) AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret) AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id) - PostSteps: - - script: | - python --version - python -m pip install setuptools termcolor in_place - python sdk/spring/scripts/replace_util.py --module appconfiguration --log debug --color false - displayName: 'Run replace_util.py' - - task: Maven@3 - displayName: 'Run tests again.' - inputs: - mavenPomFile: pom.xml - goals: clean verify - options: '-Dgpg.skip -Dmaven.wagon.http.pool=false -Dmaven.javadoc.skip=true -Drevapi.skip=true -pl $(ProjectList)' diff --git a/sdk/attestation/azure-security-attestation/pom.xml b/sdk/attestation/azure-security-attestation/pom.xml index e092ec2497088..5c92086932aff 100644 --- a/sdk/attestation/azure-security-attestation/pom.xml +++ b/sdk/attestation/azure-security-attestation/pom.xml @@ -37,19 +37,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -73,7 +73,7 @@ com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 test diff --git a/sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/AttestationPolicyManagementTests.java b/sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/AttestationPolicyManagementTests.java index 879960aa901ec..0f3ebee7cb1cd 100644 --- a/sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/AttestationPolicyManagementTests.java +++ b/sdk/attestation/azure-security-attestation/src/test/java/com/azure/security/attestation/AttestationPolicyManagementTests.java @@ -15,9 +15,9 @@ import com.nimbusds.jose.JWSObject; import com.nimbusds.jose.JWSSigner; import com.nimbusds.jose.Payload; +import com.nimbusds.jose.shaded.json.JSONArray; +import com.nimbusds.jose.shaded.json.JSONObject; import com.nimbusds.jwt.JWTClaimsSet; -import net.minidev.json.JSONArray; -import net.minidev.json.JSONObject; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import reactor.test.StepVerifier; diff --git a/sdk/batch/microsoft-azure-batch/pom.xml b/sdk/batch/microsoft-azure-batch/pom.xml index bf95380d8481f..d5ffe9d7de85a 100644 --- a/sdk/batch/microsoft-azure-batch/pom.xml +++ b/sdk/batch/microsoft-azure-batch/pom.xml @@ -49,7 +49,7 @@ commons-codec commons-codec - 1.14 + 1.15 diff --git a/sdk/communication/azure-communication-chat/pom.xml b/sdk/communication/azure-communication-chat/pom.xml index 6ca64bf43d3a3..1d5edff2c3698 100644 --- a/sdk/communication/azure-communication-chat/pom.xml +++ b/sdk/communication/azure-communication-chat/pom.xml @@ -66,25 +66,25 @@ com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/communication/azure-communication-common/pom.xml b/sdk/communication/azure-communication-common/pom.xml index 58a0529ed927a..99dee17f10a99 100644 --- a/sdk/communication/azure-communication-common/pom.xml +++ b/sdk/communication/azure-communication-common/pom.xml @@ -57,31 +57,31 @@ com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/communication/azure-communication-identity/pom.xml b/sdk/communication/azure-communication-identity/pom.xml index c06b50b827865..4a6000460708e 100644 --- a/sdk/communication/azure-communication-identity/pom.xml +++ b/sdk/communication/azure-communication-identity/pom.xml @@ -67,31 +67,31 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 test @@ -103,7 +103,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/communication/azure-communication-phonenumbers/pom.xml b/sdk/communication/azure-communication-phonenumbers/pom.xml index c5c35c5cf638a..181a28ca21216 100644 --- a/sdk/communication/azure-communication-phonenumbers/pom.xml +++ b/sdk/communication/azure-communication-phonenumbers/pom.xml @@ -67,31 +67,31 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 test @@ -103,7 +103,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/communication/azure-communication-sms/pom.xml b/sdk/communication/azure-communication-sms/pom.xml index c2e976d4dfcb3..81ed762c3bb02 100644 --- a/sdk/communication/azure-communication-sms/pom.xml +++ b/sdk/communication/azure-communication-sms/pom.xml @@ -65,31 +65,31 @@ com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/core/azure-core-amqp-experimental/pom.xml b/sdk/core/azure-core-amqp-experimental/pom.xml index b0ddbf23727f0..6561ede7b03ae 100644 --- a/sdk/core/azure-core-amqp-experimental/pom.xml +++ b/sdk/core/azure-core-amqp-experimental/pom.xml @@ -64,25 +64,25 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/core/azure-core-amqp/pom.xml b/sdk/core/azure-core-amqp/pom.xml index 086c199dee47b..5401aac055ba4 100644 --- a/sdk/core/azure-core-amqp/pom.xml +++ b/sdk/core/azure-core-amqp/pom.xml @@ -74,32 +74,32 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -134,16 +134,16 @@ - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - -Xlint:deprecation - - - + + + + + + + + + + diff --git a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/AmqpChannelProcessorTest.java b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/AmqpChannelProcessorTest.java index 9452919fd0a80..7d6f32cd52335 100644 --- a/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/AmqpChannelProcessorTest.java +++ b/sdk/core/azure-core-amqp/src/test/java/com/azure/core/amqp/implementation/AmqpChannelProcessorTest.java @@ -30,6 +30,8 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -216,6 +218,11 @@ void nonRetryableError() { .subscribeWith(channelProcessor); final FluxSink endpointSink = connection1.getSink(); + /* + * Beginning in Mockito 3.4.0+ the default value for duration changed from null to Duration.ZERO + */ + when(retryPolicy.calculateRetryDelay(any(), anyInt())).thenReturn(null); + // Act & Assert // Verify that we get the first connection. StepVerifier.create(processor) diff --git a/sdk/core/azure-core-experimental/pom.xml b/sdk/core/azure-core-experimental/pom.xml index b05dddbd056fc..5ffaf4ceaaaac 100644 --- a/sdk/core/azure-core-experimental/pom.xml +++ b/sdk/core/azure-core-experimental/pom.xml @@ -64,25 +64,25 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/core/azure-core-experimental/src/main/java/com/azure/core/experimental/implementation/AccessTokenCacheImpl.java b/sdk/core/azure-core-experimental/src/main/java/com/azure/core/experimental/implementation/AccessTokenCacheImpl.java index 829157fbb3ea0..a988dbb943932 100644 --- a/sdk/core/azure-core-experimental/src/main/java/com/azure/core/experimental/implementation/AccessTokenCacheImpl.java +++ b/sdk/core/azure-core-experimental/src/main/java/com/azure/core/experimental/implementation/AccessTokenCacheImpl.java @@ -9,8 +9,8 @@ import com.azure.core.util.logging.ClientLogger; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import reactor.core.publisher.MonoProcessor; import reactor.core.publisher.Signal; +import reactor.core.publisher.Sinks; import java.time.Duration; import java.time.OffsetDateTime; @@ -30,7 +30,7 @@ public class AccessTokenCacheImpl { private static final Duration REFRESH_OFFSET = Duration.ofMinutes(5); private volatile AccessToken cache; private volatile OffsetDateTime nextTokenRefresh = OffsetDateTime.now(); - private final AtomicReference> wip; + private final AtomicReference> wip; private final TokenCredential tokenCredential; private TokenRequestContext tokenRequestContext; private final Predicate shouldRefresh; @@ -64,8 +64,8 @@ public Mono getToken(TokenRequestContext tokenRequestContext) { private Supplier> retrieveToken(TokenRequestContext tokenRequestContext) { return () -> { try { - if (wip.compareAndSet(null, MonoProcessor.create())) { - final MonoProcessor monoProcessor = wip.get(); + if (wip.compareAndSet(null, Sinks.one())) { + final Sinks.One sinksOne = wip.get(); OffsetDateTime now = OffsetDateTime.now(); Mono tokenRefresh; Mono fallback; @@ -109,8 +109,8 @@ private Supplier> retrieveToken(TokenRequestContext } return tokenRefresh .materialize() - .flatMap(processTokenRefreshResult(monoProcessor, now, fallback)) - .doOnError(monoProcessor::onError) + .flatMap(processTokenRefreshResult(sinksOne, now, fallback)) + .doOnError(sinksOne::tryEmitError) .doFinally(ignored -> wip.set(null)); } else { return Mono.empty(); @@ -130,15 +130,14 @@ private boolean checkIfWeShouldForceRefresh(TokenRequestContext tokenRequestCont } private Function, Mono> processTokenRefreshResult( - MonoProcessor monoProcessor, OffsetDateTime now, Mono fallback) { + Sinks.One sinksOne, OffsetDateTime now, Mono fallback) { return signal -> { AccessToken accessToken = signal.get(); Throwable error = signal.getThrowable(); if (signal.isOnNext() && accessToken != null) { // SUCCESS logger.info(refreshLog(cache, now, "Acquired a new access token")); cache = accessToken; - monoProcessor.onNext(accessToken); - monoProcessor.onComplete(); + sinksOne.tryEmitValue(accessToken); nextTokenRefresh = OffsetDateTime.now().plus(REFRESH_DELAY); return Mono.just(accessToken); } else if (signal.isOnError() && error != null) { // ERROR @@ -146,7 +145,7 @@ private Function, Mono> processTokenR nextTokenRefresh = OffsetDateTime.now().plus(REFRESH_DELAY); return fallback.switchIfEmpty(Mono.error(error)); } else { // NO REFRESH - monoProcessor.onComplete(); + sinksOne.tryEmitEmpty(); return fallback; } }; diff --git a/sdk/core/azure-core-http-jdk-httpclient/pom.xml b/sdk/core/azure-core-http-jdk-httpclient/pom.xml index fb8ab0051361e..71cc62fba9f40 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/pom.xml +++ b/sdk/core/azure-core-http-jdk-httpclient/pom.xml @@ -89,26 +89,26 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -121,7 +121,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/core/azure-core-http-jdk-httpclient/src/test/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClientTests.java b/sdk/core/azure-core-http-jdk-httpclient/src/test/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClientTests.java index d2e0fddecebb4..eebaadd5fe575 100644 --- a/sdk/core/azure-core-http-jdk-httpclient/src/test/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClientTests.java +++ b/sdk/core/azure-core-http-jdk-httpclient/src/test/java/com/azure/core/http/jdk/httpclient/JdkAsyncHttpClientTests.java @@ -174,7 +174,7 @@ public void testServerShutsDownSocketShouldPushErrorToContentFlowable() socket.close(); return 1; }) - .subscribeOn(Schedulers.elastic()) + .subscribeOn(Schedulers.boundedElastic()) .subscribe(); // latch.await(); @@ -205,7 +205,7 @@ public void testConcurrentRequests() throws NoSuchAlgorithmException { Mono numBytesMono = Flux.range(1, numRequests) .parallel(10) - .runOn(reactor.core.scheduler.Schedulers.newElastic("io", 30)) + .runOn(Schedulers.boundedElastic()) .flatMap(n -> Mono.fromCallable(() -> getResponse(client, "/long")).flatMapMany(response -> { MessageDigest md = md5Digest(); return response.getBody() @@ -221,8 +221,7 @@ public void testConcurrentRequests() throws NoSuchAlgorithmException { // Thread.currentThread().getName())) .map(nbb -> (long) nbb.bb.limit()) .reduce(Long::sum) - .subscribeOn(reactor.core.scheduler.Schedulers.newElastic("io", 30)) - .publishOn(reactor.core.scheduler.Schedulers.newElastic("io", 30)); + .subscribeOn(Schedulers.boundedElastic()); StepVerifier.create(numBytesMono) // .awaitDone(timeoutSeconds, TimeUnit.SECONDS) diff --git a/sdk/core/azure-core-http-netty/pom.xml b/sdk/core/azure-core-http-netty/pom.xml index 6f6709d0e96eb..8a8cc77680a66 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.54.Final + 4.1.59.Final io.netty netty-handler-proxy - 4.1.54.Final + 4.1.59.Final io.netty netty-buffer - 4.1.54.Final + 4.1.59.Final io.netty netty-codec-http - 4.1.54.Final + 4.1.59.Final io.netty netty-codec-http2 - 4.1.54.Final + 4.1.59.Final io.netty netty-transport-native-unix-common - 4.1.54.Final + 4.1.59.Final io.netty netty-transport-native-epoll - 4.1.54.Final + 4.1.59.Final linux-x86_64 io.netty netty-transport-native-kqueue - 4.1.54.Final + 4.1.59.Final osx-x86_64 io.projectreactor.netty reactor-netty - 0.9.15.RELEASE + 1.0.4 @@ -137,26 +137,26 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -169,7 +169,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -184,15 +184,15 @@ - io.netty:netty-buffer:[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-handler:[4.1.54.Final] - io.netty:netty-handler-proxy:[4.1.54.Final] - io.netty:netty-transport-native-unix-common:[4.1.54.Final] - io.netty:netty-transport-native-epoll:[4.1.54.Final] - io.projectreactor.netty:reactor-netty:[0.9.15.RELEASE] - io.netty:netty-transport-native-kqueue:[4.1.54.Final] + io.netty:netty-buffer:[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-handler:[4.1.59.Final] + io.netty:netty-handler-proxy:[4.1.59.Final] + io.netty:netty-transport-native-unix-common:[4.1.59.Final] + io.netty:netty-transport-native-epoll:[4.1.59.Final] + io.projectreactor.netty:reactor-netty:[1.0.4] + io.netty:netty-transport-native-kqueue:[4.1.59.Final] diff --git a/sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilder.java b/sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilder.java index 1d6c7bf51fbe4..f3e697452ddd2 100644 --- a/sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilder.java +++ b/sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilder.java @@ -5,27 +5,33 @@ import com.azure.core.http.ProxyOptions; import com.azure.core.http.netty.implementation.ChallengeHolder; -import com.azure.core.http.netty.implementation.DeferredHttpProxyProvider; +import com.azure.core.http.netty.implementation.HttpProxyExceptionHandler; +import com.azure.core.http.netty.implementation.HttpProxyHandler; import com.azure.core.http.netty.implementation.ReadTimeoutHandler; import com.azure.core.http.netty.implementation.ResponseTimeoutHandler; import com.azure.core.http.netty.implementation.WriteTimeoutHandler; import com.azure.core.util.AuthorizationChallengeHandler; import com.azure.core.util.Configuration; +import com.azure.core.util.CoreUtils; import com.azure.core.util.logging.ClientLogger; import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.resolver.AddressResolverGroup; +import io.netty.resolver.NoopAddressResolverGroup; import reactor.netty.Connection; import reactor.netty.NettyPipeline; -import reactor.netty.channel.BootstrapHandlers; import reactor.netty.http.client.HttpClient; import reactor.netty.resources.ConnectionProvider; -import reactor.netty.tcp.ProxyProvider; +import reactor.netty.transport.ProxyProvider; +import java.net.InetSocketAddress; +import java.net.SocketAddress; import java.nio.ByteBuffer; import java.time.Duration; import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import java.util.regex.Pattern; /** * Builder class responsible for creating instances of {@link com.azure.core.http.HttpClient} backed by Reactor Netty. @@ -63,8 +69,8 @@ public NettyAsyncHttpClientBuilder() { } /** - * Creates a new builder instance, where a builder is capable of generating multiple instances of {@link - * HttpClient} based on the provided Reactor Netty HttpClient. + * Creates a new builder instance, where a builder is capable of generating multiple instances of {@link HttpClient} + * based on the provided Reactor Netty HttpClient. * * {@codesnippet com.azure.core.http.netty.from-existing-http-client} * @@ -81,7 +87,6 @@ public NettyAsyncHttpClientBuilder(HttpClient nettyHttpClient) { * @return A new Netty-backed {@link com.azure.core.http.HttpClient} instance. * @throws IllegalStateException If the builder is configured to use an unknown proxy type. */ - @SuppressWarnings("deprecation") public com.azure.core.http.HttpClient build() { HttpClient nettyHttpClient; if (this.baseHttpClient != null) { @@ -119,37 +124,47 @@ public com.azure.core.http.HttpClient build() { : null; AtomicReference proxyChallengeHolder = useCustomProxyHandler ? new AtomicReference<>() : null; - nettyHttpClient = nettyHttpClient.tcpConfiguration(tcpClient -> { - if (eventLoopGroup != null) { - tcpClient = tcpClient.runOn(eventLoopGroup); - } + if (eventLoopGroup != null) { + nettyHttpClient = nettyHttpClient.runOn(eventLoopGroup); + } - // Proxy configurations are present, setup a proxy in Netty. - if (buildProxyOptions != null) { - // Determine if custom handling will be used, otherwise use Netty's built-in handlers. - if (handler != null) { - /* - * Configure the request Channel to be initialized with a ProxyHandler. The ProxyHandler is the - * first operation in the pipeline as it needs to handle sending a CONNECT request to the proxy - * before any request data is sent. - * - * And in addition to adding the ProxyHandler update the Bootstrap resolver for proxy support. - */ - tcpClient = tcpClient.bootstrap(bootstrap -> BootstrapHandlers.updateResolverForProxySupport( - BootstrapHandlers.updateConfiguration(bootstrap, NettyPipeline.ProxyHandler, - new DeferredHttpProxyProvider(handler, proxyChallengeHolder, buildProxyOptions)))); - } else { - tcpClient = tcpClient.proxy(proxy -> - proxy.type(toReactorNettyProxyType(buildProxyOptions.getType(), logger)) - .address(buildProxyOptions.getAddress()) - .username(buildProxyOptions.getUsername()) - .password(ignored -> buildProxyOptions.getPassword()) - .nonProxyHosts(buildProxyOptions.getNonProxyHosts())); + // Proxy configurations are present, setup a proxy in Netty. + if (buildProxyOptions != null) { + // Determine if custom handling will be used, otherwise use Netty's built-in handlers. + if (handler != null) { + /* + * Configure the request Channel to be initialized with a ProxyHandler. The ProxyHandler is the + * first operation in the pipeline as it needs to handle sending a CONNECT request to the proxy + * before any request data is sent. + * + * And in addition to adding the ProxyHandler update the Bootstrap resolver for proxy support. + */ + Pattern nonProxyHostsPattern = CoreUtils.isNullOrEmpty(buildProxyOptions.getNonProxyHosts()) + ? null + : Pattern.compile(buildProxyOptions.getNonProxyHosts(), Pattern.CASE_INSENSITIVE); + + nettyHttpClient = nettyHttpClient.doOnChannelInit((connectionObserver, channel, socketAddress) -> { + if (shouldApplyProxy(socketAddress, nonProxyHostsPattern)) { + channel.pipeline() + .addFirst(NettyPipeline.ProxyHandler, new HttpProxyHandler(buildProxyOptions.getAddress(), + handler, proxyChallengeHolder)) + .addLast("azure.proxy.exceptionHandler", new HttpProxyExceptionHandler()); + } + }); + + AddressResolverGroup resolver = nettyHttpClient.configuration().resolver(); + if (resolver == null) { + nettyHttpClient.resolver(NoopAddressResolverGroup.INSTANCE); } + } else { + nettyHttpClient = nettyHttpClient.proxy(proxy -> + proxy.type(toReactorNettyProxyType(buildProxyOptions.getType(), logger)) + .address(buildProxyOptions.getAddress()) + .username(buildProxyOptions.getUsername()) + .password(ignored -> buildProxyOptions.getPassword()) + .nonProxyHosts(buildProxyOptions.getNonProxyHosts())); } - - return tcpClient; - }); + } return new NettyAsyncHttpClient(nettyHttpClient, disableBufferCopy); } @@ -340,6 +355,20 @@ private static ProxyProvider.Proxy toReactorNettyProxyType(ProxyOptions.Type azu } } + private static boolean shouldApplyProxy(SocketAddress socketAddress, Pattern nonProxyHostsPattern) { + if (nonProxyHostsPattern == null) { + return true; + } + + if (!(socketAddress instanceof InetSocketAddress)) { + return true; + } + + InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress; + + return !nonProxyHostsPattern.matcher(inetSocketAddress.getHostString()).matches(); + } + /* * Adds the write timeout handler once the request is ready to begin sending. */ diff --git a/sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/implementation/DeferredHttpProxyProvider.java b/sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/implementation/DeferredHttpProxyProvider.java deleted file mode 100644 index 5ccf04d36e8c4..0000000000000 --- a/sdk/core/azure-core-http-netty/src/main/java/com/azure/core/http/netty/implementation/DeferredHttpProxyProvider.java +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.core.http.netty.implementation; - -import com.azure.core.http.ProxyOptions; -import com.azure.core.util.AuthorizationChallengeHandler; -import io.netty.bootstrap.Bootstrap; -import io.netty.channel.Channel; -import reactor.netty.ConnectionObserver; -import reactor.netty.NettyPipeline; - -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.BiConsumer; -import java.util.function.Function; -import java.util.regex.Pattern; - -/** - * This class defers supplying a channel pipeline with a proxy handler. - */ -public class DeferredHttpProxyProvider implements Function> { - private final AuthorizationChallengeHandler challengeHandler; - private final AtomicReference proxyChallengeHolderReference; - private final InetSocketAddress proxyAddress; - private final String username; - private final String password; - private final String nonProxyHosts; - - private final Pattern nonProxyHostsPattern; - - public DeferredHttpProxyProvider(AuthorizationChallengeHandler challengeHandler, - AtomicReference proxyChallengeHolderReference, ProxyOptions proxyOptions) { - this.challengeHandler = challengeHandler; - this.proxyChallengeHolderReference = proxyChallengeHolderReference; - this.proxyAddress = proxyOptions.getAddress(); - this.username = proxyOptions.getUsername(); - this.password = proxyOptions.getPassword(); - this.nonProxyHosts = proxyOptions.getNonProxyHosts(); - - this.nonProxyHostsPattern = (nonProxyHosts == null) - ? null - : Pattern.compile(nonProxyHosts, Pattern.CASE_INSENSITIVE); - } - - @Override - public BiConsumer apply(Bootstrap bootstrap) { - return ((connectionObserver, channel) -> { - if (shouldApplyProxy(bootstrap.config().remoteAddress())) { - channel.pipeline() - .addFirst(NettyPipeline.ProxyHandler, new HttpProxyHandler(proxyAddress, challengeHandler, - proxyChallengeHolderReference)) - .addLast("azure.proxy.exceptionHandler", new HttpProxyExceptionHandler()); - } - }); - } - - private boolean shouldApplyProxy(SocketAddress socketAddress) { - if (nonProxyHostsPattern == null) { - return true; - } - - if (!(socketAddress instanceof InetSocketAddress)) { - return true; - } - - InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress; - - return !nonProxyHostsPattern.matcher(inetSocketAddress.getHostString()).matches(); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - - if (!(o instanceof DeferredHttpProxyProvider)) { - return false; - } - - DeferredHttpProxyProvider other = (DeferredHttpProxyProvider) o; - - return Objects.equals(username, other.username) - && Objects.equals(password, other.password) - && Objects.equals(proxyAddress, other.proxyAddress) - && Objects.equals(nonProxyHosts, other.nonProxyHosts); - } - - @Override - public int hashCode() { - return Objects.hash(proxyAddress, password, proxyAddress, nonProxyHosts); - } -} diff --git a/sdk/core/azure-core-http-netty/src/main/java/module-info.java b/sdk/core/azure-core-http-netty/src/main/java/module-info.java index 2ee5ace88307e..fc90485144a29 100644 --- a/sdk/core/azure-core-http-netty/src/main/java/module-info.java +++ b/sdk/core/azure-core-http-netty/src/main/java/module-info.java @@ -3,7 +3,6 @@ module com.azure.http.netty { requires transitive com.azure.core; - requires reactor.netty; requires io.netty.buffer; requires io.netty.codec; requires io.netty.codec.http; @@ -12,6 +11,9 @@ requires io.netty.handler.proxy; requires io.netty.resolver; requires io.netty.transport; + requires reactor.netty; + requires reactor.netty.core; + requires reactor.netty.http; exports com.azure.core.http.netty; diff --git a/sdk/core/azure-core-http-netty/src/samples/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilderJavaDocCodeSnippets.java b/sdk/core/azure-core-http-netty/src/samples/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilderJavaDocCodeSnippets.java index f457f861564c9..86a30a579bd83 100644 --- a/sdk/core/azure-core-http-netty/src/samples/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilderJavaDocCodeSnippets.java +++ b/sdk/core/azure-core-http-netty/src/samples/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilderJavaDocCodeSnippets.java @@ -62,7 +62,7 @@ public void fromExistingReactorNettyClient() { // BEGIN: com.azure.core.http.netty.from-existing-http-client // Creates a reactor-netty client with netty logging enabled. reactor.netty.http.client.HttpClient baseHttpClient = reactor.netty.http.client.HttpClient.create() - .tcpConfiguration(tcp -> tcp.wiretap(TcpClient.class.getName(), LogLevel.INFO)); + .wiretap(TcpClient.class.getName(), LogLevel.INFO); // Create an HttpClient based on above reactor-netty client and configure EventLoop count. HttpClient client = new NettyAsyncHttpClientBuilder(baseHttpClient) .eventLoopGroup(new NioEventLoopGroup(5)) diff --git a/sdk/core/azure-core-http-netty/src/test/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilderTests.java b/sdk/core/azure-core-http-netty/src/test/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilderTests.java index 97558418bf9ad..6b8f567068f72 100644 --- a/sdk/core/azure-core-http-netty/src/test/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilderTests.java +++ b/sdk/core/azure-core-http-netty/src/test/java/com/azure/core/http/netty/NettyAsyncHttpClientBuilderTests.java @@ -27,7 +27,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import reactor.netty.channel.BootstrapHandlers; import reactor.netty.http.client.HttpClient; import reactor.netty.resources.ConnectionProvider; import reactor.test.StepVerifier; @@ -125,7 +124,8 @@ public void startingWithNullClientThrows() { */ @Test public void buildWithConnectionProvider() { - ConnectionProvider connectionProvider = bootstrap -> { + ConnectionProvider connectionProvider = (transportConfig, connectionObserver, supplier, + addressResolverGroup) -> { throw new UnsupportedOperationException("Bad connection provider"); }; @@ -342,14 +342,12 @@ private static Stream buildWithConfigurationProxySupplier() { return arguments.stream(); } - @SuppressWarnings("deprecation") private static HttpClient nettyHttpClientWithProxyValidation(boolean shouldHaveProxy, ProxyOptions.Type proxyType, boolean isAuthenticated) { TestProxyValidator validator = new TestProxyValidator(shouldHaveProxy, proxyType, isAuthenticated); - return HttpClient.create().tcpConfiguration(tcpClient -> tcpClient - .bootstrap(bootstrap -> BootstrapHandlers.updateConfiguration(bootstrap, "TestProxyHandler", - (connectionObserver, channel) -> channel.pipeline().addFirst("TestProxyHandler", validator)))); + return HttpClient.create().doOnChannelInit((connectionObserver, channel, socketAddress) -> + channel.pipeline().addFirst("TestProxyHandler", validator)); } private static final class TestProxyValidator extends ChannelDuplexHandler { diff --git a/sdk/core/azure-core-http-netty/src/test/java/com/azure/core/http/netty/implementation/DeferredHttpProxyProviderTests.java b/sdk/core/azure-core-http-netty/src/test/java/com/azure/core/http/netty/implementation/DeferredHttpProxyProviderTests.java deleted file mode 100644 index 17c4b8a70ec14..0000000000000 --- a/sdk/core/azure-core-http-netty/src/test/java/com/azure/core/http/netty/implementation/DeferredHttpProxyProviderTests.java +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -package com.azure.core.http.netty.implementation; - -import com.azure.core.http.ProxyOptions; -import com.azure.core.util.AuthorizationChallengeHandler; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import java.net.InetSocketAddress; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * Tests {@link DeferredHttpProxyProvider}. - */ -public class DeferredHttpProxyProviderTests { - @ParameterizedTest - @MethodSource("testEqualsSupplier") - public void testEquals(DeferredHttpProxyProvider provider, Object other, boolean expected) { - assertEquals(expected, provider.equals(other)); - } - - private static Stream testEqualsSupplier() { - AuthorizationChallengeHandler handler1 = new AuthorizationChallengeHandler("1", "1"); - AuthorizationChallengeHandler handler2 = new AuthorizationChallengeHandler("2", "2"); - - ProxyOptions options1 = new ProxyOptions(ProxyOptions.Type.HTTP, new InetSocketAddress("localhost", 8888)) - .setCredentials("1", "1"); - ProxyOptions options2 = new ProxyOptions(ProxyOptions.Type.HTTP, new InetSocketAddress("localhost", 8080)) - .setCredentials("2", "2"); - - AtomicReference challengeHolder = new AtomicReference<>(); - - DeferredHttpProxyProvider provider1 = new DeferredHttpProxyProvider(handler1, challengeHolder, options1); - DeferredHttpProxyProvider provider2 = new DeferredHttpProxyProvider(handler2, challengeHolder, options2); - return Stream.of( - // Other is itself. - Arguments.of(provider1, provider1, true), - Arguments.of(provider2, provider2, true), - - // Other is a different type. - Arguments.of(provider1, 1, false), - Arguments.of(provider2, 2, false), - - // Other has different values. - Arguments.of(provider1, provider2, false), - Arguments.of(provider2, provider1, false), - - // Other has same values. - Arguments.of(provider1, new DeferredHttpProxyProvider(handler1, challengeHolder, options1), true), - Arguments.of(provider2, new DeferredHttpProxyProvider(handler2, challengeHolder, options2), true) - ); - } -} diff --git a/sdk/core/azure-core-http-okhttp/pom.xml b/sdk/core/azure-core-http-okhttp/pom.xml index 9efc7169b7ae3..b248ca5098806 100644 --- a/sdk/core/azure-core-http-okhttp/pom.xml +++ b/sdk/core/azure-core-http-okhttp/pom.xml @@ -93,26 +93,26 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -125,7 +125,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/core/azure-core-http-okhttp/src/test/java/com/azure/core/http/okhttp/OkHttpAsyncHttpClientTests.java b/sdk/core/azure-core-http-okhttp/src/test/java/com/azure/core/http/okhttp/OkHttpAsyncHttpClientTests.java index 4e61e2fa28128..714abd0994e3f 100644 --- a/sdk/core/azure-core-http-okhttp/src/test/java/com/azure/core/http/okhttp/OkHttpAsyncHttpClientTests.java +++ b/sdk/core/azure-core-http-okhttp/src/test/java/com/azure/core/http/okhttp/OkHttpAsyncHttpClientTests.java @@ -180,7 +180,7 @@ public void testServerShutsDownSocketShouldPushErrorToContentFlowable() { // kill the socket with HTTP response body incomplete socket.close(); return 1; - }).subscribeOn(Schedulers.elastic()).subscribe(); + }).subscribeOn(Schedulers.boundedElastic()).subscribe(); // latch.await(); HttpClient client = new OkHttpAsyncHttpClientBuilder().build(); @@ -209,7 +209,7 @@ public void testConcurrentRequests() throws NoSuchAlgorithmException { Mono numBytesMono = Flux.range(1, numRequests) .parallel(10) - .runOn(reactor.core.scheduler.Schedulers.newElastic("io", 30)) + .runOn(Schedulers.boundedElastic()) .flatMap(n -> Mono.fromCallable(() -> getResponse(client, "/long")).flatMapMany(response -> { MessageDigest md = md5Digest(); return response.getBody() @@ -225,8 +225,7 @@ public void testConcurrentRequests() throws NoSuchAlgorithmException { // Thread.currentThread().getName())) .map(nbb -> (long) nbb.bb.limit()) .reduce(Long::sum) - .subscribeOn(reactor.core.scheduler.Schedulers.newElastic("io", 30)) - .publishOn(reactor.core.scheduler.Schedulers.newElastic("io", 30)); + .subscribeOn(Schedulers.boundedElastic()); StepVerifier.create(numBytesMono) // .awaitDone(timeoutSeconds, TimeUnit.SECONDS) diff --git a/sdk/core/azure-core-management/pom.xml b/sdk/core/azure-core-management/pom.xml index 977f3049fcebe..fb64fbd5b5078 100644 --- a/sdk/core/azure-core-management/pom.xml +++ b/sdk/core/azure-core-management/pom.xml @@ -65,19 +65,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -90,7 +90,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/polling/LROPollerTests.java b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/polling/LROPollerTests.java index df4d5b5ec8dfc..8165bbe762ac3 100644 --- a/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/polling/LROPollerTests.java +++ b/sdk/core/azure-core-management/src/test/java/com/azure/core/management/implementation/polling/LROPollerTests.java @@ -67,13 +67,16 @@ public class LROPollerTests { private static final Duration POLLING_DURATION = Duration.ofMillis(100); + private AutoCloseable openMocks; + @BeforeEach public void beforeTest() { - MockitoAnnotations.initMocks(this); + this.openMocks = MockitoAnnotations.openMocks(this); } @AfterEach - public void afterTest() { + public void afterTest() throws Exception { + this.openMocks.close(); Mockito.framework().clearInlineMocks(); } @@ -815,7 +818,7 @@ public void lroContextSubscriberContext() { FooWithProvisioningState.class, POLLING_DURATION, newLroInitFunction(client)); - lroFlux = lroFlux.subscriberContext(context -> context.put("key1", "value1")); + lroFlux = lroFlux.contextWrite(context -> context.put("key1", "value1")); FooWithProvisioningState result = lroFlux .blockLast() @@ -854,7 +857,7 @@ public void lroContext() { FooWithProvisioningState.class, FooWithProvisioningState.class, POLLING_DURATION, - newLroInitFunction(client).subscriberContext(context -> context.put("key1", "value1")), + newLroInitFunction(client).contextWrite(context -> context.put("key1", "value1")), new Context("key1", "value1")); FooWithProvisioningState result = lroFlux diff --git a/sdk/core/azure-core-serializer-avro-apache/pom.xml b/sdk/core/azure-core-serializer-avro-apache/pom.xml index f43afff38526f..b93c4fea2bed7 100644 --- a/sdk/core/azure-core-serializer-avro-apache/pom.xml +++ b/sdk/core/azure-core-serializer-avro-apache/pom.xml @@ -75,25 +75,25 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/core/azure-core-serializer-avro-jackson/pom.xml b/sdk/core/azure-core-serializer-avro-jackson/pom.xml index d5a4c3d5738da..0a209f90d1107 100644 --- a/sdk/core/azure-core-serializer-avro-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-avro-jackson/pom.xml @@ -75,25 +75,25 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/core/azure-core-serializer-json-gson/pom.xml b/sdk/core/azure-core-serializer-json-gson/pom.xml index 589bec43f04d0..f859e4940d4a0 100644 --- a/sdk/core/azure-core-serializer-json-gson/pom.xml +++ b/sdk/core/azure-core-serializer-json-gson/pom.xml @@ -70,31 +70,31 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test org.mockito mockito-core - 3.3.3 + 3.6.0 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/core/azure-core-serializer-json-jackson/pom.xml b/sdk/core/azure-core-serializer-json-jackson/pom.xml index 7e065aaaafba6..e51d681d44663 100644 --- a/sdk/core/azure-core-serializer-json-jackson/pom.xml +++ b/sdk/core/azure-core-serializer-json-jackson/pom.xml @@ -64,31 +64,31 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test org.mockito mockito-core - 3.3.3 + 3.6.0 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/core/azure-core-test/pom.xml b/sdk/core/azure-core-test/pom.xml index 1fda405ce84fc..ad5c2adc1c545 100644 --- a/sdk/core/azure-core-test/pom.xml +++ b/sdk/core/azure-core-test/pom.xml @@ -43,24 +43,24 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -107,9 +107,9 @@ - io.projectreactor:reactor-test:[3.3.12.RELEASE] + io.projectreactor:reactor-test:[3.4.3] - org.junit.jupiter:junit-jupiter-api:[5.6.3] + org.junit.jupiter:junit-jupiter-api:[5.7.1] diff --git a/sdk/core/azure-core-tracing-opentelemetry/pom.xml b/sdk/core/azure-core-tracing-opentelemetry/pom.xml index 96934f67f8c18..128fbed07717c 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/pom.xml +++ b/sdk/core/azure-core-tracing-opentelemetry/pom.xml @@ -65,19 +65,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryHttpPolicy.java b/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryHttpPolicy.java index df25cb25a0533..16b121db54bfb 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryHttpPolicy.java +++ b/sdk/core/azure-core-tracing-opentelemetry/src/main/java/com/azure/core/tracing/opentelemetry/OpenTelemetryHttpPolicy.java @@ -26,6 +26,7 @@ import reactor.core.publisher.Mono; import reactor.core.publisher.Signal; import reactor.util.context.Context; +import reactor.util.context.ContextView; import java.util.Optional; @@ -95,7 +96,7 @@ public Mono process(HttpPipelineCallContext context, HttpPipelineN // run the next policy and handle success and error return next.process() .doOnEach(OpenTelemetryHttpPolicy::handleResponse) - .subscriberContext(Context.of("TRACING_SPAN", span, "REQUEST", request)); + .contextWrite(Context.of("TRACING_SPAN", span, "REQUEST", request)); } private static void addSpanRequestAttributes(Span span, HttpRequest request, @@ -130,7 +131,7 @@ private static void handleResponse(Signal signal) { } // Get the context that was added to the mono, this will contain the information needed to end the span. - Context context = signal.getContext(); + ContextView context = signal.getContextView(); Optional tracingSpan = context.getOrEmpty("TRACING_SPAN"); if (!tracingSpan.isPresent()) { diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/samples/java/com/azure/core/tracing/opentelemetry/AsyncListKeyVaultSecretsLoggingExporterSample.java b/sdk/core/azure-core-tracing-opentelemetry/src/samples/java/com/azure/core/tracing/opentelemetry/AsyncListKeyVaultSecretsLoggingExporterSample.java index bcbc8b2b33002..cc3ef8ba6db59 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/samples/java/com/azure/core/tracing/opentelemetry/AsyncListKeyVaultSecretsLoggingExporterSample.java +++ b/sdk/core/azure-core-tracing-opentelemetry/src/samples/java/com/azure/core/tracing/opentelemetry/AsyncListKeyVaultSecretsLoggingExporterSample.java @@ -70,12 +70,12 @@ private static void doClientWork() { Context traceContext = Context.of(PARENT_SPAN_KEY, Span.current()); secretAsyncClient.setSecret(new KeyVaultSecret("Secret1", "password1")) - .subscriberContext(traceContext) + .contextWrite(traceContext) .subscribe(secretResponse -> System.out.printf("Secret with name: %s%n", secretResponse.getName())); secretAsyncClient.listPropertiesOfSecrets() - .subscriberContext(traceContext) + .contextWrite(traceContext) .doOnNext(secretBase -> secretAsyncClient.getSecret(secretBase.getName()) - .subscriberContext(traceContext) + .contextWrite(traceContext) .doOnNext(secret -> System.out.printf("Secret with name: %s%n", secret.getName()))) .blockLast(); diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/implementation/AmqpTraceUtilTest.java b/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/implementation/AmqpTraceUtilTest.java index 8c2822a7fdfb4..77f7efca1716a 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/implementation/AmqpTraceUtilTest.java +++ b/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/implementation/AmqpTraceUtilTest.java @@ -4,6 +4,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.StatusCode; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -18,9 +19,16 @@ public class AmqpTraceUtilTest { @Mock private Span parentSpan; + private AutoCloseable openMocks; + @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + this.openMocks = MockitoAnnotations.openMocks(this); + } + + @AfterEach + public void tearDown() throws Exception { + this.openMocks.close(); } @Test diff --git a/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/implementation/HttpTraceUtilTest.java b/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/implementation/HttpTraceUtilTest.java index ee7b0ed08be63..191358bface0d 100644 --- a/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/implementation/HttpTraceUtilTest.java +++ b/sdk/core/azure-core-tracing-opentelemetry/src/test/java/com/azure/core/tracing/opentelemetry/implementation/HttpTraceUtilTest.java @@ -5,6 +5,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.sdk.trace.ReadableSpan; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -21,9 +22,16 @@ public class HttpTraceUtilTest { @Mock private Span parentSpan; + private AutoCloseable openMocks; + @BeforeEach public void setup() { - MockitoAnnotations.initMocks(this); + this.openMocks = MockitoAnnotations.openMocks(this); + } + + @AfterEach + public void tearDown() throws Exception { + this.openMocks.close(); } @Test diff --git a/sdk/core/azure-core/pom.xml b/sdk/core/azure-core/pom.xml index b62fb35727902..1805a4c14efec 100644 --- a/sdk/core/azure-core/pom.xml +++ b/sdk/core/azure-core/pom.xml @@ -99,35 +99,35 @@ io.projectreactor reactor-core - 3.3.12.RELEASE + 3.4.3 io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test io.netty netty-tcnative-boringssl-static - 2.0.35.Final + 2.0.36.Final org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -139,7 +139,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -188,8 +188,8 @@ - io.netty:netty-tcnative-boringssl-static:[2.0.35.Final] - io.projectreactor:reactor-core:[3.3.12.RELEASE] + 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.1] com.fasterxml.jackson.core:jackson-core:[2.12.1] com.fasterxml.jackson.core:jackson-databind:[2.12.1] diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credential/SimpleTokenCache.java b/sdk/core/azure-core/src/main/java/com/azure/core/credential/SimpleTokenCache.java index cfba9ace91bc6..445078bfc2217 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/credential/SimpleTokenCache.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/credential/SimpleTokenCache.java @@ -5,7 +5,7 @@ import com.azure.core.util.logging.ClientLogger; import reactor.core.publisher.Mono; -import reactor.core.publisher.MonoProcessor; +import reactor.core.publisher.Sinks; import java.time.Duration; import java.time.OffsetDateTime; @@ -21,7 +21,7 @@ public class SimpleTokenCache { private static final Duration REFRESH_DELAY = Duration.ofSeconds(30); // the offset before token expiry to attempt proactive token refresh private static final Duration REFRESH_OFFSET = Duration.ofMinutes(5); - private final AtomicReference> wip; + private final AtomicReference> wip; private volatile AccessToken cache; private volatile OffsetDateTime nextTokenRefresh = OffsetDateTime.now(); private final Supplier> tokenSupplier; @@ -47,8 +47,8 @@ public SimpleTokenCache(Supplier> tokenSupplier) { public Mono getToken() { return Mono.defer(() -> { try { - if (wip.compareAndSet(null, MonoProcessor.create())) { - final MonoProcessor monoProcessor = wip.get(); + if (wip.compareAndSet(null, Sinks.one())) { + final Sinks.One sinksOne = wip.get(); OffsetDateTime now = OffsetDateTime.now(); Mono tokenRefresh; Mono fallback; @@ -88,8 +88,7 @@ public Mono getToken() { if (signal.isOnNext() && accessToken != null) { // SUCCESS logger.info(refreshLog(cache, now, "Acquired a new access token")); cache = accessToken; - monoProcessor.onNext(accessToken); - monoProcessor.onComplete(); + sinksOne.tryEmitValue(accessToken); nextTokenRefresh = OffsetDateTime.now().plus(REFRESH_DELAY); return Mono.just(accessToken); } else if (signal.isOnError() && error != null) { // ERROR @@ -97,24 +96,24 @@ public Mono getToken() { nextTokenRefresh = OffsetDateTime.now().plus(REFRESH_DELAY); return fallback.switchIfEmpty(Mono.error(error)); } else { // NO REFRESH - monoProcessor.onComplete(); + sinksOne.tryEmitEmpty(); return fallback; } }) - .doOnError(monoProcessor::onError) + .doOnError(sinksOne::tryEmitError) .doOnTerminate(() -> wip.set(null)); } else if (cache != null && !cache.isExpired()) { // another thread might be refreshing the token proactively, but the current token is still valid return Mono.just(cache); } else { // another thread is definitely refreshing the expired token - MonoProcessor monoProcessor = wip.get(); - if (monoProcessor == null) { + Sinks.One sinksOne = wip.get(); + if (sinksOne == null) { // the refreshing thread has finished return Mono.just(cache); } else { // wait for refreshing thread to finish but defer to updated cache in case just missed onNext() - return monoProcessor.switchIfEmpty(Mono.defer(() -> Mono.just(cache))); + return sinksOne.asMono().switchIfEmpty(Mono.defer(() -> Mono.just(cache))); } } } catch (Throwable t) { diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java index 2a80d842212f1..fcbb6292ee8cc 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/http/rest/RestProxy.java @@ -36,6 +36,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Signal; +import reactor.util.context.ContextView; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -501,7 +502,7 @@ private Object handleRestReturnType(final Mono asyncHttpDec final Mono asyncExpectedResponse = ensureExpectedStatus(asyncHttpDecodedResponse, methodParser) .doOnEach(RestProxy::endTracingSpan) - .subscriberContext(reactor.util.context.Context.of("TRACING_CONTEXT", context)); + .contextWrite(reactor.util.context.Context.of("TRACING_CONTEXT", context)); final Object result; if (TypeUtil.isTypeOrSubTypeOf(returnType, Mono.class)) { @@ -545,7 +546,7 @@ private static void endTracingSpan(Signal signal) { } // Get the context that was added to the mono, this will contain the information needed to end the span. - reactor.util.context.Context context = signal.getContext(); + ContextView context = signal.getContextView(); Optional tracingContext = context.getOrEmpty("TRACING_CONTEXT"); boolean disableTracing = context.getOrDefault(Tracer.DISABLE_TRACING_KEY, false); diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/FluxUtil.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/FluxUtil.java index 2aa9627f33b2d..7c512b0cbebda 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/FluxUtil.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/util/FluxUtil.java @@ -16,6 +16,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Operators; +import reactor.util.context.ContextView; import java.io.IOException; import java.io.InputStream; @@ -88,8 +89,8 @@ public static Mono collectBytesInByteBufferStream(Flux strea * Collects ByteBuffers returned in a network response into a byte array. *

* The {@code headers} are inspected for containing an {@code Content-Length} which determines if a size hinted - * collection, {@link #collectBytesInByteBufferStream(Flux, int)}, or default collection, - * {@link #collectBytesInByteBufferStream(Flux)}, will be used. + * collection, {@link #collectBytesInByteBufferStream(Flux, int)}, or default collection, {@link + * #collectBytesInByteBufferStream(Flux)}, will be used. * * @param stream A network response ByteBuffer stream. * @param headers The HTTP headers of the response. @@ -201,7 +202,7 @@ public static Flux toFluxByteBuffer(InputStream inputStream, int chu } /** - * This method converts the incoming {@code subscriberContext} from {@link reactor.util.context.Context Reactor + * This method converts the incoming {@code deferContextual} from {@link reactor.util.context.Context Reactor * Context} to {@link Context Azure Context} and calls the given lambda function with this context and returns a * single entity of type {@code T} *

@@ -220,7 +221,7 @@ public static Mono withContext(Function> serviceCall) { } /** - * This method converts the incoming {@code subscriberContext} from {@link reactor.util.context.Context Reactor + * This method converts the incoming {@code deferContextual} from {@link reactor.util.context.Context Reactor * Context} to {@link Context Azure Context}, adds the specified context attributes and calls the given lambda * function with this context and returns a single entity of type {@code T} *

@@ -235,22 +236,20 @@ public static Mono withContext(Function> serviceCall) { */ public static Mono withContext(Function> serviceCall, Map contextAttributes) { - return Mono.subscriberContext() - .map(context -> { - final Context[] azureContext = new Context[]{Context.NONE}; + return Mono.deferContextual(context -> { + final Context[] azureContext = new Context[]{Context.NONE}; - if (!CoreUtils.isNullOrEmpty(contextAttributes)) { - contextAttributes.forEach((key, value) -> azureContext[0] = azureContext[0].addData(key, value)); - } + if (!CoreUtils.isNullOrEmpty(contextAttributes)) { + contextAttributes.forEach((key, value) -> azureContext[0] = azureContext[0].addData(key, value)); + } - if (!context.isEmpty()) { - context.stream().forEach(entry -> - azureContext[0] = azureContext[0].addData(entry.getKey(), entry.getValue())); - } + if (!context.isEmpty()) { + context.stream().forEach(entry -> + azureContext[0] = azureContext[0].addData(entry.getKey(), entry.getValue())); + } - return azureContext[0]; - }) - .flatMap(serviceCall); + return serviceCall.apply(azureContext[0]); + }); } /** @@ -301,7 +300,7 @@ public static PagedFlux pagedFluxError(ClientLogger logger, RuntimeExcept } /** - * This method converts the incoming {@code subscriberContext} from {@link reactor.util.context.Context Reactor + * This method converts the incoming {@code deferContextual} from {@link reactor.util.context.Context Reactor * Context} to {@link Context Azure Context} and calls the given lambda function with this context and returns a * collection of type {@code T} *

@@ -316,9 +315,7 @@ public static PagedFlux pagedFluxError(ClientLogger logger, RuntimeExcept * @return The response from service call */ public static Flux fluxContext(Function> serviceCall) { - return Mono.subscriberContext() - .map(FluxUtil::toAzureContext) - .flatMapMany(serviceCall); + return Flux.deferContextual(context -> serviceCall.apply(toAzureContext(context))); } /** @@ -328,7 +325,7 @@ public static Flux fluxContext(Function> serviceCall) { * @param context The reactor context * @return The azure context */ - private static Context toAzureContext(reactor.util.context.Context context) { + private static Context toAzureContext(ContextView context) { final Context[] azureContext = new Context[]{Context.NONE}; if (!context.isEmpty()) { diff --git a/sdk/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java b/sdk/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java index 92b7f32fe978b..a6ca696a7c0c3 100644 --- a/sdk/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java +++ b/sdk/core/azure-core/src/test/java/com/azure/core/http/rest/PagedFluxTest.java @@ -191,7 +191,7 @@ public void testPagedFluxWithContext() throws Exception { CountDownLatch multiPageLatch = new CountDownLatch(2); pagedFlux .byPage() - .subscriberContext(Context.of("hello", "context")) + .contextWrite(Context.of("hello", "context")) .subscribe(pagedResponse -> assertTrue(pagedResponse instanceof PagedResponse)); boolean completed = singlePageLatch.await(1, TimeUnit.SECONDS); @@ -219,7 +219,7 @@ public void testPagedFluxWithContext() throws Exception { pagedFlux .byPage() - .subscriberContext(Context.of("hello", "context")) + .contextWrite(Context.of("hello", "context")) .subscribe(pagedResponse -> assertTrue(pagedResponse instanceof PagedResponse)); completed = multiPageLatch.await(1, TimeUnit.SECONDS); assertTrue(completed); diff --git a/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoderTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoderTests.java index 4bdc4e05a0ec4..ee6b918b84e47 100644 --- a/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoderTests.java +++ b/sdk/core/azure-core/src/test/java/com/azure/core/implementation/serializer/HttpResponseBodyDecoderTests.java @@ -61,13 +61,16 @@ public class HttpResponseBodyDecoderTests { private static final HttpRequest GET_REQUEST = new HttpRequest(HttpMethod.GET, "https://localhost"); private static final HttpRequest HEAD_REQUEST = new HttpRequest(HttpMethod.HEAD, "https://localhost"); + private AutoCloseable openMocks; + @BeforeEach public void prepareForMocking() { - MockitoAnnotations.initMocks(this); + this.openMocks = MockitoAnnotations.openMocks(this); } @AfterEach - public void clearMocks() { + public void clearMocks() throws Exception { + openMocks.close(); Mockito.framework().clearInlineMocks(); } diff --git a/sdk/core/azure-core/src/test/java/com/azure/core/util/AuthorizationChallengeHandlerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/util/AuthorizationChallengeHandlerTests.java index a8b97b7947315..d5d1c47c12f19 100644 --- a/sdk/core/azure-core/src/test/java/com/azure/core/util/AuthorizationChallengeHandlerTests.java +++ b/sdk/core/azure-core/src/test/java/com/azure/core/util/AuthorizationChallengeHandlerTests.java @@ -4,6 +4,7 @@ package com.azure.core.util; import com.azure.core.http.HttpMethod; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -46,9 +47,16 @@ public class AuthorizationChallengeHandlerTests { private static final String EXPECTED_BASIC = "Basic " + Base64.getEncoder() .encodeToString(String.format("%s:%s", DEFAULT_USERNAME, DEFAULT_PASSWORD).getBytes(StandardCharsets.UTF_8)); + private AutoCloseable openMocks; + @BeforeEach public void prepareForTest() { - MockitoAnnotations.initMocks(this); + this.openMocks = MockitoAnnotations.openMocks(this); + } + + @AfterEach + public void clearMocks() throws Exception { + openMocks.close(); } /** diff --git a/sdk/core/azure-core/src/test/java/com/azure/core/util/FluxUtilTest.java b/sdk/core/azure-core/src/test/java/com/azure/core/util/FluxUtilTest.java index fe7d0fa7352c7..d469b7f74d7b9 100644 --- a/sdk/core/azure-core/src/test/java/com/azure/core/util/FluxUtilTest.java +++ b/sdk/core/azure-core/src/test/java/com/azure/core/util/FluxUtilTest.java @@ -46,7 +46,7 @@ public class FluxUtilTest { @Test public void testCallWithContextGetSingle() { String response = getSingle() - .subscriberContext(reactor.util.context.Context.of("FirstName", "Foo", "LastName", "Bar")) + .contextWrite(reactor.util.context.Context.of("FirstName", "Foo", "LastName", "Bar")) .block(); assertEquals("Hello, Foo Bar", response); } @@ -56,7 +56,7 @@ public void testCallWithContextGetCollection() { List expectedLines = Arrays.asList("Hello,", "Foo", "Bar"); List actualLines = new ArrayList<>(); getCollection() - .subscriberContext(reactor.util.context.Context.of("FirstName", "Foo", "LastName", "Bar")) + .contextWrite(reactor.util.context.Context.of("FirstName", "Foo", "LastName", "Bar")) .doOnNext(actualLines::add) .subscribe(); assertEquals(expectedLines, actualLines); @@ -65,7 +65,7 @@ public void testCallWithContextGetCollection() { @Test public void testCallWithDefaultContextGetSingle() { String response = getSingleWithContextAttributes() - .subscriberContext(reactor.util.context.Context.of("FirstName", "Foo")) + .contextWrite(reactor.util.context.Context.of("FirstName", "Foo")) .block(); assertEquals("Hello, Foo additionalContextValue", response); } diff --git a/sdk/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java b/sdk/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java index 3f7ca34106cf4..6e8a77c6d76dc 100644 --- a/sdk/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java +++ b/sdk/core/azure-core/src/test/java/com/azure/core/util/polling/PollerTests.java @@ -53,13 +53,16 @@ public class PollerTests { @Mock private BiFunction, PollResponse, Mono> cancelOperation; + private AutoCloseable openMocks; + @BeforeEach public void beforeTest() { - MockitoAnnotations.initMocks(this); + this.openMocks = MockitoAnnotations.openMocks(this); } @AfterEach - public void afterTest() { + public void afterTest() throws Exception { + openMocks.close(); Mockito.framework().clearInlineMocks(); } diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index af7fbf750e287..9f20c6e80ecb5 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -79,13 +79,13 @@ Licensed under the MIT License. io.micrometer micrometer-registry-azure-monitor - 1.5.6 + 1.6.1 io.micrometer micrometer-registry-graphite - 1.5.6 + 1.6.1 @@ -115,13 +115,13 @@ Licensed under the MIT License. org.apache.commons commons-lang3 - 3.10 + 3.11 org.assertj assertj-core - 3.16.1 + 3.18.1 test @@ -228,9 +228,9 @@ Licensed under the MIT License. com.google.guava:guava:[25.0-jre] io.dropwizard.metrics:metrics-graphite:[4.1.0] io.dropwizard.metrics:metrics-jvm:[4.1.0] - io.micrometer:micrometer-registry-azure-monitor:[1.5.6] - io.micrometer:micrometer-registry-graphite:[1.5.6] - org.apache.commons:commons-lang3:[3.10] + io.micrometer:micrometer-registry-azure-monitor:[1.6.1] + io.micrometer:micrometer-registry-graphite:[1.6.1] + org.apache.commons:commons-lang3:[3.11] org.apache.logging.log4j:log4j-api:[2.13.3] org.apache.logging.log4j:log4j-core:[2.13.3] org.apache.logging.log4j:log4j-slf4j-impl:[2.13.3] diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml index 6de2345d36d43..389ad4a875f0e 100644 --- a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml @@ -89,7 +89,7 @@ Licensed under the MIT License. org.assertj assertj-core - 3.16.1 + 3.18.1 test @@ -182,9 +182,9 @@ Licensed under the MIT License. com.google.guava:guava:[25.0-jre] io.dropwizard.metrics:metrics-graphite:[4.1.0] io.dropwizard.metrics:metrics-jvm:[4.1.0] - io.micrometer:micrometer-registry-azure-monitor:[1.5.6] - io.micrometer:micrometer-registry-graphite:[1.5.6] - org.apache.commons:commons-lang3:[3.10] + io.micrometer:micrometer-registry-azure-monitor:[1.6.1] + io.micrometer:micrometer-registry-graphite:[1.6.1] + org.apache.commons:commons-lang3:[3.11] org.apache.logging.log4j:log4j-api:[2.13.3] org.apache.logging.log4j:log4j-core:[2.13.3] org.apache.logging.log4j:log4j-slf4j-impl:[2.13.3] diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index 19c8d884a12fe..a2b2f76fa8afd 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -95,7 +95,7 @@ Licensed under the MIT License. org.assertj assertj-core - 3.16.1 + 3.18.1 test @@ -130,7 +130,7 @@ Licensed under the MIT License. io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -144,7 +144,7 @@ Licensed under the MIT License. org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index b31abb778cc4b..7bfa57223454c 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -65,7 +65,7 @@ Licensed under the MIT License. com.azure azure-core - 1.13.0 + 1.14.0-beta.1 com.azure @@ -77,7 +77,7 @@ Licensed under the MIT License. com.azure azure-core-http-netty - 1.8.0 + 1.9.0-beta.1 com.azure @@ -149,7 +149,7 @@ Licensed under the MIT License. org.assertj assertj-core - 3.16.1 + 3.18.1 test @@ -190,13 +190,13 @@ Licensed under the MIT License. io.micrometer micrometer-core - 1.5.6 + 1.6.1 io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -274,7 +274,7 @@ Licensed under the MIT License. com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.1] com.fasterxml.jackson.module:jackson-module-afterburner:[2.12.1] io.dropwizard.metrics:metrics-core:[4.1.0] - io.micrometer:micrometer-core:[1.5.6] + io.micrometer:micrometer-core:[1.6.1] org.slf4j:slf4j-api:[1.7.30] org.hdrhistogram:HdrHistogram:[2.1.12] diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java index 557532eb4c72d..a995195d4cd6b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java @@ -767,7 +767,7 @@ public Flux> processBulkOperati final BulkProcessingOptions bulkProcessingOptions = bulkOptions; - return Flux.deferWithContext(context -> { + return Flux.deferContextual(context -> { final BulkExecutor executor = new BulkExecutor<>(this, operations, bulkProcessingOptions); return executor.execute(); diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java index aef4f58dc46b7..a0155402bc21e 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/changefeed/implementation/DocumentServiceLeaseUpdaterImpl.java @@ -16,6 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; +import reactor.util.retry.Retry; import java.time.Instant; import java.util.function.Function; @@ -93,7 +94,7 @@ public Mono updateLease(final Lease cachedLease, String itemId, Partition throw new LeaseConflictException(cachedLease, "Partition update failed"); }); }) - .retry(RETRY_COUNT_ON_CONFLICT, throwable -> { + .retryWhen(Retry.max(RETRY_COUNT_ON_CONFLICT).filter(throwable -> { if (throwable instanceof LeaseConflictException) { logger.info( "Partition {} for the lease with token '{}' failed to update for owner '{}'; will retry.", @@ -103,7 +104,7 @@ public Mono updateLease(final Lease cachedLease, String itemId, Partition return true; } return false; - }) + })) .onErrorResume(throwable -> { if (throwable instanceof LeaseConflictException) { logger.warn( diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/HttpClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/HttpClient.java index 52af0a1a006dc..03d3f856f98c0 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/HttpClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/HttpClient.java @@ -52,11 +52,14 @@ static HttpClient createFixed(HttpClientConfig httpClientConfig) { Duration connectionAcquireTimeout = httpClientConfig.getConfigs().getConnectionAcquireTimeout(); - ConnectionProvider fixedConnectionProvider = - ConnectionProvider.fixed(httpClientConfig.getConfigs().getReactorNettyConnectionPoolName(), - maxPoolSize, connectionAcquireTimeout.toMillis(), maxIdleConnectionTimeoutInMillis); + ConnectionProvider.Builder fixedConnectionProviderBuilder = ConnectionProvider + .builder(httpClientConfig.getConfigs().getReactorNettyConnectionPoolName()); + fixedConnectionProviderBuilder.maxConnections(maxPoolSize); + fixedConnectionProviderBuilder.pendingAcquireTimeout(connectionAcquireTimeout); + fixedConnectionProviderBuilder.maxIdleTime(maxIdleConnectionTimeoutInMillis); - return ReactorNettyClient.createWithConnectionProvider(fixedConnectionProvider, httpClientConfig); + return ReactorNettyClient.createWithConnectionProvider(fixedConnectionProviderBuilder.build(), + httpClientConfig); } /** diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/ReactorNettyClient.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/ReactorNettyClient.java index 3b98513352cd7..896cc9ff69e06 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/ReactorNettyClient.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/http/ReactorNettyClient.java @@ -7,6 +7,7 @@ import io.netty.channel.ChannelOption; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.logging.LogLevel; +import io.netty.resolver.DefaultAddressResolverGroup; import org.reactivestreams.Publisher; import org.reactivestreams.Subscription; import org.slf4j.Logger; @@ -15,12 +16,14 @@ import reactor.core.publisher.Mono; import reactor.netty.ByteBufFlux; import reactor.netty.Connection; +import reactor.netty.ConnectionObserver; import reactor.netty.NettyOutbound; import reactor.netty.http.client.HttpClientRequest; import reactor.netty.http.client.HttpClientResponse; import reactor.netty.http.client.HttpClientState; import reactor.netty.resources.ConnectionProvider; -import reactor.netty.tcp.ProxyProvider; +import reactor.netty.transport.ProxyProvider; +import reactor.util.context.Context; import java.nio.charset.Charset; import java.time.Duration; @@ -36,6 +39,8 @@ */ class ReactorNettyClient implements HttpClient { + private static final String REACTOR_NETTY_REQUEST_RECORD_KEY = "reactorNettyRequestRecordKey"; + private static final Logger logger = LoggerFactory.getLogger(ReactorNettyClient.class.getSimpleName()); private HttpClientConfig httpClientConfig; @@ -50,8 +55,13 @@ private ReactorNettyClient() {} public static ReactorNettyClient create(HttpClientConfig httpClientConfig) { ReactorNettyClient reactorNettyClient = new ReactorNettyClient(); reactorNettyClient.httpClientConfig = httpClientConfig; - reactorNettyClient.httpClient = reactor.netty.http.client.HttpClient.newConnection(); + reactorNettyClient.httpClient = reactor.netty.http.client.HttpClient + .newConnection() + .observe(getConnectionObserver()) + .resolver(DefaultAddressResolverGroup.INSTANCE); reactorNettyClient.configureChannelPipelineHandlers(); + // This enables fast warm up of HttpClient + reactorNettyClient.httpClient.warmup().block(); return reactorNettyClient; } @@ -62,36 +72,35 @@ public static ReactorNettyClient createWithConnectionProvider(ConnectionProvider ReactorNettyClient reactorNettyClient = new ReactorNettyClient(); reactorNettyClient.connectionProvider = connectionProvider; reactorNettyClient.httpClientConfig = httpClientConfig; - reactorNettyClient.httpClient = reactor.netty.http.client.HttpClient.create(connectionProvider); + reactorNettyClient.httpClient = reactor.netty.http.client.HttpClient + .create(connectionProvider) + .observe(getConnectionObserver()) + .resolver(DefaultAddressResolverGroup.INSTANCE); reactorNettyClient.configureChannelPipelineHandlers(); + // This enables fast warm up of HttpClient + reactorNettyClient.httpClient.warmup().block(); return reactorNettyClient; } private void configureChannelPipelineHandlers() { Configs configs = this.httpClientConfig.getConfigs(); - this.httpClient = this.httpClient.tcpConfiguration(tcpClient -> { - if (this.httpClientConfig.getProxy() != null) { - tcpClient = - tcpClient.proxy(typeSpec -> typeSpec.type(ProxyProvider.Proxy.HTTP).address(this.httpClientConfig.getProxy().getAddress())); - } - tcpClient = - tcpClient.secure(sslContextSpec -> sslContextSpec.sslContext(configs.getSslContext())); - if (LoggerFactory.getLogger(REACTOR_NETWORK_LOG_CATEGORY).isTraceEnabled()) { - tcpClient = tcpClient.wiretap(REACTOR_NETWORK_LOG_CATEGORY, LogLevel.INFO); - } - // By default, keep alive is enabled on http client - tcpClient = tcpClient.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, - (int) configs.getConnectionAcquireTimeout().toMillis()); - - return tcpClient; - }).httpResponseDecoder(httpResponseDecoderSpec -> { - httpResponseDecoderSpec.maxInitialLineLength(configs.getMaxHttpInitialLineLength()); - httpResponseDecoderSpec.maxHeaderSize(configs.getMaxHttpHeaderSize()); - httpResponseDecoderSpec.maxChunkSize(configs.getMaxHttpChunkSize()); - httpResponseDecoderSpec.validateHeaders(true); - return httpResponseDecoderSpec; - }); + if (this.httpClientConfig.getProxy() != null) { + this.httpClient = this.httpClient.proxy(typeSpec -> typeSpec.type(ProxyProvider.Proxy.HTTP) + .address(this.httpClientConfig.getProxy().getAddress())); + } + + if (LoggerFactory.getLogger(REACTOR_NETWORK_LOG_CATEGORY).isTraceEnabled()) { + this.httpClient = this.httpClient.wiretap(REACTOR_NETWORK_LOG_CATEGORY, LogLevel.INFO); + } + + this.httpClient.secure(sslContextSpec -> sslContextSpec.sslContext(configs.getSslContext())) + .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, (int) configs.getConnectionAcquireTimeout().toMillis()) + .httpResponseDecoder(httpResponseDecoderSpec -> + httpResponseDecoderSpec.maxInitialLineLength(configs.getMaxHttpInitialLineLength()) + .maxHeaderSize(configs.getMaxHttpHeaderSize()) + .maxChunkSize(configs.getMaxHttpChunkSize()) + .validateHeaders(true)); } @Override @@ -114,18 +123,6 @@ public Mono send(final HttpRequest request, Duration responseTimeo final AtomicReference responseReference = new AtomicReference<>(); return this.httpClient - .observe((connection, state) -> { - Instant time = Instant.now(); - if(state.equals(HttpClientState.CONNECTED) || state.equals(HttpClientState.ACQUIRED)){ - request.reactorNettyRequestRecord().setTimeConnected(time); - } else if(state.equals(HttpClientState.CONFIGURED)){ - request.reactorNettyRequestRecord().setTimeConfigured(time); - } else if(state.equals(HttpClientState.REQUEST_SENT)){ - request.reactorNettyRequestRecord().setTimeSent(time); - } else if(state.equals(HttpClientState.RESPONSE_RECEIVED)){ - request.reactorNettyRequestRecord().setTimeReceived(time); - } - }) .keepAlive(this.httpClientConfig.isConnectionKeepAlive()) .port(request.port()) .responseTimeout(responseTimeout) @@ -138,6 +135,7 @@ public Mono send(final HttpRequest request, Duration responseTimeo responseReference.set((ReactorNettyHttpResponse) httpResponse); return Mono.just(httpResponse); }) + .contextWrite(Context.of(REACTOR_NETTY_REQUEST_RECORD_KEY, request.reactorNettyRequestRecord())) .doOnCancel(() -> { ReactorNettyHttpResponse reactorNettyHttpResponse = responseReference.get(); if (reactorNettyHttpResponse != null) { @@ -180,6 +178,54 @@ public void shutdown() { } } + private static ConnectionObserver getConnectionObserver() { + return (conn, state) -> { + Instant time = Instant.now(); + + if (state.equals(HttpClientState.CONNECTED) || state.equals(HttpClientState.ACQUIRED)) { + if (conn instanceof ConnectionObserver) { + ConnectionObserver observer = (ConnectionObserver) conn; + ReactorNettyRequestRecord requestRecord = + observer.currentContext().getOrDefault(REACTOR_NETTY_REQUEST_RECORD_KEY, null); + if (requestRecord == null) { + throw new IllegalStateException("ReactorNettyRequestRecord not found in context"); + } + requestRecord.setTimeConnected(time); + } + } else if (state.equals(HttpClientState.CONFIGURED)) { + if (conn instanceof HttpClientRequest) { + HttpClientRequest httpClientRequest = (HttpClientRequest) conn; + ReactorNettyRequestRecord requestRecord = + httpClientRequest.currentContextView().getOrDefault(REACTOR_NETTY_REQUEST_RECORD_KEY, null); + if (requestRecord == null) { + throw new IllegalStateException("ReactorNettyRequestRecord not found in context"); + } + requestRecord.setTimeConfigured(time); + } + } else if (state.equals(HttpClientState.REQUEST_SENT)) { + if (conn instanceof HttpClientRequest) { + HttpClientRequest httpClientRequest = (HttpClientRequest) conn; + ReactorNettyRequestRecord requestRecord = + httpClientRequest.currentContextView().getOrDefault(REACTOR_NETTY_REQUEST_RECORD_KEY, null); + if (requestRecord == null) { + throw new IllegalStateException("ReactorNettyRequestRecord not found in context"); + } + requestRecord.setTimeSent(time); + } + } else if (state.equals(HttpClientState.RESPONSE_RECEIVED)) { + if (conn instanceof HttpClientRequest) { + HttpClientRequest httpClientRequest = (HttpClientRequest) conn; + ReactorNettyRequestRecord requestRecord = + httpClientRequest.currentContextView().getOrDefault(REACTOR_NETTY_REQUEST_RECORD_KEY, null); + if (requestRecord == null) { + throw new IllegalStateException("ReactorNettyRequestRecord not found in context"); + } + requestRecord.setTimeReceived(time); + } + } + }; + } + private static class ReactorNettyHttpResponse extends HttpResponse { private final AtomicReference state = new AtomicReference<>(ReactorNettyResponseState.NOT_SUBSCRIBED); @@ -218,22 +264,22 @@ public Flux body() { @Override public Mono bodyAsByteArray() { return bodyIntern().aggregate() - .asByteArray() - .doOnSubscribe(this::updateSubscriptionState); + .asByteArray() + .doOnSubscribe(this::updateSubscriptionState); } @Override public Mono bodyAsString() { return bodyIntern().aggregate() - .asString() - .doOnSubscribe(this::updateSubscriptionState); + .asString() + .doOnSubscribe(this::updateSubscriptionState); } @Override public Mono bodyAsString(Charset charset) { return bodyIntern().aggregate() - .asString(charset) - .doOnSubscribe(this::updateSubscriptionState); + .asString(charset) + .doOnSubscribe(this::updateSubscriptionState); } private ByteBufFlux bodyIntern() { @@ -286,4 +332,4 @@ private enum ReactorNettyResponseState { CANCELLED, ERROR; } -} +} \ No newline at end of file diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/OrderByDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/OrderByDocumentQueryExecutionContext.java index 07fd62f3bbbde..7cb9fcb091890 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/OrderByDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/OrderByDocumentQueryExecutionContext.java @@ -528,7 +528,7 @@ public Flux> drainAsync( //// In more mathematical terms //// 1) always comes before where x < z //// 2) always come before where j < k - return this.orderByObservable.compose(new ItemToPageTransformer(tracker, + return this.orderByObservable.transformDeferred(new ItemToPageTransformer(tracker, maxPageSize, this.queryMetricMap, this::getContinuationToken, diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/OrderByUtils.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/OrderByUtils.java index 5aa467bb8691f..faa85c5b2558b 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/OrderByUtils.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/OrderByUtils.java @@ -54,7 +54,7 @@ private static Flux> toOrderByQueryResu List clientSideRequestStatisticsList) { return producer .produceAsync() - .compose(new OrderByUtils.PageToItemTransformer(klass, tracker, queryMetricsMap, + .transformDeferred(new OrderByUtils.PageToItemTransformer(klass, tracker, queryMetricsMap, targetRangeToOrderByContinuationTokenMap, sortOrders, clientSideRequestStatisticsList)); } diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/ParallelDocumentQueryExecutionContext.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/ParallelDocumentQueryExecutionContext.java index 00efc3d9ae48a..12682de105bfd 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/ParallelDocumentQueryExecutionContext.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/query/ParallelDocumentQueryExecutionContext.java @@ -386,7 +386,7 @@ public Flux> drainAsync( logger.debug("ParallelQuery: flux mergeSequential" + " concurrency {}, prefetch {}", fluxConcurrency, fluxPrefetch); return Flux.mergeSequential(obs, fluxConcurrency, fluxPrefetch) - .compose(new EmptyPagesFilterTransformer<>(new RequestChargeTracker(), this.cosmosQueryRequestOptions)); + .transformDeferred(new EmptyPagesFilterTransformer<>(new RequestChargeTracker(), this.cosmosQueryRequestOptions)); } @Override diff --git a/sdk/cosmos/azure-cosmos/src/main/java/module-info.java b/sdk/cosmos/azure-cosmos/src/main/java/module-info.java index 0956a781916ad..7682b33451585 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/module-info.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/module-info.java @@ -18,6 +18,8 @@ requires io.netty.transport.epoll; requires io.netty.handler.proxy; requires reactor.netty; + requires reactor.netty.core; + requires reactor.netty.http; requires com.codahale.metrics; requires com.fasterxml.jackson.module.afterburner; requires java.management; diff --git a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedProcessorTest.java b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedProcessorTest.java index d6efb15a4edfc..618d788c7b011 100644 --- a/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedProcessorTest.java +++ b/sdk/cosmos/azure-cosmos/src/test/java/com/azure/cosmos/rx/ChangeFeedProcessorTest.java @@ -38,6 +38,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; +import reactor.util.retry.Retry; import java.time.Duration; import java.time.ZoneOffset; @@ -580,7 +581,7 @@ public void readFeedDocumentsAfterSplit() throws InterruptedException { return count; }) // this will timeout approximately after 3 minutes - .retry(40, throwable -> { + .retryWhen(Retry.max(40).filter(throwable -> { try { log.warn("Retrying..."); Thread.sleep(CHANGE_FEED_PROCESSOR_TIMEOUT); @@ -588,7 +589,7 @@ public void readFeedDocumentsAfterSplit() throws InterruptedException { throw new RuntimeException("Interrupted exception", e); } return true; - }) + })) .last().block(); assertThat(changeFeedProcessor.isStarted()).as("Change Feed Processor instance is running").isTrue(); diff --git a/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml b/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml index a2e721f0d0f41..e44e24e56d121 100644 --- a/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml index bb73b851864dc..b160ec3036083 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos/pom.xml @@ -28,7 +28,7 @@ org.springframework spring-core - 5.2.10.RELEASE + 5.3.0 commons-logging @@ -39,27 +39,27 @@ org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 org.springframework spring-beans - 5.2.10.RELEASE + 5.3.0 org.springframework spring-context - 5.2.10.RELEASE + 5.3.0 org.springframework spring-tx - 5.2.10.RELEASE + 5.3.0 org.springframework.data spring-data-commons - 2.3.5.RELEASE + 2.4.0 org.slf4j @@ -70,7 +70,7 @@ org.springframework spring-expression - 5.2.10.RELEASE + 5.3.0 com.azure @@ -105,14 +105,14 @@ org.apache.commons commons-lang3 - 3.10 + 3.11 org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -130,7 +130,7 @@ org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -142,7 +142,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -181,19 +181,19 @@ - org.springframework:spring-beans:[5.2.10.RELEASE] - org.springframework:spring-web:[5.2.10.RELEASE] - org.springframework:spring-tx:[5.2.10.RELEASE] - org.springframework:spring-expression:[5.2.10.RELEASE] - org.springframework:spring-core:[5.2.10.RELEASE] - org.springframework:spring-context:[5.2.10.RELEASE] - org.springframework.data:spring-data-commons:[2.3.5.RELEASE] + org.springframework:spring-beans:[5.3.0] + org.springframework:spring-web:[5.3.0] + org.springframework:spring-tx:[5.3.0] + org.springframework:spring-expression:[5.3.0] + org.springframework:spring-core:[5.3.0] + org.springframework:spring-context:[5.3.0] + org.springframework.data:spring-data-commons:[2.4.0] org.javatuples:javatuples:[1.2] com.fasterxml.jackson.datatype:jackson-datatype-jdk8:[2.12.1] com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.12.1] com.fasterxml.jackson.module:jackson-module-parameter-names:[2.12.1] javax.annotation:javax.annotation-api:[1.3.2] - org.apache.commons:commons-lang3:[3.10] + org.apache.commons:commons-lang3:[3.11] org.slf4j:slf4j-api:[1.7.30] diff --git a/sdk/cosmos/tests.yml b/sdk/cosmos/tests.yml index 20645d51c5cf2..3ea40fa13b4ed 100644 --- a/sdk/cosmos/tests.yml +++ b/sdk/cosmos/tests.yml @@ -46,31 +46,6 @@ stages: TimeoutInMinutes: 90 PreSteps: - template: /eng/pipelines/templates/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 - displayName: 'Run replace_util.py' - - task: Maven@3 - displayName: 'Build and Install again, JDK Version: $(JavaBuildVersion)' - inputs: - mavenPomFile: pom.xml - goals: 'install' - options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am' - mavenOptions: '$(MemoryOptions) $(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaBuildVersion) - jdkArchitectureOption: 'x64' - publishJUnitResults: false - - task: Maven@3 - displayName: 'Run tests again: $(DisplayName)' - inputs: - mavenPomFile: pom.xml - goals: clean verify - options: '$(ProfileFlag) -Dgpg.skip -Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -pl $(ProjectList)' - env: - AZURE_TEST_MODE: LIVE TestStepMavenInputs: goals: clean verify options: '$(ProfileFlag) -Dgpg.skip -Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -pl $(ProjectList)' diff --git a/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml b/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml index 0dc5c55038a83..052e8b26a8f4e 100644 --- a/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml +++ b/sdk/deviceupdate/azure-iot-deviceupdate/pom.xml @@ -54,19 +54,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml index 88df7777bc916..6441d8b166b09 100644 --- a/sdk/digitaltwins/azure-digitaltwins-core/pom.xml +++ b/sdk/digitaltwins/azure-digitaltwins-core/pom.xml @@ -76,25 +76,25 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test org.assertj assertj-core - 3.16.1 + 3.18.1 test diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index 476d2aa8b7ffc..30bef733baa6b 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -76,7 +76,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml index 5ad3a098ee04a..76a5365b1b0e8 100644 --- a/sdk/eventgrid/azure-messaging-eventgrid/pom.xml +++ b/sdk/eventgrid/azure-messaging-eventgrid/pom.xml @@ -86,19 +86,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -110,13 +110,13 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml index d21937dbd4950..d933f96978079 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml @@ -58,31 +58,31 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml index d80aa447f60d3..e1ba434dccaab 100644 --- a/sdk/eventhubs/azure-messaging-eventhubs/pom.xml +++ b/sdk/eventhubs/azure-messaging-eventhubs/pom.xml @@ -62,31 +62,31 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml b/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml index 8738361ee5d35..8185edd66ad9d 100644 --- a/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml +++ b/sdk/eventhubs/microsoft-azure-eventhubs/pom.xml @@ -63,7 +63,7 @@ com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 @@ -81,7 +81,7 @@ com.microsoft.azure msal4j - 1.8.1 + 1.9.1 test @@ -93,7 +93,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml index 56a2aca704edf..c8a2fd3b761a8 100644 --- a/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml +++ b/sdk/formrecognizer/azure-ai-formrecognizer/pom.xml @@ -60,19 +60,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index 3a71bc3ff5a5f..bb3eb7d20ed3a 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -27,12 +27,12 @@ com.azure azure-core - 1.13.0 + 1.14.0-beta.1 com.azure azure-core-http-netty - 1.8.0 + 1.9.0-beta.1 net.minidev @@ -42,17 +42,17 @@ com.microsoft.azure msal4j - 1.8.1 + 1.9.1 com.microsoft.azure msal4j-persistence-extension - 1.0.0 + 1.1.0 com.nimbusds oauth2-oidc-sdk - 7.1.1 + 8.23.1 @@ -64,7 +64,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -87,7 +87,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -115,9 +115,9 @@ - com.microsoft.azure:msal4j:[1.8.1] - com.microsoft.azure:msal4j-persistence-extension:[1.0.0] - com.nimbusds:oauth2-oidc-sdk:[7.1.1] + com.microsoft.azure:msal4j:[1.9.1] + com.microsoft.azure:msal4j-persistence-extension:[1.1.0] + com.nimbusds:oauth2-oidc-sdk:[8.23.1] net.java.dev.jna:jna-platform:[5.6.0] org.linguafranca.pwdb:KeePassJava2:[2.1.4] net.minidev:json-smart:[2.3] diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml index e903e63162ae3..504046ed64f42 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml @@ -47,19 +47,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -71,7 +71,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml index 00d05baf96b1b..813d28303e44f 100644 --- a/sdk/keyvault/azure-security-keyvault-certificates/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-certificates/pom.xml @@ -49,21 +49,21 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -77,7 +77,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -104,7 +104,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/keyvault/azure-security-keyvault-jca/pom.xml b/sdk/keyvault/azure-security-keyvault-jca/pom.xml index 18c6cb36279d9..90f9b68c02681 100644 --- a/sdk/keyvault/azure-security-keyvault-jca/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-jca/pom.xml @@ -150,19 +150,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test diff --git a/sdk/keyvault/azure-security-keyvault-keys/pom.xml b/sdk/keyvault/azure-security-keyvault-keys/pom.xml index be6271e47cd42..c6426c6f4f293 100644 --- a/sdk/keyvault/azure-security-keyvault-keys/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-keys/pom.xml @@ -63,19 +63,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -87,7 +87,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -111,7 +111,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml index f7ba2170f855a..f8e6647352087 100644 --- a/sdk/keyvault/azure-security-keyvault-secrets/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-secrets/pom.xml @@ -66,19 +66,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -91,7 +91,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -111,7 +111,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml index fbc20f1cff3fc..251c560c644f3 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-core/pom.xml @@ -46,7 +46,7 @@ org.apache.commons commons-lang3 - 3.10 + 3.11 com.google.guava diff --git a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml index 109cbc7e263e1..de3f95603d1cb 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-cryptography/pom.xml @@ -66,12 +66,12 @@ org.apache.commons commons-lang3 - 3.10 + 3.11 commons-codec commons-codec - 1.14 + 1.15 com.google.guava diff --git a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml index f756eb8595532..3956e710b3b75 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-extensions/pom.xml @@ -88,12 +88,12 @@ org.apache.commons commons-lang3 - 3.10 + 3.11 commons-codec commons-codec - 1.14 + 1.15 diff --git a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml index 32c3b8cecdb65..9eda70659685b 100644 --- a/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml +++ b/sdk/keyvault/microsoft-azure-keyvault-webkey/pom.xml @@ -62,7 +62,7 @@ commons-codec commons-codec - 1.14 + 1.15 com.google.guava diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml index 15cbec90dfafe..e9c49351894c9 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/pom.xml @@ -60,19 +60,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml index 6c13bbcb7208c..7ba5af8f9490d 100644 --- a/sdk/mixedreality/azure-mixedreality-authentication/pom.xml +++ b/sdk/mixedreality/azure-mixedreality-authentication/pom.xml @@ -58,19 +58,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -82,7 +82,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml index f0459427fd300..564fe5fd97c71 100644 --- a/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml +++ b/sdk/monitor/azure-monitor-opentelemetry-exporter/pom.xml @@ -62,19 +62,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/quantum/azure-quantum-jobs/pom.xml b/sdk/quantum/azure-quantum-jobs/pom.xml index 65fa24b005779..39d74b0f920b9 100644 --- a/sdk/quantum/azure-quantum-jobs/pom.xml +++ b/sdk/quantum/azure-quantum-jobs/pom.xml @@ -56,7 +56,7 @@ org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml index 05b22dc238cbb..8d4da4178ac5a 100644 --- a/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml +++ b/sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml @@ -55,19 +55,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -79,7 +79,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml index 46bc5719d37be..32b31d179cc14 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/pom.xml @@ -74,13 +74,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml index aaeb5278673cc..71ee2a9e5a79c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-appservice/pom.xml @@ -77,13 +77,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml index 038766883ec65..5a99f7e4ed354 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/pom.xml @@ -63,13 +63,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml b/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml index 109cee2ce75cc..6a83bce8c2bd0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-cdn/pom.xml @@ -57,13 +57,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml index 4cc52412b47fa..d7fe388d07f28 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-compute/pom.xml @@ -83,13 +83,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml index 585449802fc0b..a31ab594e1886 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerinstance/pom.xml @@ -84,13 +84,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml index 806c4cd1b80ca..7db0be0ccb0c7 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerregistry/pom.xml @@ -64,13 +64,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml index e3ffc0edf6e2c..1efdcf63a6937 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml @@ -53,13 +53,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml b/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml index 2de74e2ceacae..01d4d325f4ffa 100644 --- a/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-cosmos/pom.xml @@ -53,13 +53,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml b/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml index 3bca5bc7580c8..834593745ef9b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-dns/pom.xml @@ -69,13 +69,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml b/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml index e999f4ef3c34d..306c362b31b3f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-eventhubs/pom.xml @@ -62,13 +62,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml b/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml index f385a6246cf58..8e6e92f50ba07 100644 --- a/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-keyvault/pom.xml @@ -84,13 +84,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml index 5d077deacb638..89a7a96173121 100644 --- a/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-monitor/pom.xml @@ -53,13 +53,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml index 9daf31fa91075..b6cf0e80c3e9b 100644 --- a/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-msi/pom.xml @@ -58,7 +58,7 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml index e4ab00c920a3c..e9c818c5e9001 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-network/pom.xml @@ -57,7 +57,7 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test @@ -87,7 +87,7 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml b/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml index 746403542d0ed..8dcfdb81c7e13 100644 --- a/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-privatedns/pom.xml @@ -63,13 +63,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml b/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml index cae607f62ff3d..e1ae279369653 100644 --- a/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-redis/pom.xml @@ -57,7 +57,7 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test @@ -81,7 +81,7 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml index 38e577213c657..5ffacfc31f8e3 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-resources/pom.xml @@ -68,13 +68,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test @@ -86,7 +86,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/policy/ProviderRegistrationPolicy.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/policy/ProviderRegistrationPolicy.java index cd637ba9e1f18..160b9946406b0 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/policy/ProviderRegistrationPolicy.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/policy/ProviderRegistrationPolicy.java @@ -17,6 +17,7 @@ import com.azure.resourcemanager.resources.models.Provider; import com.azure.resourcemanager.resources.models.Providers; import reactor.core.publisher.Mono; +import reactor.util.retry.Retry; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -124,7 +125,7 @@ private Mono registerProviderUntilSuccess(String namespace) { } return providers.getByNameAsync(namespace) .flatMap(this::checkProviderRegistered) - .retry(60, ProviderUnregisteredException.class::isInstance); + .retryWhen(Retry.max(60).filter(ProviderUnregisteredException.class::isInstance)); } ); } diff --git a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml index 8efd143a98bd3..26e67b2a0eaa4 100644 --- a/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-samples/pom.xml @@ -128,18 +128,18 @@ com.microsoft.sqlserver mssql-jdbc - 7.4.1.jre8 + 8.4.1.jre8 org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test @@ -208,7 +208,7 @@ org.slf4j:slf4j-simple:[1.7.30] com.google.guava:guava:[29.0-jre] com.github.docker-java:docker-java:[3.2.1] - com.microsoft.sqlserver:mssql-jdbc:[7.4.1.jre8] + com.microsoft.sqlserver:mssql-jdbc:[8.4.1.jre8] org.eclipse.jgit:org.eclipse.jgit:[4.5.7.201904151645-r] com.github.cverges.expect4j:expect4j:[1.6] commons-net:commons-net:[3.6] diff --git a/sdk/resourcemanager/azure-resourcemanager-search/pom.xml b/sdk/resourcemanager/azure-resourcemanager-search/pom.xml index ff81ff51a3939..5fb29372df04a 100644 --- a/sdk/resourcemanager/azure-resourcemanager-search/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-search/pom.xml @@ -57,13 +57,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml b/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml index bbcc5c23afa3d..bfdfcee01ba2c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-servicebus/pom.xml @@ -57,13 +57,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml index fc22e1b229270..bca8f63e7d7cf 100644 --- a/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-sql/pom.xml @@ -62,13 +62,13 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml b/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml index db274c6735166..6348268d1b7f6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-storage/pom.xml @@ -63,7 +63,7 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml index 17ef7e90b78e0..f24faa2eb1096 100644 --- a/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-trafficmanager/pom.xml @@ -63,7 +63,7 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test diff --git a/sdk/resourcemanager/azure-resourcemanager/pom.xml b/sdk/resourcemanager/azure-resourcemanager/pom.xml index 12c404b085ea0..7343ed3dc8622 100644 --- a/sdk/resourcemanager/azure-resourcemanager/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager/pom.xml @@ -168,7 +168,7 @@ org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test @@ -180,7 +180,7 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test diff --git a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml index 746a8c50606f5..cb63c75bfaa67 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry-avro/pom.xml @@ -51,25 +51,25 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -81,7 +81,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml index 4d1f3398778f7..033e878c19ff7 100644 --- a/sdk/schemaregistry/azure-data-schemaregistry/pom.xml +++ b/sdk/schemaregistry/azure-data-schemaregistry/pom.xml @@ -54,31 +54,31 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/search/azure-search-documents/pom.xml b/sdk/search/azure-search-documents/pom.xml index e7e763f6cc7c5..c12a457c747a2 100644 --- a/sdk/search/azure-search-documents/pom.xml +++ b/sdk/search/azure-search-documents/pom.xml @@ -28,12 +28,12 @@ com.azure azure-core - 1.13.0 + 1.14.0-beta.1 com.azure azure-core-http-netty - 1.8.0 + 1.9.0-beta.1 com.azure @@ -61,31 +61,31 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test org.mockito mockito-core - 3.3.3 + 3.6.0 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/PerCallRequestIdExample.java b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/PerCallRequestIdExample.java index 9243ee0393c46..36bdf072e8b0f 100644 --- a/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/PerCallRequestIdExample.java +++ b/sdk/search/azure-search-documents/src/samples/java/com/azure/search/documents/PerCallRequestIdExample.java @@ -43,7 +43,7 @@ private static void synchronousApiCall() { // Setup context to pass custom x-ms-client-request-id. HttpHeaders headers = new HttpHeaders(); - headers.put("x-ms-client-request-id", UUID.randomUUID().toString()); + headers.set("x-ms-client-request-id", UUID.randomUUID().toString()); Context context = new Context(AddHeadersFromContextPolicy.AZURE_REQUEST_HTTP_HEADERS_KEY, headers); @@ -74,7 +74,7 @@ private static void asynchronousApiCall() { // Setup context to pass custom x-ms-client-request-id. HttpHeaders headers = new HttpHeaders(); - headers.put("x-ms-client-request-id", UUID.randomUUID().toString()); + headers.set("x-ms-client-request-id", UUID.randomUUID().toString()); reactor.util.context.Context subscriberContext = reactor.util.context.Context.of( AddHeadersFromContextPolicy.AZURE_REQUEST_HTTP_HEADERS_KEY, headers); diff --git a/sdk/servicebus/azure-messaging-servicebus/pom.xml b/sdk/servicebus/azure-messaging-servicebus/pom.xml index 9d0aabe4aca4f..df12cc3bb5405 100644 --- a/sdk/servicebus/azure-messaging-servicebus/pom.xml +++ b/sdk/servicebus/azure-messaging-servicebus/pom.xml @@ -77,31 +77,31 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusAsyncConsumerTest.java b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusAsyncConsumerTest.java index f4734f58e87c6..49fb052ae8894 100644 --- a/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusAsyncConsumerTest.java +++ b/sdk/servicebus/azure-messaging-servicebus/src/test/java/com/azure/messaging/servicebus/ServiceBusAsyncConsumerTest.java @@ -34,6 +34,7 @@ import java.util.function.Function; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -211,6 +212,10 @@ void onError() { final Message message1 = mock(Message.class); final ServiceBusReceivedMessage receivedMessage1 = mock(ServiceBusReceivedMessage.class); + /* + * Beginning in Mockito 3.4.0+ the default value for duration changed from null to Duration.ZERO + */ + when(retryPolicy.calculateRetryDelay(any(), anyInt())).thenReturn(null); when(receivedMessage1.getLockToken()).thenReturn(lockToken); when(receivedMessage1.getLockedUntil()).thenReturn(lockedUntil); when(serializer.deserialize(message1, ServiceBusReceivedMessage.class)).thenReturn(receivedMessage1); diff --git a/sdk/spring/azure-identity-spring/pom.xml b/sdk/spring/azure-identity-spring/pom.xml index 73776fba7d225..b5ec61c98a0b7 100644 --- a/sdk/spring/azure-identity-spring/pom.xml +++ b/sdk/spring/azure-identity-spring/pom.xml @@ -23,18 +23,18 @@ org.springframework.boot spring-boot - 2.3.5.RELEASE + 2.4.0 provided org.springframework spring-context - 5.2.10.RELEASE + 5.3.0 org.springframework spring-core - 5.2.10.RELEASE + 5.3.0 com.azure @@ -44,19 +44,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test @@ -77,9 +77,9 @@ - org.springframework.boot:spring-boot:[2.3.5.RELEASE] - org.springframework:spring-context:[5.2.10.RELEASE] - org.springframework:spring-core:[5.2.10.RELEASE] + org.springframework.boot:spring-boot:[2.4.0] + org.springframework:spring-context:[5.3.0] + org.springframework:spring-core:[5.3.0] diff --git a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-complete/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-complete/pom.xml index 353beecca7028..5e192f1b3375b 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-complete/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-complete/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 diff --git a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-initial/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-initial/pom.xml index 45801bf62bc8b..a3ccf192beeb4 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-initial/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-initial/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 diff --git a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-sample/pom.xml index c6592d619b0ce..1a07dbba95f59 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-sample/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-sample/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 diff --git a/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml index 5642ffa615e22..357f216e8f491 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml index 32456d482f7a4..4f80ed10b6120 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter-stateless/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter-stateless/pom.xml index 40ac5b442df4b..8af797083717f 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter-stateless/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter-stateless/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter/pom.xml index ee8c9ac32ee06..150de75b04a38 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml index 5f71fd32094b2..3063ab350bb93 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml index b9d05f8e42c23..49da331bd7133 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-webapp/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-webapp/pom.xml index ba5c781a743ca..42ea2629f3b67 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-webapp/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-webapp/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmos/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmos/pom.xml index 9e4d246848ce5..304650e46d4ab 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmos/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmos/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml index d7ba3be019a05..9518699877ab7 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-certificates/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-certificates/pom.xml index 7579c2f5dec0a..297f29beb1664 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-certificates/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-certificates/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml index 0124fba900622..eabbf317cb53d 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-mediaservices/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-mediaservices/pom.xml index 728e1d3836cff..37374c2c90632 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-mediaservices/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-mediaservices/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml index 0101fc151ed2d..e3aee5ed099ff 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml index f29f4ac9faba1..90e3cd5315bf3 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml index 21845701af505..2be707bcf553d 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-storage-resource/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-storage-resource/pom.xml index dbea863b827f1..d06b35ae3e0c0 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-storage-resource/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-storage-resource/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/pom.xml index 642fa8d9091d9..83cfb3da3a4fa 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-cache/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/pom.xml index 41b746d04f9f0..8422e48b6d424 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-binder/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 azure-spring-cloud-sample-eventhubs-binder @@ -18,7 +18,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/pom.xml index 76e56c7574f36..f2fca46ee1716 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-kafka/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/pom.xml index 1f79adad56215..6f2634cdbacbd 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-multibinders/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -20,7 +20,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/pom.xml index fbb1f548205a0..60530d7e4e78e 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-eventhubs-operation/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/pom.xml index 7a5de972e9da9..a57f5e902225f 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-messaging/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/pom.xml index 8e4aea87808b7..7e8abbe95c454 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-operation/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/pom.xml index 1d4dc45e5a80f..3f5f8b9c30a16 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-binder/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/pom.xml index 627dbcacb07cb..8b95af70275b7 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-queue-multibinders/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/pom.xml index 8abafa57ce6d4..b0214dd73e981 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-servicebus-topic-binder/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/pom.xml index 757cfdd74ac07..b779b5ca25348 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-cloud-sample-storage-queue-operation/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/pom.xml index 4fee534dc9c07..c719bfe12de67 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin-web-service/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin/pom.xml index 52fd91755befa..57afc8c483d02 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-data-sample-gremlin/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 com.azure.spring diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/pom.xml index 4f4e35ef9d176..4fd9a6f6093bb 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-eventhubs/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/pom.xml index 38075a24abbad..dedb6616c48ae 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-servicebus/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/pom.xml index c32a58c197a73..180bb29b113aa 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-integration-sample-storage-queue/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-samples/feature-management-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/feature-management-sample/pom.xml index 417f22bb4f542..ee5bef1ff76f9 100644 --- a/sdk/spring/azure-spring-boot-samples/feature-management-sample/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/feature-management-sample/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 diff --git a/sdk/spring/azure-spring-boot-samples/feature-management-web-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/feature-management-web-sample/pom.xml index 150de48369253..1f8df161bed7b 100644 --- a/sdk/spring/azure-spring-boot-samples/feature-management-web-sample/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/feature-management-web-sample/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 diff --git a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml index 4b1457c07c438..0482f170be7c2 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml @@ -22,13 +22,13 @@ org.springframework.boot spring-boot-starter - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 @@ -41,7 +41,7 @@ org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 @@ -54,37 +54,37 @@ org.springframework.security spring-security-core - 5.3.5.RELEASE + 5.4.0 org.springframework.security spring-security-web - 5.3.5.RELEASE + 5.4.0 org.springframework.security spring-security-config - 5.3.5.RELEASE + 5.4.0 org.springframework.security spring-security-oauth2-core - 5.3.5.RELEASE + 5.4.0 org.springframework.security spring-security-oauth2-client - 5.3.5.RELEASE + 5.4.0 org.springframework.security spring-security-oauth2-jose - 5.3.5.RELEASE + 5.4.0 @@ -99,15 +99,15 @@ javax.validation:validation-api:[2.0.1.Final] - org.springframework:spring-web:[5.2.10.RELEASE] - org.springframework.boot:spring-boot-starter:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.3.5.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-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-web:[5.3.0] + org.springframework.boot:spring-boot-starter:[2.4.0] + org.springframework.boot:spring-boot-starter-validation:[2.4.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-core:[5.4.0] + org.springframework.security:spring-security-oauth2-jose:[5.4.0] + org.springframework.security:spring-security-web:[5.4.0] 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 6ab3ad9d79019..965095f622e63 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml @@ -23,17 +23,17 @@ org.springframework.boot spring-boot-starter - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-webflux - 2.3.5.RELEASE + 2.4.0 com.azure.spring @@ -43,32 +43,32 @@ org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 org.springframework.security spring-security-core - 5.3.5.RELEASE + 5.4.0 org.springframework.security spring-security-web - 5.3.5.RELEASE + 5.4.0 org.springframework.security spring-security-config - 5.3.5.RELEASE + 5.4.0 com.microsoft.azure msal4j - 1.8.1 + 1.9.1 com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 com.fasterxml.jackson.core @@ -78,7 +78,7 @@ io.projectreactor.netty reactor-netty - 0.9.15.RELEASE + 1.0.4 @@ -93,16 +93,16 @@ com.fasterxml.jackson.core:jackson-databind:[2.12.1] - com.microsoft.azure:msal4j:[1.8.1] - com.nimbusds:nimbus-jose-jwt:[8.19] - io.projectreactor.netty:reactor-netty:[0.9.15.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[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.security:spring-security-config:[5.3.5.RELEASE] - org.springframework.security:spring-security-core:[5.3.5.RELEASE] - org.springframework.security:spring-security-web:[5.3.5.RELEASE] - org.springframework:spring-web:[5.2.10.RELEASE] + com.microsoft.azure:msal4j:[1.9.1] + com.nimbusds:nimbus-jose-jwt:[9.1.2] + io.projectreactor.netty:reactor-netty:[1.0.4] + org.springframework.boot:spring-boot-starter-validation:[2.4.0] + org.springframework.boot:spring-boot-starter-webflux:[2.4.0] + org.springframework.boot:spring-boot-starter:[2.4.0] + org.springframework.security:spring-security-config:[5.4.0] + org.springframework.security:spring-security-core:[5.4.0] + org.springframework.security:spring-security-web:[5.4.0] + org.springframework:spring-web:[5.3.0] diff --git a/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml b/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml index 38311d0aefe73..ce1ae438fbecb 100644 --- a/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml @@ -23,12 +23,12 @@ org.springframework.boot spring-boot-starter - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 com.azure.spring @@ -52,8 +52,8 @@ - org.springframework.boot:spring-boot-starter:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter:[2.4.0] + org.springframework.boot:spring-boot-starter-validation:[2.4.0] 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 6aecc65a55476..e30eb285129e1 100644 --- a/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml @@ -22,12 +22,12 @@ org.springframework.boot spring-boot-starter - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 com.azure.spring @@ -58,8 +58,8 @@ com.fasterxml.jackson.core:jackson-core:[2.12.1] com.microsoft.spring.data.gremlin:spring-data-gremlin:[2.3.0] - org.springframework.boot:spring-boot-starter:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter:[2.4.0] + org.springframework.boot:spring-boot-starter-validation:[2.4.0] diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml index 218e1b469fd16..b87dba7bc3c96 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-certificates/pom.xml @@ -23,12 +23,12 @@ org.springframework.boot spring-boot-starter - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 com.azure @@ -46,8 +46,8 @@ - org.springframework.boot:spring-boot-starter:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter:[2.4.0] + org.springframework.boot:spring-boot-starter-validation:[2.4.0] diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml index 3e647ec2d5f24..0359a6acc1eb8 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml @@ -23,12 +23,12 @@ org.springframework.boot spring-boot-starter - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 com.azure.spring @@ -56,8 +56,8 @@ - org.springframework.boot:spring-boot-starter:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter:[2.4.0] + org.springframework.boot:spring-boot-starter-validation:[2.4.0] 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 d0da1f87a370a..561ce440c7918 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml @@ -29,13 +29,13 @@ org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 org.springframework spring-jms - 5.2.10.RELEASE + 5.3.0 org.apache.qpid @@ -50,37 +50,37 @@ io.netty netty-buffer - 4.1.54.Final + 4.1.59.Final io.netty netty-common - 4.1.54.Final + 4.1.59.Final io.netty netty-handler - 4.1.54.Final + 4.1.59.Final io.netty netty-transport - 4.1.54.Final + 4.1.59.Final io.netty netty-transport-native-epoll - 4.1.54.Final + 4.1.59.Final io.netty netty-transport-native-kqueue - 4.1.54.Final + 4.1.59.Final io.netty netty-codec-http - 4.1.54.Final + 4.1.59.Final @@ -96,15 +96,15 @@ com.microsoft.azure:azure-servicebus-jms:[0.0.7] org.apache.qpid:qpid-jms-client:[0.53.0] - io.netty:netty-buffer:[4.1.54.Final] - io.netty:netty-common:[4.1.54.Final] - io.netty:netty-handler:[4.1.54.Final] - io.netty:netty-transport:[4.1.54.Final] - io.netty:netty-transport-native-epoll:[4.1.54.Final] - io.netty:netty-transport-native-kqueue:[4.1.54.Final] - io.netty:netty-codec-http:[4.1.54.Final] - org.springframework:spring-jms:[5.2.10.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.3.5.RELEASE] + io.netty:netty-buffer:[4.1.59.Final] + io.netty:netty-common:[4.1.59.Final] + io.netty:netty-handler:[4.1.59.Final] + io.netty:netty-transport:[4.1.59.Final] + io.netty:netty-transport-native-epoll:[4.1.59.Final] + io.netty:netty-transport-native-kqueue:[4.1.59.Final] + io.netty:netty-codec-http:[4.1.59.Final] + org.springframework:spring-jms:[5.3.0] + org.springframework.boot:spring-boot-starter-validation:[2.4.0] diff --git a/sdk/spring/azure-spring-boot-starter-storage/pom.xml b/sdk/spring/azure-spring-boot-starter-storage/pom.xml index a35101034c7c7..af38080ce145a 100644 --- a/sdk/spring/azure-spring-boot-starter-storage/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-storage/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 @@ -56,7 +56,7 @@ - org.springframework.boot:spring-boot-starter-validation:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter-validation:[2.4.0] diff --git a/sdk/spring/azure-spring-boot-starter/pom.xml b/sdk/spring/azure-spring-boot-starter/pom.xml index aa2f1d659891f..01fb2f7d6e997 100644 --- a/sdk/spring/azure-spring-boot-starter/pom.xml +++ b/sdk/spring/azure-spring-boot-starter/pom.xml @@ -23,12 +23,12 @@ org.springframework.boot spring-boot-starter - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-validation - 2.3.5.RELEASE + 2.4.0 com.azure.spring @@ -47,8 +47,8 @@ - org.springframework.boot:spring-boot-starter:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter:[2.4.0] + org.springframework.boot:spring-boot-starter-validation:[2.4.0] diff --git a/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml b/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml index 2ec8abd9ede4d..ca6300f2a0cef 100644 --- a/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml @@ -63,6 +63,13 @@ ch.qos.logback logback-classic + + + junit + junit + 4.13.1 + test + \ No newline at end of file diff --git a/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml b/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml index cfdec5f72ca7b..d14829c20bdd0 100644 --- a/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml @@ -48,6 +48,13 @@ spring-boot-starter-test test + + + junit + junit + 4.13.1 + test + diff --git a/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml b/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml index 61bf589dc09c8..350c8699a8148 100644 --- a/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml @@ -40,6 +40,13 @@ spring-boot-starter-test test + + + junit + junit + 4.13.1 + test + diff --git a/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml b/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml index 9b7445c9f69a6..ef83ed5057d44 100644 --- a/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml @@ -44,6 +44,13 @@ spring-boot-starter-test test + + + junit + junit + 4.13.1 + test + diff --git a/sdk/spring/azure-spring-boot-test-aad/pom.xml b/sdk/spring/azure-spring-boot-test-aad/pom.xml index 76418d52e64d6..a36c40e8e06d6 100644 --- a/sdk/spring/azure-spring-boot-test-aad/pom.xml +++ b/sdk/spring/azure-spring-boot-test-aad/pom.xml @@ -44,6 +44,13 @@ 1.0.0 test + + + junit + junit + 4.13.1 + test + diff --git a/sdk/spring/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-test-core/pom.xml index 6a7f54b4ce333..14e4782ec8e59 100644 --- a/sdk/spring/azure-spring-boot-test-core/pom.xml +++ b/sdk/spring/azure-spring-boot-test-core/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 @@ -24,7 +24,7 @@ org.springframework spring-context - 5.2.10.RELEASE + 5.3.0 org.apache.maven @@ -85,5 +85,12 @@ spring-boot-starter-test test + + + junit + junit + 4.13.1 + test + diff --git a/sdk/spring/azure-spring-boot-test-cosmos/pom.xml b/sdk/spring/azure-spring-boot-test-cosmos/pom.xml index fce4e36b40780..72c6349942649 100644 --- a/sdk/spring/azure-spring-boot-test-cosmos/pom.xml +++ b/sdk/spring/azure-spring-boot-test-cosmos/pom.xml @@ -43,6 +43,13 @@ io.projectreactor.netty reactor-netty + + + junit + junit + 4.13.1 + test + diff --git a/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml b/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml index 94492d24a0f3c..3aca7b68689e6 100644 --- a/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml +++ b/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml @@ -54,6 +54,13 @@ spring-boot-starter-test test + + + junit + junit + 4.13.1 + test + diff --git a/sdk/spring/azure-spring-boot-test-keyvault/pom.xml b/sdk/spring/azure-spring-boot-test-keyvault/pom.xml index b883f07163ce5..a04ee0857b3bb 100644 --- a/sdk/spring/azure-spring-boot-test-keyvault/pom.xml +++ b/sdk/spring/azure-spring-boot-test-keyvault/pom.xml @@ -54,6 +54,13 @@ spring-boot-starter-test test + + + junit + junit + 4.13.1 + test + diff --git a/sdk/spring/azure-spring-boot-test-parent/pom.xml b/sdk/spring/azure-spring-boot-test-parent/pom.xml index a8571de71b962..3cae7882c6b04 100644 --- a/sdk/spring/azure-spring-boot-test-parent/pom.xml +++ b/sdk/spring/azure-spring-boot-test-parent/pom.xml @@ -8,7 +8,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 @@ -26,7 +26,7 @@ org.springframework.cloud spring-cloud-dependencies - Hoxton.SR8 + 2020.0.0 pom import diff --git a/sdk/spring/azure-spring-boot-test-selenium-common/pom.xml b/sdk/spring/azure-spring-boot-test-selenium-common/pom.xml index c0ccf5c53f053..c5185b7a4e617 100644 --- a/sdk/spring/azure-spring-boot-test-selenium-common/pom.xml +++ b/sdk/spring/azure-spring-boot-test-selenium-common/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.7.RELEASE + 2.4.0 4.0.0 diff --git a/sdk/spring/azure-spring-boot-test-storage/pom.xml b/sdk/spring/azure-spring-boot-test-storage/pom.xml index e00d2d6000723..cb2ebc06daf55 100644 --- a/sdk/spring/azure-spring-boot-test-storage/pom.xml +++ b/sdk/spring/azure-spring-boot-test-storage/pom.xml @@ -57,8 +57,8 @@ - org.springframework.boot:spring-boot-starter-web:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-actuator:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter-web:[2.4.0] + org.springframework.boot:spring-boot-starter-actuator:[2.4.0] diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml index 73334a0f918b3..908063197454f 100644 --- a/sdk/spring/azure-spring-boot/pom.xml +++ b/sdk/spring/azure-spring-boot/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-autoconfigure - 2.3.5.RELEASE + 2.4.0 @@ -40,13 +40,13 @@ org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true @@ -66,43 +66,43 @@ org.springframework.security spring-security-core - 5.3.5.RELEASE + 5.4.0 true org.springframework.security spring-security-web - 5.3.5.RELEASE + 5.4.0 true org.springframework.security spring-security-oauth2-client - 5.3.5.RELEASE + 5.4.0 true org.springframework.security spring-security-oauth2-resource-server - 5.3.5.RELEASE + 5.4.0 true org.springframework.security spring-security-oauth2-jose - 5.3.5.RELEASE + 5.4.0 true org.springframework.security spring-security-config - 5.3.5.RELEASE + 5.4.0 true com.nimbusds nimbus-jose-jwt - 8.19 + 9.1.2 true @@ -129,7 +129,7 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 2.3.5.RELEASE + 2.4.0 true @@ -137,7 +137,7 @@ org.springframework spring-jms - 5.2.10.RELEASE + 5.3.0 true @@ -156,7 +156,7 @@ com.microsoft.azure msal4j - 1.8.1 + 1.9.1 true @@ -193,7 +193,7 @@ org.springframework.boot spring-boot-autoconfigure-processor - 2.3.5.RELEASE + 2.4.0 true @@ -231,7 +231,7 @@ org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -243,13 +243,13 @@ org.springframework.boot spring-boot-starter-web - 2.3.5.RELEASE + 2.4.0 test org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -273,14 +273,32 @@ org.springframework spring-core - 5.2.10.RELEASE + 5.3.0 org.springframework spring-webflux - 5.2.10.RELEASE + 5.3.0 true + + org.springframework + spring-context + 5.3.0 + true + + + org.junit.jupiter + junit-jupiter-engine + 5.7.1 + test + + + org.junit.vintage + junit-vintage-engine + 5.7.1 + test + org.apache.httpcomponents httpclient @@ -303,31 +321,32 @@ com.github.spotbugs:spotbugs-annotations:[4.2.0] com.fasterxml.jackson.core:jackson-databind:[2.12.1] net.minidev:json-smart:[2.3] - com.microsoft.azure:msal4j:[1.8.1] + com.microsoft.azure:msal4j:[1.9.1] com.microsoft.spring.data.gremlin:spring-data-gremlin:[2.3.0] - com.nimbusds:nimbus-jose-jwt:[8.19] + com.nimbusds:nimbus-jose-jwt:[9.1.2] javax.servlet:javax.servlet-api:[4.0.1] javax.annotation:javax.annotation-api:[1.3.2] javax.validation:validation-api:[2.0.1.Final] org.slf4j:slf4j-api:[1.7.30] org.hibernate.validator:hibernate-validator:[6.1.6.Final] - org.springframework:spring-core:[5.2.10.RELEASE] - org.springframework:spring-web:[5.2.10.RELEASE] - org.springframework:spring-jms:[5.2.10.RELEASE] - org.springframework:spring-webflux:[5.2.10.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-test:[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.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-jose:[5.3.5.RELEASE] - org.springframework.security:spring-security-web:[5.3.5.RELEASE] + org.springframework:spring-core:[5.3.0] + org.springframework:spring-context:[5.3.0] + org.springframework:spring-web:[5.3.0] + org.springframework:spring-jms:[5.3.0] + org.springframework:spring-webflux:[5.3.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-test:[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.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-jose:[5.4.0] + org.springframework.security:spring-security-web:[5.4.0] org.apache.qpid:qpid-jms-client:[0.53.0] diff --git a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADClientRegistrationDeserializer.java b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADClientRegistrationDeserializer.java index 56547cd73b64a..4072a0bedbf2f 100644 --- a/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADClientRegistrationDeserializer.java +++ b/sdk/spring/azure-spring-boot/src/main/java/com/azure/spring/aad/webapp/jackson/AADClientRegistrationDeserializer.java @@ -51,7 +51,7 @@ public ClientRegistration deserialize(JsonParser parser, DeserializationContext .authorizationGrantType( AUTHORIZATION_GRANT_TYPE_CONVERTER.convert( findObjectNode(clientRegistrationNode, "authorizationGrantType"))) - .redirectUriTemplate(findStringValue(clientRegistrationNode, "redirectUriTemplate")) + .redirectUri(findStringValue(clientRegistrationNode, "redirectUri")) .scope(findValue(clientRegistrationNode, "scopes", SET_TYPE_REFERENCE, mapper)) .clientName(findStringValue(clientRegistrationNode, "clientName")) .authorizationUri(findStringValue(providerDetailsNode, "authorizationUri")) diff --git a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml index 120f0c40c4c49..7b9a5534e1446 100644 --- a/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml +++ b/sdk/spring/azure-spring-cloud-autoconfigure/pom.xml @@ -26,13 +26,13 @@ org.springframework.boot spring-boot-autoconfigure - 2.3.5.RELEASE + 2.4.0 org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 @@ -46,7 +46,7 @@ org.springframework spring-jdbc - 5.2.10.RELEASE + 5.3.0 true @@ -77,7 +77,7 @@ com.microsoft.sqlserver mssql-jdbc - 7.4.1.jre8 + 8.4.1.jre8 true @@ -101,7 +101,7 @@ org.springframework.data spring-data-redis - 2.3.5.RELEASE + 2.4.0 true @@ -109,7 +109,7 @@ org.springframework.kafka spring-kafka - 2.5.7.RELEASE + 2.6.0 true @@ -117,14 +117,14 @@ org.springframework.data spring-data-mongodb - 3.0.5.RELEASE + 3.1.0 true org.springframework spring-context-support - 5.2.10.RELEASE + 5.3.0 true @@ -150,14 +150,14 @@ org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -171,7 +171,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -210,18 +210,18 @@ com.fasterxml.jackson.core:jackson-core:[2.12.1] - com.microsoft.sqlserver:mssql-jdbc:[7.4.1.jre8] + com.microsoft.sqlserver:mssql-jdbc:[8.4.1.jre8] mysql:mysql-connector-java:[8.0.22] org.hibernate.validator:hibernate-validator:[6.1.6.Final] org.postgresql:postgresql:[42.2.18] - org.springframework.boot:spring-boot-autoconfigure:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-configuration-processor:[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.kafka:spring-kafka:[2.5.7.RELEASE] - org.springframework:spring-context-support:[5.2.10.RELEASE] - org.springframework:spring-jdbc:[5.2.10.RELEASE] - org.springframework:spring-web:[5.2.10.RELEASE] + org.springframework.boot:spring-boot-autoconfigure:[2.4.0] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] + org.springframework.data:spring-data-mongodb:[3.1.0] + org.springframework.data:spring-data-redis:[2.4.0] + org.springframework.kafka:spring-kafka:[2.6.0] + org.springframework:spring-context-support:[5.3.0] + org.springframework:spring-jdbc:[5.3.0] + org.springframework:spring-web:[5.3.0] diff --git a/sdk/spring/azure-spring-cloud-context/pom.xml b/sdk/spring/azure-spring-cloud-context/pom.xml index aa3701e3ea922..6c4e1cf2b9472 100644 --- a/sdk/spring/azure-spring-cloud-context/pom.xml +++ b/sdk/spring/azure-spring-cloud-context/pom.xml @@ -26,18 +26,18 @@ org.springframework spring-context - 5.2.10.RELEASE + 5.3.0 org.springframework.boot spring-boot-starter-aop - 2.3.5.RELEASE + 2.4.0 org.springframework spring-context-support - 5.2.10.RELEASE + 5.3.0 true @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true @@ -82,13 +82,13 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -114,10 +114,10 @@ commons-io:commons-io:[2.5] - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-aop:[2.3.5.RELEASE] - org.springframework:spring-context-support:[5.2.10.RELEASE] - org.springframework:spring-context:[5.2.10.RELEASE] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] + org.springframework.boot:spring-boot-starter-aop:[2.4.0] + org.springframework:spring-context-support:[5.3.0] + org.springframework:spring-context:[5.3.0] diff --git a/sdk/spring/azure-spring-cloud-messaging/pom.xml b/sdk/spring/azure-spring-cloud-messaging/pom.xml index 6295fcbcd9ab6..dda275c1d9c6e 100644 --- a/sdk/spring/azure-spring-cloud-messaging/pom.xml +++ b/sdk/spring/azure-spring-cloud-messaging/pom.xml @@ -25,7 +25,7 @@ org.springframework spring-messaging - 5.2.10.RELEASE + 5.3.0 com.azure.spring @@ -42,7 +42,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -81,7 +81,7 @@ - org.springframework:spring-messaging:[5.2.10.RELEASE] + org.springframework:spring-messaging:[5.3.0] diff --git a/sdk/spring/azure-spring-cloud-starter-cache/pom.xml b/sdk/spring/azure-spring-cloud-starter-cache/pom.xml index d47cc3a70790a..fb2dafa7df96a 100644 --- a/sdk/spring/azure-spring-cloud-starter-cache/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-cache/pom.xml @@ -30,12 +30,12 @@ org.springframework.boot spring-boot-starter-cache - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-data-redis - 2.3.5.RELEASE + 2.4.0 @@ -48,8 +48,8 @@ - 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-cache:[2.4.0] + org.springframework.boot:spring-boot-starter-data-redis:[2.4.0] diff --git a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml index 524c9e3c7b32e..9819f9cdc5f31 100644 --- a/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml +++ b/sdk/spring/azure-spring-cloud-starter-eventhubs-kafka/pom.xml @@ -25,7 +25,7 @@ org.springframework.cloud spring-cloud-starter-stream-kafka - 3.0.8.RELEASE + 3.1.0 com.azure.spring @@ -43,7 +43,7 @@ - org.springframework.cloud:spring-cloud-starter-stream-kafka:[3.0.8.RELEASE] + org.springframework.cloud:spring-cloud-starter-stream-kafka:[3.1.0] diff --git a/sdk/spring/azure-spring-cloud-storage/pom.xml b/sdk/spring/azure-spring-cloud-storage/pom.xml index 3527ceb32deba..bbdfc10066db1 100644 --- a/sdk/spring/azure-spring-cloud-storage/pom.xml +++ b/sdk/spring/azure-spring-cloud-storage/pom.xml @@ -29,7 +29,7 @@ org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true @@ -52,7 +52,7 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 2.3.5.RELEASE + 2.4.0 true @@ -65,13 +65,13 @@ org.springframework.boot spring-boot-starter-logging - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -85,7 +85,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -125,9 +125,9 @@ org.hibernate.validator:hibernate-validator:[6.1.6.Final] - org.springframework.boot:spring-boot-actuator-autoconfigure:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-logging:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-actuator-autoconfigure:[2.4.0] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] + org.springframework.boot:spring-boot-starter-logging:[2.4.0] diff --git a/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/pom.xml index 9665dd8c4eff0..228d0f1eac0b4 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/pom.xml +++ b/sdk/spring/azure-spring-cloud-stream-binder-eventhubs/pom.xml @@ -26,7 +26,7 @@ org.springframework.cloud spring-cloud-stream - 3.0.8.RELEASE + 3.1.0 com.azure.spring @@ -44,7 +44,7 @@ org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true @@ -74,8 +74,8 @@ - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] - org.springframework.cloud:spring-cloud-stream:[3.0.8.RELEASE] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] + org.springframework.cloud:spring-cloud-stream:[3.1.0] diff --git a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-core/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-core/pom.xml index 0c37ed83d8fe7..06c932331dbbb 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-core/pom.xml +++ b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-core/pom.xml @@ -25,7 +25,7 @@ org.springframework.cloud spring-cloud-stream - 3.0.8.RELEASE + 3.1.0 com.azure.spring @@ -64,7 +64,7 @@ com.microsoft.azure:azure-servicebus:[3.4.0] - org.springframework.cloud:spring-cloud-stream:[3.0.8.RELEASE] + org.springframework.cloud:spring-cloud-stream:[3.1.0] diff --git a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/pom.xml index 87ace78b4a214..324de590039e5 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/pom.xml +++ b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-queue/pom.xml @@ -33,7 +33,7 @@ org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true @@ -64,7 +64,7 @@ - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] diff --git a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-topic/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-topic/pom.xml index 752898ac3b6c9..ef9e59d91a0fc 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-servicebus-topic/pom.xml +++ b/sdk/spring/azure-spring-cloud-stream-binder-servicebus-topic/pom.xml @@ -33,7 +33,7 @@ org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true @@ -64,7 +64,7 @@ - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] diff --git a/sdk/spring/azure-spring-cloud-stream-binder-test/pom.xml b/sdk/spring/azure-spring-cloud-stream-binder-test/pom.xml index 1b4652ed77186..4ef72db9214b9 100644 --- a/sdk/spring/azure-spring-cloud-stream-binder-test/pom.xml +++ b/sdk/spring/azure-spring-cloud-stream-binder-test/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-stream-binder-test - 3.0.8.RELEASE + 3.1.0 junit @@ -31,7 +31,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 org.powermock @@ -46,7 +46,7 @@ org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 org.hibernate.validator @@ -56,7 +56,7 @@ org.springframework.cloud spring-cloud-stream - 3.0.8.RELEASE + 3.1.0 com.azure.spring @@ -77,12 +77,12 @@ junit:junit:[4.13.1] org.hibernate.validator:hibernate-validator:[6.1.6.Final] - org.mockito:mockito-core:[3.3.3] + org.mockito:mockito-core:[3.6.0] org.powermock:powermock-api-mockito2:[2.0.2] org.powermock:powermock-module-junit4:[2.0.2] - org.springframework.boot:spring-boot-starter-test:[2.3.5.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.boot:spring-boot-starter-test:[2.4.0] + org.springframework.cloud:spring-cloud-stream-binder-test:[3.1.0] + org.springframework.cloud:spring-cloud-stream:[3.1.0] diff --git a/sdk/spring/azure-spring-cloud-telemetry/pom.xml b/sdk/spring/azure-spring-cloud-telemetry/pom.xml index f19f486cf9d8d..35d8e59e9bda1 100644 --- a/sdk/spring/azure-spring-cloud-telemetry/pom.xml +++ b/sdk/spring/azure-spring-cloud-telemetry/pom.xml @@ -31,22 +31,22 @@ org.springframework spring-context - 5.2.10.RELEASE + 5.3.0 org.springframework.boot spring-boot-starter-aop - 2.3.5.RELEASE + 2.4.0 org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true @@ -63,7 +63,7 @@ org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -80,10 +80,10 @@ com.fasterxml.jackson.core:jackson-databind:[2.12.1] commons-io:commons-io:[2.5] - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-aop:[2.3.5.RELEASE] - org.springframework:spring-context:[5.2.10.RELEASE] - org.springframework:spring-web:[5.2.10.RELEASE] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] + org.springframework.boot:spring-boot-starter-aop:[2.4.0] + org.springframework:spring-context:[5.3.0] + org.springframework:spring-web:[5.3.0] diff --git a/sdk/spring/azure-spring-data-gremlin/pom.xml b/sdk/spring/azure-spring-data-gremlin/pom.xml index d8d52d9408504..da651753def2c 100644 --- a/sdk/spring/azure-spring-data-gremlin/pom.xml +++ b/sdk/spring/azure-spring-data-gremlin/pom.xml @@ -24,7 +24,7 @@ org.springframework spring-core - 5.2.10.RELEASE + 5.3.0 commons-logging @@ -37,35 +37,35 @@ org.springframework spring-context - 5.2.10.RELEASE + 5.3.0 org.springframework spring-tx - 5.2.10.RELEASE + 5.3.0 org.springframework spring-web - 5.2.10.RELEASE + 5.3.0 org.springframework.data spring-data-commons - 2.3.5.RELEASE + 2.4.0 org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 test @@ -86,13 +86,13 @@ org.apache.commons commons-lang3 - 3.10 + 3.11 org.springframework.boot spring-boot-configuration-processor - 2.3.5.RELEASE + 2.4.0 true @@ -100,7 +100,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test @@ -120,6 +120,13 @@ 3.0.2 provided + + + junit + junit + 4.13.1 + test + @@ -134,15 +141,15 @@ com.fasterxml.jackson.core:jackson-databind:[2.12.1] javax.annotation:javax.annotation-api:[1.3.2] - org.apache.commons:commons-lang3:[3.10] + org.apache.commons:commons-lang3:[3.11] org.apache.tinkerpop:gremlin-driver:[3.2.4] - org.springframework.boot:spring-boot-configuration-processor:[2.3.5.RELEASE] - org.springframework.boot:spring-boot-starter-test:[2.3.5.RELEASE] - org.springframework.data:spring-data-commons:[2.3.5.RELEASE] - org.springframework:spring-context:[5.2.10.RELEASE] - org.springframework:spring-core:[5.2.10.RELEASE] - org.springframework:spring-tx:[5.2.10.RELEASE] - org.springframework:spring-web:[5.2.10.RELEASE] + org.springframework.boot:spring-boot-configuration-processor:[2.4.0] + org.springframework.boot:spring-boot-starter-test:[2.4.0] + org.springframework.data:spring-data-commons:[2.4.0] + org.springframework:spring-context:[5.3.0] + org.springframework:spring-core:[5.3.0] + org.springframework:spring-tx:[5.3.0] + org.springframework:spring-web:[5.3.0] diff --git a/sdk/spring/azure-spring-integration-core/pom.xml b/sdk/spring/azure-spring-integration-core/pom.xml index d5378a6a349bb..387a3dfc9e181 100644 --- a/sdk/spring/azure-spring-integration-core/pom.xml +++ b/sdk/spring/azure-spring-integration-core/pom.xml @@ -31,12 +31,12 @@ org.springframework spring-messaging - 5.2.10.RELEASE + 5.3.0 org.springframework.integration spring-integration-core - 5.3.3.RELEASE + 5.4.0 - org.springframework.integration:spring-integration-core:[5.3.3.RELEASE] - org.springframework:spring-messaging:[5.2.10.RELEASE] + org.springframework.integration:spring-integration-core:[5.4.0] + org.springframework:spring-messaging:[5.3.0] diff --git a/sdk/spring/azure-spring-integration-test/pom.xml b/sdk/spring/azure-spring-integration-test/pom.xml index a38fc72658658..bea48598e7a39 100644 --- a/sdk/spring/azure-spring-integration-test/pom.xml +++ b/sdk/spring/azure-spring-integration-test/pom.xml @@ -36,7 +36,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 org.powermock @@ -56,7 +56,7 @@ org.springframework.boot spring-boot-starter-test - 2.3.5.RELEASE + 2.4.0 org.hibernate.validator @@ -78,10 +78,10 @@ com.fasterxml.jackson.core:jackson-databind:[2.12.1] junit:junit:[4.13.1] org.hibernate.validator:hibernate-validator:[6.1.6.Final] - org.mockito:mockito-core:[3.3.3] + org.mockito:mockito-core:[3.6.0] org.powermock:powermock-api-mockito2:[2.0.2] org.powermock:powermock-module-junit4:[2.0.2] - org.springframework.boot:spring-boot-starter-test:[2.3.5.RELEASE] + org.springframework.boot:spring-boot-starter-test:[2.4.0] diff --git a/sdk/spring/scripts/replace_util.py b/sdk/spring/scripts/replace_util.py index ff905d83fde3f..6102b5c208f55 100644 --- a/sdk/spring/scripts/replace_util.py +++ b/sdk/spring/scripts/replace_util.py @@ -21,21 +21,21 @@ 'appconfiguration': { 'sdk/appconfiguration/azure-spring-cloud-test-appconfiguration-config/pom.xml': { VERSION_UPDATE_ITEMS: ( - VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'), + VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.4.0'), ) } }, 'cosmos': { 'sdk/cosmos/azure-spring-data-cosmos-test/pom.xml': { VERSION_UPDATE_ITEMS: ( - VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'), + VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.4.0'), ) } }, 'spring': { 'sdk/spring/azure-spring-boot-test-parent/pom.xml': { VERSION_UPDATE_ITEMS: ( - VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'), + VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.4.0'), ) } } @@ -201,4 +201,4 @@ def replace_version(module, pom): if __name__ == '__main__': - main() + main() \ No newline at end of file diff --git a/sdk/spring/scripts/spring_managed_external_dependencies.txt b/sdk/spring/scripts/spring_managed_external_dependencies.txt index 3b4e5e4891aa0..e81c599de0e15 100644 --- a/sdk/spring/scripts/spring_managed_external_dependencies.txt +++ b/sdk/spring/scripts/spring_managed_external_dependencies.txt @@ -2,238 +2,21 @@ antlr:antlr;2.7.7 ch.qos.logback:logback-access;1.2.3 ch.qos.logback:logback-classic;1.2.3 ch.qos.logback:logback-core;1.2.3 -com.amazonaws:aws-java-sdk-accessanalyzer;1.11.792 -com.amazonaws:aws-java-sdk-acm;1.11.792 -com.amazonaws:aws-java-sdk-acmpca;1.11.792 -com.amazonaws:aws-java-sdk-alexaforbusiness;1.11.792 -com.amazonaws:aws-java-sdk-amplify;1.11.792 -com.amazonaws:aws-java-sdk-api-gateway;1.11.792 -com.amazonaws:aws-java-sdk-apigatewaymanagementapi;1.11.792 -com.amazonaws:aws-java-sdk-apigatewayv2;1.11.792 -com.amazonaws:aws-java-sdk-appconfig;1.11.792 -com.amazonaws:aws-java-sdk-applicationautoscaling;1.11.792 -com.amazonaws:aws-java-sdk-applicationinsights;1.11.792 -com.amazonaws:aws-java-sdk-appmesh;1.11.792 -com.amazonaws:aws-java-sdk-appstream;1.11.792 -com.amazonaws:aws-java-sdk-appsync;1.11.792 -com.amazonaws:aws-java-sdk-athena;1.11.792 -com.amazonaws:aws-java-sdk-augmentedairuntime;1.11.792 -com.amazonaws:aws-java-sdk-autoscaling;1.11.792 -com.amazonaws:aws-java-sdk-autoscalingplans;1.11.792 -com.amazonaws:aws-java-sdk-backup;1.11.792 -com.amazonaws:aws-java-sdk-batch;1.11.792 -com.amazonaws:aws-java-sdk-bom;1.11.792 -com.amazonaws:aws-java-sdk-budgets;1.11.792 -com.amazonaws:aws-java-sdk-chime;1.11.792 -com.amazonaws:aws-java-sdk-cloud9;1.11.792 -com.amazonaws:aws-java-sdk-clouddirectory;1.11.792 -com.amazonaws:aws-java-sdk-cloudformation;1.11.792 -com.amazonaws:aws-java-sdk-cloudfront;1.11.792 -com.amazonaws:aws-java-sdk-cloudhsm;1.11.792 -com.amazonaws:aws-java-sdk-cloudhsmv2;1.11.792 -com.amazonaws:aws-java-sdk-cloudsearch;1.11.792 -com.amazonaws:aws-java-sdk-cloudtrail;1.11.792 -com.amazonaws:aws-java-sdk-cloudwatch;1.11.792 -com.amazonaws:aws-java-sdk-cloudwatchmetrics;1.11.792 -com.amazonaws:aws-java-sdk-codebuild;1.11.792 -com.amazonaws:aws-java-sdk-codecommit;1.11.792 -com.amazonaws:aws-java-sdk-codedeploy;1.11.792 -com.amazonaws:aws-java-sdk-codeguruprofiler;1.11.792 -com.amazonaws:aws-java-sdk-codegurureviewer;1.11.792 -com.amazonaws:aws-java-sdk-codepipeline;1.11.792 -com.amazonaws:aws-java-sdk-codestar;1.11.792 -com.amazonaws:aws-java-sdk-codestarconnections;1.11.792 -com.amazonaws:aws-java-sdk-codestarnotifications;1.11.792 -com.amazonaws:aws-java-sdk-cognitoidentity;1.11.792 -com.amazonaws:aws-java-sdk-cognitoidp;1.11.792 -com.amazonaws:aws-java-sdk-cognitosync;1.11.792 -com.amazonaws:aws-java-sdk-comprehend;1.11.792 -com.amazonaws:aws-java-sdk-comprehendmedical;1.11.792 -com.amazonaws:aws-java-sdk-computeoptimizer;1.11.792 -com.amazonaws:aws-java-sdk-config;1.11.792 -com.amazonaws:aws-java-sdk-connect;1.11.792 -com.amazonaws:aws-java-sdk-connectparticipant;1.11.792 -com.amazonaws:aws-java-sdk-core;1.11.792 -com.amazonaws:aws-java-sdk-costandusagereport;1.11.792 -com.amazonaws:aws-java-sdk-costexplorer;1.11.792 -com.amazonaws:aws-java-sdk-dataexchange;1.11.792 -com.amazonaws:aws-java-sdk-datapipeline;1.11.792 -com.amazonaws:aws-java-sdk-datasync;1.11.792 -com.amazonaws:aws-java-sdk-dax;1.11.792 -com.amazonaws:aws-java-sdk-detective;1.11.792 -com.amazonaws:aws-java-sdk-devicefarm;1.11.792 -com.amazonaws:aws-java-sdk-directconnect;1.11.792 -com.amazonaws:aws-java-sdk-directory;1.11.792 -com.amazonaws:aws-java-sdk-discovery;1.11.792 -com.amazonaws:aws-java-sdk-dlm;1.11.792 -com.amazonaws:aws-java-sdk-dms;1.11.792 -com.amazonaws:aws-java-sdk-docdb;1.11.792 -com.amazonaws:aws-java-sdk-dynamodb;1.11.792 -com.amazonaws:aws-java-sdk-ebs;1.11.792 -com.amazonaws:aws-java-sdk-ec2;1.11.792 -com.amazonaws:aws-java-sdk-ec2instanceconnect;1.11.792 -com.amazonaws:aws-java-sdk-ecr;1.11.792 -com.amazonaws:aws-java-sdk-ecs;1.11.792 -com.amazonaws:aws-java-sdk-efs;1.11.792 -com.amazonaws:aws-java-sdk-eks;1.11.792 -com.amazonaws:aws-java-sdk-elasticache;1.11.792 -com.amazonaws:aws-java-sdk-elasticbeanstalk;1.11.792 -com.amazonaws:aws-java-sdk-elasticinference;1.11.792 -com.amazonaws:aws-java-sdk-elasticloadbalancing;1.11.792 -com.amazonaws:aws-java-sdk-elasticloadbalancingv2;1.11.792 -com.amazonaws:aws-java-sdk-elasticsearch;1.11.792 -com.amazonaws:aws-java-sdk-elastictranscoder;1.11.792 -com.amazonaws:aws-java-sdk-emr;1.11.792 -com.amazonaws:aws-java-sdk-eventbridge;1.11.792 -com.amazonaws:aws-java-sdk-events;1.11.792 -com.amazonaws:aws-java-sdk-fms;1.11.792 -com.amazonaws:aws-java-sdk-forecast;1.11.792 -com.amazonaws:aws-java-sdk-forecastquery;1.11.792 -com.amazonaws:aws-java-sdk-frauddetector;1.11.792 -com.amazonaws:aws-java-sdk-fsx;1.11.792 -com.amazonaws:aws-java-sdk-gamelift;1.11.792 -com.amazonaws:aws-java-sdk-glacier;1.11.792 -com.amazonaws:aws-java-sdk-globalaccelerator;1.11.792 -com.amazonaws:aws-java-sdk-glue;1.11.792 -com.amazonaws:aws-java-sdk-greengrass;1.11.792 -com.amazonaws:aws-java-sdk-groundstation;1.11.792 -com.amazonaws:aws-java-sdk-guardduty;1.11.792 -com.amazonaws:aws-java-sdk-health;1.11.792 -com.amazonaws:aws-java-sdk-iam;1.11.792 -com.amazonaws:aws-java-sdk-imagebuilder;1.11.792 -com.amazonaws:aws-java-sdk-importexport;1.11.792 -com.amazonaws:aws-java-sdk-inspector;1.11.792 -com.amazonaws:aws-java-sdk-iot;1.11.792 -com.amazonaws:aws-java-sdk-iot1clickdevices;1.11.792 -com.amazonaws:aws-java-sdk-iot1clickprojects;1.11.792 -com.amazonaws:aws-java-sdk-iotanalytics;1.11.792 -com.amazonaws:aws-java-sdk-iotevents;1.11.792 -com.amazonaws:aws-java-sdk-ioteventsdata;1.11.792 -com.amazonaws:aws-java-sdk-iotjobsdataplane;1.11.792 -com.amazonaws:aws-java-sdk-iotsecuretunneling;1.11.792 -com.amazonaws:aws-java-sdk-iotsitewise;1.11.792 -com.amazonaws:aws-java-sdk-iotthingsgraph;1.11.792 -com.amazonaws:aws-java-sdk-kafka;1.11.792 -com.amazonaws:aws-java-sdk-kendra;1.11.792 -com.amazonaws:aws-java-sdk-kinesis;1.11.792 -com.amazonaws:aws-java-sdk-kinesisanalyticsv2;1.11.792 -com.amazonaws:aws-java-sdk-kinesisvideo;1.11.792 -com.amazonaws:aws-java-sdk-kinesisvideosignalingchannels;1.11.792 -com.amazonaws:aws-java-sdk-kms;1.11.792 -com.amazonaws:aws-java-sdk-lakeformation;1.11.792 -com.amazonaws:aws-java-sdk-lambda;1.11.792 -com.amazonaws:aws-java-sdk-lex;1.11.792 -com.amazonaws:aws-java-sdk-lexmodelbuilding;1.11.792 -com.amazonaws:aws-java-sdk-licensemanager;1.11.792 -com.amazonaws:aws-java-sdk-lightsail;1.11.792 -com.amazonaws:aws-java-sdk-logs;1.11.792 -com.amazonaws:aws-java-sdk-machinelearning;1.11.792 -com.amazonaws:aws-java-sdk-macie;1.11.792 -com.amazonaws:aws-java-sdk-macie2;1.11.792 -com.amazonaws:aws-java-sdk-managedblockchain;1.11.792 -com.amazonaws:aws-java-sdk-marketplacecatalog;1.11.792 -com.amazonaws:aws-java-sdk-marketplacecommerceanalytics;1.11.792 -com.amazonaws:aws-java-sdk-marketplaceentitlement;1.11.792 -com.amazonaws:aws-java-sdk-marketplacemeteringservice;1.11.792 -com.amazonaws:aws-java-sdk-mechanicalturkrequester;1.11.792 -com.amazonaws:aws-java-sdk-mediaconnect;1.11.792 -com.amazonaws:aws-java-sdk-mediaconvert;1.11.792 -com.amazonaws:aws-java-sdk-medialive;1.11.792 -com.amazonaws:aws-java-sdk-mediapackage;1.11.792 -com.amazonaws:aws-java-sdk-mediapackagevod;1.11.792 -com.amazonaws:aws-java-sdk-mediastore;1.11.792 -com.amazonaws:aws-java-sdk-mediastoredata;1.11.792 -com.amazonaws:aws-java-sdk-mediatailor;1.11.792 -com.amazonaws:aws-java-sdk-migrationhub;1.11.792 -com.amazonaws:aws-java-sdk-migrationhubconfig;1.11.792 -com.amazonaws:aws-java-sdk-mobile;1.11.792 -com.amazonaws:aws-java-sdk-models;1.11.792 -com.amazonaws:aws-java-sdk-mq;1.11.792 -com.amazonaws:aws-java-sdk-neptune;1.11.792 -com.amazonaws:aws-java-sdk-networkmanager;1.11.792 -com.amazonaws:aws-java-sdk-opsworks;1.11.792 -com.amazonaws:aws-java-sdk-opsworkscm;1.11.792 -com.amazonaws:aws-java-sdk-organizations;1.11.792 -com.amazonaws:aws-java-sdk-outposts;1.11.792 -com.amazonaws:aws-java-sdk-personalize;1.11.792 -com.amazonaws:aws-java-sdk-personalizeevents;1.11.792 -com.amazonaws:aws-java-sdk-personalizeruntime;1.11.792 -com.amazonaws:aws-java-sdk-pi;1.11.792 -com.amazonaws:aws-java-sdk-pinpoint;1.11.792 -com.amazonaws:aws-java-sdk-pinpointemail;1.11.792 -com.amazonaws:aws-java-sdk-pinpointsmsvoice;1.11.792 -com.amazonaws:aws-java-sdk-polly;1.11.792 -com.amazonaws:aws-java-sdk-pricing;1.11.792 -com.amazonaws:aws-java-sdk-qldb;1.11.792 -com.amazonaws:aws-java-sdk-qldbsession;1.11.792 -com.amazonaws:aws-java-sdk-quicksight;1.11.792 -com.amazonaws:aws-java-sdk-ram;1.11.792 -com.amazonaws:aws-java-sdk-rds;1.11.792 -com.amazonaws:aws-java-sdk-rdsdata;1.11.792 -com.amazonaws:aws-java-sdk-redshift;1.11.792 -com.amazonaws:aws-java-sdk-rekognition;1.11.792 -com.amazonaws:aws-java-sdk-resourcegroups;1.11.792 -com.amazonaws:aws-java-sdk-resourcegroupstaggingapi;1.11.792 -com.amazonaws:aws-java-sdk-robomaker;1.11.792 -com.amazonaws:aws-java-sdk-route53;1.11.792 -com.amazonaws:aws-java-sdk-route53resolver;1.11.792 -com.amazonaws:aws-java-sdk-s3;1.11.792 -com.amazonaws:aws-java-sdk-s3control;1.11.792 -com.amazonaws:aws-java-sdk-sagemaker;1.11.792 -com.amazonaws:aws-java-sdk-sagemakerruntime;1.11.792 -com.amazonaws:aws-java-sdk-savingsplans;1.11.792 -com.amazonaws:aws-java-sdk-schemas;1.11.792 -com.amazonaws:aws-java-sdk-secretsmanager;1.11.792 -com.amazonaws:aws-java-sdk-securityhub;1.11.792 -com.amazonaws:aws-java-sdk-serverlessapplicationrepository;1.11.792 -com.amazonaws:aws-java-sdk-servermigration;1.11.792 -com.amazonaws:aws-java-sdk-servicecatalog;1.11.792 -com.amazonaws:aws-java-sdk-servicediscovery;1.11.792 -com.amazonaws:aws-java-sdk-servicequotas;1.11.792 -com.amazonaws:aws-java-sdk-ses;1.11.792 -com.amazonaws:aws-java-sdk-sesv2;1.11.792 -com.amazonaws:aws-java-sdk-shield;1.11.792 -com.amazonaws:aws-java-sdk-signer;1.11.792 -com.amazonaws:aws-java-sdk-simpledb;1.11.792 -com.amazonaws:aws-java-sdk-simpleworkflow;1.11.792 -com.amazonaws:aws-java-sdk-snowball;1.11.792 -com.amazonaws:aws-java-sdk-sns;1.11.792 -com.amazonaws:aws-java-sdk-sqs;1.11.792 -com.amazonaws:aws-java-sdk-ssm;1.11.792 -com.amazonaws:aws-java-sdk-sso;1.11.792 -com.amazonaws:aws-java-sdk-ssooidc;1.11.792 -com.amazonaws:aws-java-sdk-stepfunctions;1.11.792 -com.amazonaws:aws-java-sdk-storagegateway;1.11.792 -com.amazonaws:aws-java-sdk-sts;1.11.792 -com.amazonaws:aws-java-sdk-support;1.11.792 -com.amazonaws:aws-java-sdk-swf-libraries;1.11.22 -com.amazonaws:aws-java-sdk-synthetics;1.11.792 -com.amazonaws:aws-java-sdk-textract;1.11.792 -com.amazonaws:aws-java-sdk-transcribe;1.11.792 -com.amazonaws:aws-java-sdk-transfer;1.11.792 -com.amazonaws:aws-java-sdk-translate;1.11.792 -com.amazonaws:aws-java-sdk-waf;1.11.792 -com.amazonaws:aws-java-sdk-wafv2;1.11.792 -com.amazonaws:aws-java-sdk-workdocs;1.11.792 -com.amazonaws:aws-java-sdk-worklink;1.11.792 -com.amazonaws:aws-java-sdk-workmail;1.11.792 -com.amazonaws:aws-java-sdk-workmailmessageflow;1.11.792 -com.amazonaws:aws-java-sdk-workspaces;1.11.792 -com.amazonaws:aws-java-sdk-xray;1.11.792 -com.amazonaws:elasticache-java-cluster-client;1.1.1 com.atomikos:transactions-jdbc;4.0.6 com.atomikos:transactions-jms;4.0.6 com.atomikos:transactions-jta;4.0.6 -com.couchbase.client:java-client;3.0.9 -com.datastax.oss:java-driver-bom;4.6.1 -com.datastax.oss:java-driver-core;4.6.1 -com.datastax.oss:java-driver-core-shaded;4.6.1 -com.datastax.oss:java-driver-mapper-processor;4.6.1 -com.datastax.oss:java-driver-mapper-runtime;4.6.1 -com.datastax.oss:java-driver-query-builder;4.6.1 -com.datastax.oss:java-driver-shaded-guava;25.1-jre -com.datastax.oss:java-driver-test-infra;4.6.1 -com.datastax.oss:native-protocol;1.4.10 +com.couchbase.client:java-client;3.0.10 +com.datastax.oss:java-driver-bom;4.9.0 +com.datastax.oss:java-driver-core;4.9.0 +com.datastax.oss:java-driver-core-shaded;4.9.0 +com.datastax.oss:java-driver-mapper-processor;4.9.0 +com.datastax.oss:java-driver-mapper-runtime;4.9.0 +com.datastax.oss:java-driver-metrics-micrometer;4.9.0 +com.datastax.oss:java-driver-metrics-microprofile;4.9.0 +com.datastax.oss:java-driver-query-builder;4.9.0 +com.datastax.oss:java-driver-shaded-guava;25.1-jre-graal-sub-1 +com.datastax.oss:java-driver-test-infra;4.9.0 +com.datastax.oss:native-protocol;1.4.11 com.ecwid.consul:consul-api;1.4.5 com.fasterxml.jackson.core:jackson-annotations;2.11.3 com.fasterxml.jackson.core:jackson-core;2.11.3 @@ -291,404 +74,52 @@ com.github.ben-manes.caffeine:guava;2.8.6 com.github.ben-manes.caffeine:jcache;2.8.6 com.github.ben-manes.caffeine:simulator;2.8.6 com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute;2.0.1 -com.github.tomakehurst:wiremock-jre8-standalone;2.26.2 -com.google.api-client:google-api-client;1.30.7 -com.google.api.grpc:grpc-google-cloud-accessapproval-v1;0.1.3 -com.google.api.grpc:grpc-google-cloud-asset-v1;1.5.0 -com.google.api.grpc:grpc-google-cloud-asset-v1beta1;0.90.0 -com.google.api.grpc:grpc-google-cloud-asset-v1p1beta1;0.90.0 -com.google.api.grpc:grpc-google-cloud-asset-v1p2beta1;0.90.0 -com.google.api.grpc:grpc-google-cloud-asset-v1p4beta1;0.90.0 -com.google.api.grpc:grpc-google-cloud-asset-v1p5beta1;0.90.0 -com.google.api.grpc:grpc-google-cloud-automl-v1;1.2.0 -com.google.api.grpc:grpc-google-cloud-automl-v1beta1;0.83.0 -com.google.api.grpc:grpc-google-cloud-bigquerydatatransfer-v1;1.0.4 -com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1alpha2;0.101.0 -com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta1;0.101.0 -com.google.api.grpc:grpc-google-cloud-bigquerystorage-v1beta2;0.101.0 -com.google.api.grpc:grpc-google-cloud-bigtable-admin-v2;1.13.1 -com.google.api.grpc:grpc-google-cloud-bigtable-v2;1.13.1 -com.google.api.grpc:grpc-google-cloud-billing-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-billingbudgets-v1beta1;0.3.0 -com.google.api.grpc:grpc-google-cloud-build-v1;2.0.0 -com.google.api.grpc:grpc-google-cloud-container-v1;1.0.4 -com.google.api.grpc:grpc-google-cloud-containeranalysis-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-containeranalysis-v1beta1;0.87.0 -com.google.api.grpc:grpc-google-cloud-datacatalog-v1;1.0.0 -com.google.api.grpc:grpc-google-cloud-datacatalog-v1beta1;0.37.0 -com.google.api.grpc:grpc-google-cloud-datalabeling-v1beta1;0.83.2 -com.google.api.grpc:grpc-google-cloud-dataproc-v1;1.0.0 -com.google.api.grpc:grpc-google-cloud-dataproc-v1beta2;0.88.0 -com.google.api.grpc:grpc-google-cloud-dialogflow-v2;2.1.0 -com.google.api.grpc:grpc-google-cloud-dialogflow-v2beta1;0.88.0 -com.google.api.grpc:grpc-google-cloud-dlp-v2;2.0.0 -com.google.api.grpc:grpc-google-cloud-document-ai-v1beta1;0.2.0 -com.google.api.grpc:grpc-google-cloud-document-ai-v1beta2;0.2.0 -com.google.api.grpc:grpc-google-cloud-error-reporting-v1beta1;0.86.0 -com.google.api.grpc:grpc-google-cloud-firestore-admin-v1;1.35.1 -com.google.api.grpc:grpc-google-cloud-firestore-v1;1.35.1 -com.google.api.grpc:grpc-google-cloud-firestore-v1beta1;0.88.1 -com.google.api.grpc:grpc-google-cloud-gameservices-v1alpha;0.19.1 -com.google.api.grpc:grpc-google-cloud-iamcredentials-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-iot-v1;1.0.2 -com.google.api.grpc:grpc-google-cloud-irm-v1alpha2;0.2.1 -com.google.api.grpc:grpc-google-cloud-kms-v1;0.86.0 -com.google.api.grpc:grpc-google-cloud-language-v1;1.82.0 -com.google.api.grpc:grpc-google-cloud-language-v1beta2;0.83.0 -com.google.api.grpc:grpc-google-cloud-logging-v2;0.84.2 -com.google.api.grpc:grpc-google-cloud-mediatranslation-v1beta1;0.2.0 -com.google.api.grpc:grpc-google-cloud-memcache-v1beta2;0.2.0 -com.google.api.grpc:grpc-google-cloud-monitoring-dashboard-v1;0.2.0 -com.google.api.grpc:grpc-google-cloud-monitoring-v3;1.82.1 -com.google.api.grpc:grpc-google-cloud-os-login-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-phishingprotection-v1beta1;0.29.0 -com.google.api.grpc:grpc-google-cloud-pubsub-v1;1.90.0 -com.google.api.grpc:grpc-google-cloud-recaptchaenterprise-v1;0.31.0 -com.google.api.grpc:grpc-google-cloud-recaptchaenterprise-v1beta1;0.31.0 -com.google.api.grpc:grpc-google-cloud-recommender-v1;1.2.0 -com.google.api.grpc:grpc-google-cloud-recommender-v1beta1;0.7.0 -com.google.api.grpc:grpc-google-cloud-redis-v1;1.0.0 -com.google.api.grpc:grpc-google-cloud-redis-v1beta1;0.85.0 -com.google.api.grpc:grpc-google-cloud-scheduler-v1;1.23.0 -com.google.api.grpc:grpc-google-cloud-scheduler-v1beta1;0.83.0 -com.google.api.grpc:grpc-google-cloud-secretmanager-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-secretmanager-v1beta1;1.1.0 -com.google.api.grpc:grpc-google-cloud-securitycenter-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-securitycenter-v1beta1;0.89.0 -com.google.api.grpc:grpc-google-cloud-securitycenter-v1p1beta1;0.89.0 -com.google.api.grpc:grpc-google-cloud-servicedirectory-v1beta1;0.2.0 -com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1;1.58.0 -com.google.api.grpc:grpc-google-cloud-spanner-admin-instance-v1;1.58.0 -com.google.api.grpc:grpc-google-cloud-spanner-v1;1.58.0 -com.google.api.grpc:grpc-google-cloud-speech-v1;1.24.0 -com.google.api.grpc:grpc-google-cloud-speech-v1beta1;0.77.0 -com.google.api.grpc:grpc-google-cloud-speech-v1p1beta1;0.77.0 -com.google.api.grpc:grpc-google-cloud-talent-v4beta1;0.36.1 -com.google.api.grpc:grpc-google-cloud-tasks-v2;1.30.0 -com.google.api.grpc:grpc-google-cloud-tasks-v2beta2;0.86.0 -com.google.api.grpc:grpc-google-cloud-tasks-v2beta3;0.86.0 -com.google.api.grpc:grpc-google-cloud-texttospeech-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-texttospeech-v1beta1;0.84.0 -com.google.api.grpc:grpc-google-cloud-trace-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-trace-v2;1.1.0 -com.google.api.grpc:grpc-google-cloud-translate-v3;1.1.0 -com.google.api.grpc:grpc-google-cloud-translate-v3beta1;0.78.0 -com.google.api.grpc:grpc-google-cloud-video-intelligence-v1;1.4.0 -com.google.api.grpc:grpc-google-cloud-video-intelligence-v1beta2;0.86.0 -com.google.api.grpc:grpc-google-cloud-video-intelligence-v1p1beta1;0.86.0 -com.google.api.grpc:grpc-google-cloud-video-intelligence-v1p2beta1;0.86.0 -com.google.api.grpc:grpc-google-cloud-video-intelligence-v1p3beta1;0.86.0 -com.google.api.grpc:grpc-google-cloud-vision-v1;1.81.3 -com.google.api.grpc:grpc-google-cloud-vision-v1p1beta1;0.82.3 -com.google.api.grpc:grpc-google-cloud-vision-v1p2beta1;1.81.3 -com.google.api.grpc:grpc-google-cloud-vision-v1p3beta1;0.82.3 -com.google.api.grpc:grpc-google-cloud-vision-v1p4beta1;0.82.3 -com.google.api.grpc:grpc-google-cloud-webrisk-v1;1.1.0 -com.google.api.grpc:grpc-google-cloud-webrisk-v1beta1;0.35.0 -com.google.api.grpc:grpc-google-cloud-websecurityscanner-v1;0.83.0 -com.google.api.grpc:grpc-google-cloud-websecurityscanner-v1alpha;0.83.0 -com.google.api.grpc:grpc-google-cloud-websecurityscanner-v1beta;0.83.0 -com.google.api.grpc:grpc-google-common-protos;1.18.0 -com.google.api.grpc:grpc-google-iam-v1;0.13.0 -com.google.api.grpc:proto-google-cloud-accessapproval-v1;0.1.3 -com.google.api.grpc:proto-google-cloud-asset-v1;1.5.0 -com.google.api.grpc:proto-google-cloud-asset-v1beta1;0.90.0 -com.google.api.grpc:proto-google-cloud-asset-v1p1beta1;0.90.0 -com.google.api.grpc:proto-google-cloud-asset-v1p2beta1;0.90.0 -com.google.api.grpc:proto-google-cloud-asset-v1p4beta1;0.90.0 -com.google.api.grpc:proto-google-cloud-asset-v1p5beta1;0.90.0 -com.google.api.grpc:proto-google-cloud-automl-v1;1.2.0 -com.google.api.grpc:proto-google-cloud-automl-v1beta1;0.83.0 -com.google.api.grpc:proto-google-cloud-bigquerydatatransfer-v1;1.0.4 -com.google.api.grpc:proto-google-cloud-bigquerystorage-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-bigquerystorage-v1alpha2;0.101.0 -com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta1;0.101.0 -com.google.api.grpc:proto-google-cloud-bigquerystorage-v1beta2;0.101.0 -com.google.api.grpc:proto-google-cloud-bigtable-admin-v2;1.13.1 -com.google.api.grpc:proto-google-cloud-bigtable-v2;1.13.1 -com.google.api.grpc:proto-google-cloud-billing-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-billingbudgets-v1beta1;0.3.0 -com.google.api.grpc:proto-google-cloud-build-v1;2.0.0 -com.google.api.grpc:proto-google-cloud-container-v1;1.0.4 -com.google.api.grpc:proto-google-cloud-containeranalysis-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-containeranalysis-v1beta1;0.87.0 -com.google.api.grpc:proto-google-cloud-datacatalog-v1;1.0.0 -com.google.api.grpc:proto-google-cloud-datacatalog-v1beta1;0.37.0 -com.google.api.grpc:proto-google-cloud-datalabeling-v1beta1;0.83.2 -com.google.api.grpc:proto-google-cloud-dataproc-v1;1.0.0 -com.google.api.grpc:proto-google-cloud-dataproc-v1beta2;0.88.0 -com.google.api.grpc:proto-google-cloud-datastore-v1;0.87.0 -com.google.api.grpc:proto-google-cloud-dialogflow-v2;2.1.0 -com.google.api.grpc:proto-google-cloud-dialogflow-v2beta1;0.88.0 -com.google.api.grpc:proto-google-cloud-dlp-v2;2.0.0 -com.google.api.grpc:proto-google-cloud-document-ai-v1beta1;0.2.0 -com.google.api.grpc:proto-google-cloud-document-ai-v1beta2;0.2.0 -com.google.api.grpc:proto-google-cloud-error-reporting-v1beta1;0.86.0 -com.google.api.grpc:proto-google-cloud-firestore-admin-v1;1.35.1 -com.google.api.grpc:proto-google-cloud-firestore-v1;1.35.1 -com.google.api.grpc:proto-google-cloud-firestore-v1beta1;0.88.1 -com.google.api.grpc:proto-google-cloud-gameservices-v1alpha;0.19.1 -com.google.api.grpc:proto-google-cloud-iamcredentials-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-iot-v1;1.0.2 -com.google.api.grpc:proto-google-cloud-irm-v1alpha2;0.2.1 -com.google.api.grpc:proto-google-cloud-kms-v1;0.86.0 -com.google.api.grpc:proto-google-cloud-language-v1;1.82.0 -com.google.api.grpc:proto-google-cloud-language-v1beta2;0.83.0 -com.google.api.grpc:proto-google-cloud-logging-v2;0.84.2 -com.google.api.grpc:proto-google-cloud-mediatranslation-v1beta1;0.2.0 -com.google.api.grpc:proto-google-cloud-memcache-v1beta2;0.2.0 -com.google.api.grpc:proto-google-cloud-monitoring-dashboard-v1;0.2.0 -com.google.api.grpc:proto-google-cloud-monitoring-v3;1.82.1 -com.google.api.grpc:proto-google-cloud-os-login-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-phishingprotection-v1beta1;0.29.0 -com.google.api.grpc:proto-google-cloud-pubsub-v1;1.90.0 -com.google.api.grpc:proto-google-cloud-recaptchaenterprise-v1;0.31.0 -com.google.api.grpc:proto-google-cloud-recaptchaenterprise-v1beta1;0.31.0 -com.google.api.grpc:proto-google-cloud-recommender-v1;1.2.0 -com.google.api.grpc:proto-google-cloud-recommender-v1beta1;0.7.0 -com.google.api.grpc:proto-google-cloud-redis-v1;1.0.0 -com.google.api.grpc:proto-google-cloud-redis-v1beta1;0.85.0 -com.google.api.grpc:proto-google-cloud-scheduler-v1;1.23.0 -com.google.api.grpc:proto-google-cloud-scheduler-v1beta1;0.83.0 -com.google.api.grpc:proto-google-cloud-secretmanager-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-secretmanager-v1beta1;1.1.0 -com.google.api.grpc:proto-google-cloud-securitycenter-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-securitycenter-v1beta1;0.89.0 -com.google.api.grpc:proto-google-cloud-securitycenter-v1p1beta1;0.89.0 -com.google.api.grpc:proto-google-cloud-servicedirectory-v1beta1;0.2.0 -com.google.api.grpc:proto-google-cloud-spanner-admin-database-v1;1.58.0 -com.google.api.grpc:proto-google-cloud-spanner-admin-instance-v1;1.58.0 -com.google.api.grpc:proto-google-cloud-spanner-v1;1.58.0 -com.google.api.grpc:proto-google-cloud-speech-v1;1.24.0 -com.google.api.grpc:proto-google-cloud-speech-v1beta1;0.77.0 -com.google.api.grpc:proto-google-cloud-speech-v1p1beta1;0.77.0 -com.google.api.grpc:proto-google-cloud-talent-v4beta1;0.36.1 -com.google.api.grpc:proto-google-cloud-tasks-v2;1.30.0 -com.google.api.grpc:proto-google-cloud-tasks-v2beta2;0.86.0 -com.google.api.grpc:proto-google-cloud-tasks-v2beta3;0.86.0 -com.google.api.grpc:proto-google-cloud-texttospeech-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-texttospeech-v1beta1;0.84.0 -com.google.api.grpc:proto-google-cloud-trace-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-trace-v2;1.1.0 -com.google.api.grpc:proto-google-cloud-translate-v3;1.1.0 -com.google.api.grpc:proto-google-cloud-translate-v3beta1;0.78.0 -com.google.api.grpc:proto-google-cloud-video-intelligence-v1;1.4.0 -com.google.api.grpc:proto-google-cloud-video-intelligence-v1beta2;0.86.0 -com.google.api.grpc:proto-google-cloud-video-intelligence-v1p1beta1;0.86.0 -com.google.api.grpc:proto-google-cloud-video-intelligence-v1p2beta1;0.86.0 -com.google.api.grpc:proto-google-cloud-video-intelligence-v1p3beta1;0.86.0 -com.google.api.grpc:proto-google-cloud-vision-v1;1.81.3 -com.google.api.grpc:proto-google-cloud-vision-v1p1beta1;0.82.3 -com.google.api.grpc:proto-google-cloud-vision-v1p2beta1;1.81.3 -com.google.api.grpc:proto-google-cloud-vision-v1p3beta1;0.82.3 -com.google.api.grpc:proto-google-cloud-vision-v1p4beta1;0.82.3 -com.google.api.grpc:proto-google-cloud-webrisk-v1;1.1.0 -com.google.api.grpc:proto-google-cloud-webrisk-v1beta1;0.35.0 -com.google.api.grpc:proto-google-cloud-websecurityscanner-v1;0.83.0 -com.google.api.grpc:proto-google-cloud-websecurityscanner-v1alpha;0.83.0 -com.google.api.grpc:proto-google-cloud-websecurityscanner-v1beta;0.83.0 -com.google.api.grpc:proto-google-common-protos;1.18.0 -com.google.api.grpc:proto-google-iam-v1;0.13.0 -com.google.api:api-common;1.9.3 -com.google.api:gax;1.57.1 -com.google.api:gax-bom;1.57.1 -com.google.api:gax-grpc;1.57.1 -com.google.api:gax-httpjson;0.74.1 -com.google.appengine:appengine-api-1.0-sdk;1.9.82 -com.google.auth:google-auth-library-appengine;0.21.1 -com.google.auth:google-auth-library-bom;0.21.1 -com.google.auth:google-auth-library-credentials;0.21.1 -com.google.auth:google-auth-library-oauth2-http;0.21.1 -com.google.cloud.sql:mysql-socket-factory;1.0.16 -com.google.cloud.sql:postgres-socket-factory;1.0.16 +com.github.tomakehurst:wiremock-jre8;2.26.3 +com.github.tomakehurst:wiremock-jre8-standalone;2.27.1 +com.google.appengine:appengine-api-1.0-sdk;1.9.83 com.google.cloud:cloud-spanner-r2dbc;0.2.0 -com.google.cloud:google-cloud-accessapproval;0.1.3 -com.google.cloud:google-cloud-accessapproval-bom;0.1.3 -com.google.cloud:google-cloud-asset;1.5.0 -com.google.cloud:google-cloud-asset-bom;1.5.0 -com.google.cloud:google-cloud-automl;1.2.0 -com.google.cloud:google-cloud-automl-bom;1.2.0 -com.google.cloud:google-cloud-bigquery;1.116.6 -com.google.cloud:google-cloud-bigquerydatatransfer;1.0.4 -com.google.cloud:google-cloud-bigquerydatatransfer-bom;1.0.4 -com.google.cloud:google-cloud-bigquerystorage;1.1.0 -com.google.cloud:google-cloud-bigquerystorage-bom;1.1.0 -com.google.cloud:google-cloud-bigtable;1.13.1 -com.google.cloud:google-cloud-bigtable-bom;1.13.1 -com.google.cloud:google-cloud-bigtable-emulator;0.122.1 -com.google.cloud:google-cloud-billing;1.1.0 -com.google.cloud:google-cloud-billing-bom;1.1.0 -com.google.cloud:google-cloud-billingbudgets;0.3.0 -com.google.cloud:google-cloud-billingbudgets-bom;0.3.0 -com.google.cloud:google-cloud-bom;0.131.0 -com.google.cloud:google-cloud-build;2.0.0 -com.google.cloud:google-cloud-build-bom;2.0.0 -com.google.cloud:google-cloud-compute;0.118.0-alpha -com.google.cloud:google-cloud-container;1.0.4 -com.google.cloud:google-cloud-container-bom;1.0.4 -com.google.cloud:google-cloud-containeranalysis;1.1.0 -com.google.cloud:google-cloud-containeranalysis-bom;1.1.0 -com.google.cloud:google-cloud-core;1.93.7 -com.google.cloud:google-cloud-core-bom;1.93.7 -com.google.cloud:google-cloud-core-grpc;1.93.7 -com.google.cloud:google-cloud-core-http;1.93.7 -com.google.cloud:google-cloud-datacatalog;1.0.0 -com.google.cloud:google-cloud-datacatalog-bom;1.0.0 -com.google.cloud:google-cloud-datalabeling;0.118.2 -com.google.cloud:google-cloud-datalabeling-bom;0.118.2 -com.google.cloud:google-cloud-dataproc;1.0.0 -com.google.cloud:google-cloud-dataproc-bom;1.0.0 -com.google.cloud:google-cloud-datastore;1.104.0 -com.google.cloud:google-cloud-datastore-bom;1.104.0 -com.google.cloud:google-cloud-dialogflow;2.1.0 -com.google.cloud:google-cloud-dialogflow-bom;2.1.0 -com.google.cloud:google-cloud-dlp;2.0.0 -com.google.cloud:google-cloud-dlp-bom;2.0.0 -com.google.cloud:google-cloud-dns;0.117.5-alpha -com.google.cloud:google-cloud-document-ai;0.2.0 -com.google.cloud:google-cloud-document-ai-bom;0.2.0 -com.google.cloud:google-cloud-errorreporting;0.120.0-beta -com.google.cloud:google-cloud-errorreporting-bom;0.120.0-beta -com.google.cloud:google-cloud-firestore;1.35.1 -com.google.cloud:google-cloud-firestore-bom;1.35.1 -com.google.cloud:google-cloud-gameservices;0.19.1 -com.google.cloud:google-cloud-gameservices-bom;0.19.1 -com.google.cloud:google-cloud-iamcredentials;1.1.0 -com.google.cloud:google-cloud-iamcredentials-bom;1.1.0 -com.google.cloud:google-cloud-iot;1.0.2 -com.google.cloud:google-cloud-iot-bom;1.0.2 -com.google.cloud:google-cloud-irm;0.2.1 -com.google.cloud:google-cloud-irm-bom;0.2.1 -com.google.cloud:google-cloud-kms;1.39.0 -com.google.cloud:google-cloud-kms-bom;1.39.0 -com.google.cloud:google-cloud-language;1.100.0 -com.google.cloud:google-cloud-language-bom;1.100.0 -com.google.cloud:google-cloud-logging;1.101.2 -com.google.cloud:google-cloud-logging-bom;1.101.2 -com.google.cloud:google-cloud-logging-logback;0.118.0-alpha -com.google.cloud:google-cloud-mediatranslation;0.2.0 -com.google.cloud:google-cloud-mediatranslation-bom;0.2.0 -com.google.cloud:google-cloud-memcache;0.2.0 -com.google.cloud:google-cloud-memcache-bom;0.2.0 -com.google.cloud:google-cloud-monitoring;1.100.1 -com.google.cloud:google-cloud-monitoring-bom;1.100.1 -com.google.cloud:google-cloud-monitoring-dashboard;0.2.0 -com.google.cloud:google-cloud-monitoring-dashboard-bom;0.2.0 -com.google.cloud:google-cloud-nio;0.121.2 -com.google.cloud:google-cloud-notification;0.120.2-beta -com.google.cloud:google-cloud-os-login;1.1.0 -com.google.cloud:google-cloud-os-login-bom;1.1.0 -com.google.cloud:google-cloud-phishingprotection;0.29.0 -com.google.cloud:google-cloud-phishingprotection-bom;0.29.0 -com.google.cloud:google-cloud-pubsub;1.108.0 -com.google.cloud:google-cloud-pubsub-bom;1.108.0 -com.google.cloud:google-cloud-recaptchaenterprise;0.31.0 -com.google.cloud:google-cloud-recaptchaenterprise-bom;0.31.0 -com.google.cloud:google-cloud-recommender;1.2.0 -com.google.cloud:google-cloud-recommender-bom;1.2.0 -com.google.cloud:google-cloud-redis;1.0.0 -com.google.cloud:google-cloud-redis-bom;1.0.0 -com.google.cloud:google-cloud-resourcemanager;0.117.2-alpha -com.google.cloud:google-cloud-scheduler;1.23.0 -com.google.cloud:google-cloud-scheduler-bom;1.23.0 -com.google.cloud:google-cloud-secretmanager;1.1.0 -com.google.cloud:google-cloud-secretmanager-bom;1.1.0 -com.google.cloud:google-cloud-securitycenter;1.1.0 -com.google.cloud:google-cloud-securitycenter-bom;1.1.0 -com.google.cloud:google-cloud-servicedirectory;0.2.0 -com.google.cloud:google-cloud-servicedirectory-bom;0.2.0 -com.google.cloud:google-cloud-spanner;1.58.0 -com.google.cloud:google-cloud-spanner-bom;1.58.0 -com.google.cloud:google-cloud-spanner-jdbc;1.16.0 -com.google.cloud:google-cloud-speech;1.24.0 -com.google.cloud:google-cloud-speech-bom;1.24.0 -com.google.cloud:google-cloud-storage;1.111.2 -com.google.cloud:google-cloud-talent;0.36.1 -com.google.cloud:google-cloud-talent-bom;0.36.1 -com.google.cloud:google-cloud-tasks;1.30.0 -com.google.cloud:google-cloud-tasks-bom;1.30.0 -com.google.cloud:google-cloud-texttospeech;1.1.0 -com.google.cloud:google-cloud-texttospeech-bom;1.1.0 -com.google.cloud:google-cloud-trace;1.1.0 -com.google.cloud:google-cloud-trace-bom;1.1.0 -com.google.cloud:google-cloud-translate;1.95.0 -com.google.cloud:google-cloud-translate-bom;1.95.0 -com.google.cloud:google-cloud-video-intelligence;1.4.0 -com.google.cloud:google-cloud-video-intelligence-bom;1.4.0 -com.google.cloud:google-cloud-vision;1.99.3 -com.google.cloud:google-cloud-vision-bom;1.99.3 -com.google.cloud:google-cloud-webrisk;1.1.0 -com.google.cloud:google-cloud-webrisk-bom;1.1.0 -com.google.cloud:google-cloud-websecurityscanner;0.118.0 -com.google.cloud:google-cloud-websecurityscanner-bom;0.118.0 -com.google.cloud:libraries-bom;8.1.0 com.google.code.gson:gson;2.8.6 -com.google.guava:guava;29.0-jre -com.google.guava:guava-bom;29.0-jre -com.google.guava:guava-gwt;29.0-jre -com.google.guava:guava-testlib;29.0-jre -com.google.http-client:google-http-client;1.36.0 -com.google.http-client:google-http-client-android;1.36.0 -com.google.http-client:google-http-client-apache-v2;1.36.0 -com.google.http-client:google-http-client-appengine;1.36.0 -com.google.http-client:google-http-client-gson;1.36.0 -com.google.http-client:google-http-client-jackson2;1.36.0 -com.google.http-client:google-http-client-protobuf;1.36.0 -com.google.http-client:google-http-client-test;1.36.0 -com.google.http-client:google-http-client-xml;1.36.0 -com.google.protobuf:protobuf-bom;3.12.2 -com.google.protobuf:protobuf-java;3.12.2 -com.google.protobuf:protobuf-java-util;3.12.2 com.h2database:h2;1.4.200 -com.hazelcast:hazelcast;3.12.10 -com.hazelcast:hazelcast-client;3.12.10 -com.hazelcast:hazelcast-hibernate52;1.3.2 -com.hazelcast:hazelcast-hibernate53;1.3.2 -com.hazelcast:hazelcast-spring;3.12.10 +com.hazelcast:hazelcast;4.0.3 +com.hazelcast:hazelcast-hibernate52;2.1.1 +com.hazelcast:hazelcast-hibernate53;2.1.1 +com.hazelcast:hazelcast-spring;4.0.3 com.ibm.db2:jcc;11.5.4.0 com.jayway.jsonpath:json-path;2.4.0 com.jayway.jsonpath:json-path-assert;2.4.0 com.jcraft:jsch;0.1.54 -com.microsoft.sqlserver:mssql-jdbc;7.4.1.jre8 -com.netflix.archaius:archaius-core;0.7.6 -com.netflix.concurrency-limits:concurrency-limits-core;0.1.12 -com.netflix.concurrency-limits:concurrency-limits-servlet;0.1.12 -com.netflix.eureka:eureka-client;1.9.25 -com.netflix.eureka:eureka-core;1.9.25 -com.netflix.hystrix:hystrix-core;1.5.18 -com.netflix.hystrix:hystrix-javanica;1.5.18 -com.netflix.hystrix:hystrix-metrics-event-stream;1.5.18 -com.netflix.hystrix:hystrix-serialization;1.5.18 -com.netflix.netflix-commons:netflix-commons-util;0.3.0 -com.netflix.netflix-commons:netflix-eventbus;0.3.0 -com.netflix.ribbon:ribbon;2.3.0 -com.netflix.ribbon:ribbon-core;2.3.0 -com.netflix.ribbon:ribbon-eureka;2.3.0 -com.netflix.ribbon:ribbon-httpclient;2.3.0 -com.netflix.ribbon:ribbon-loadbalancer;2.3.0 -com.netflix.servo:servo-core;0.12.21 -com.netflix.zuul:zuul-core;1.3.1 -com.nimbusds:nimbus-jose-jwt;8.19 -com.nimbusds:oauth2-oidc-sdk;7.1.1 -com.oracle.database.ha:ons;19.3.0.0 -com.oracle.database.ha:simplefan;19.3.0.0 -com.oracle.database.jdbc.debug:ojdbc10_g;19.3.0.0 -com.oracle.database.jdbc.debug:ojdbc10dms_g;19.3.0.0 -com.oracle.database.jdbc.debug:ojdbc8_g;19.3.0.0 -com.oracle.database.jdbc.debug:ojdbc8dms_g;19.3.0.0 -com.oracle.database.jdbc:ojdbc10;19.3.0.0 -com.oracle.database.jdbc:ojdbc10dms;19.3.0.0 -com.oracle.database.jdbc:ojdbc8;19.3.0.0 -com.oracle.database.jdbc:ojdbc8dms;19.3.0.0 -com.oracle.database.jdbc:ucp;19.3.0.0 -com.oracle.database.nls:orai18n;19.3.0.0 -com.oracle.database.observability:dms;19.3.0.0 -com.oracle.database.security:oraclepki;19.3.0.0 -com.oracle.database.security:osdt_cert;19.3.0.0 -com.oracle.database.security:osdt_core;19.3.0.0 -com.oracle.database.xml:xdb;19.3.0.0 -com.oracle.database.xml:xmlparserv2;19.3.0.0 +com.microsoft.sqlserver:mssql-jdbc;8.4.1.jre8 +com.netflix.eureka:eureka-client;1.10.10 +com.netflix.eureka:eureka-core;1.10.10 +com.nimbusds:nimbus-jose-jwt;9.1.2 +com.nimbusds:oauth2-oidc-sdk;8.23.1 +com.oracle.database.debug:ojdbc10_g;19.8.0.0 +com.oracle.database.debug:ojdbc10dms_g;19.8.0.0 +com.oracle.database.debug:ojdbc8_g;19.8.0.0 +com.oracle.database.debug:ojdbc8dms_g;19.8.0.0 +com.oracle.database.ha:ons;19.8.0.0 +com.oracle.database.ha:simplefan;19.8.0.0 +com.oracle.database.jdbc.debug:ojdbc10-debug;19.8.0.0 +com.oracle.database.jdbc.debug:ojdbc10-observability-debug;19.8.0.0 +com.oracle.database.jdbc.debug:ojdbc8-debug;19.8.0.0 +com.oracle.database.jdbc.debug:ojdbc8-observability-debug;19.8.0.0 +com.oracle.database.jdbc:ojdbc-bom;19.8.0.0 +com.oracle.database.jdbc:ojdbc10;19.8.0.0 +com.oracle.database.jdbc:ojdbc10-production;19.8.0.0 +com.oracle.database.jdbc:ojdbc8;19.8.0.0 +com.oracle.database.jdbc:ojdbc8-production;19.8.0.0 +com.oracle.database.jdbc:ucp;19.8.0.0 +com.oracle.database.nls:orai18n;19.8.0.0 +com.oracle.database.observability:dms;19.8.0.0 +com.oracle.database.observability:ojdbc10-observability;19.8.0.0 +com.oracle.database.observability:ojdbc10dms;19.8.0.0 +com.oracle.database.observability:ojdbc8-observability;19.8.0.0 +com.oracle.database.observability:ojdbc8dms;19.8.0.0 +com.oracle.database.security:oraclepki;19.8.0.0 +com.oracle.database.security:osdt_cert;19.8.0.0 +com.oracle.database.security:osdt_core;19.8.0.0 +com.oracle.database.xml:xdb;19.8.0.0 +com.oracle.database.xml:xmlparserv2;19.8.0.0 com.oracle.ojdbc:dms;19.3.0.0 com.oracle.ojdbc:ojdbc10;19.3.0.0 com.oracle.ojdbc:ojdbc10_g;19.3.0.0 @@ -707,14 +138,14 @@ com.oracle.ojdbc:simplefan;19.3.0.0 com.oracle.ojdbc:ucp;19.3.0.0 com.oracle.ojdbc:xdb;19.3.0.0 com.oracle.ojdbc:xmlparserv2;19.3.0.0 -com.querydsl:querydsl-apt;4.3.1 -com.querydsl:querydsl-collections;4.3.1 -com.querydsl:querydsl-core;4.3.1 -com.querydsl:querydsl-jpa;4.3.1 -com.querydsl:querydsl-mongodb;4.3.1 -com.rabbitmq:amqp-client;5.9.0 +com.querydsl:querydsl-apt;4.4.0 +com.querydsl:querydsl-collections;4.4.0 +com.querydsl:querydsl-core;4.4.0 +com.querydsl:querydsl-jpa;4.4.0 +com.querydsl:querydsl-mongodb;4.4.0 +com.rabbitmq:amqp-client;5.10.0 com.samskivert:jmustache;1.15 -com.sendgrid:sendgrid-java;4.4.8 +com.sendgrid:sendgrid-java;4.6.8 com.squareup.okhttp3:logging-interceptor;3.14.9 com.squareup.okhttp3:mockwebserver;3.14.9 com.squareup.okhttp3:okcurl;3.14.9 @@ -727,11 +158,11 @@ com.squareup.okhttp3:okhttp-urlconnection;3.14.9 com.sun.activation:jakarta.activation;1.2.2 com.sun.mail:jakarta.mail;1.6.5 com.sun.xml.messaging.saaj:saaj-impl;1.5.2 -com.thimbleware.jmemcached:jmemcached-core;1.0.0 -com.toomuchcoding.jsonassert:jsonassert;0.4.14 +com.toomuchcoding.jsonassert:jsonassert;0.5.0 +com.toomuchcoding.jsonassert:jsonassert-shade;0.5.0 com.unboundid:unboundid-ldapsdk;4.0.14 com.zaxxer:HikariCP;3.4.5 -commons-codec:commons-codec;1.14 +commons-codec:commons-codec;1.15 commons-pool:commons-pool;1.6 de.flapdoodle.embed:de.flapdoodle.embed.mongo;2.2.0 dev.miku:r2dbc-mysql;0.8.2.RELEASE @@ -807,12 +238,11 @@ io.fabric8:tekton-mock;4.10.3 io.fabric8:tekton-model-v1alpha1;4.10.3 io.fabric8:tekton-model-v1beta1;4.10.3 io.fabric8:tekton-tests;4.10.3 -io.github.lognet:grpc-spring-boot-starter;3.4.1 +io.github.lognet:grpc-spring-boot-starter;4.2.2 io.github.openfeign.form:feign-form-spring;3.8.0 io.github.openfeign:feign-core;10.10.1 io.github.openfeign:feign-gson;10.10.1 io.github.openfeign:feign-httpclient;10.10.1 -io.github.openfeign:feign-hystrix;10.10.1 io.github.openfeign:feign-jackson;10.10.1 io.github.openfeign:feign-jackson-jaxb;10.10.1 io.github.openfeign:feign-jaxb;10.10.1 @@ -822,95 +252,109 @@ io.github.openfeign:feign-okhttp;10.10.1 io.github.openfeign:feign-ribbon;10.10.1 io.github.openfeign:feign-sax;10.10.1 io.github.openfeign:feign-slf4j;10.10.1 -io.github.resilience4j:resilience4j-circuitbreaker;1.3.1 -io.github.resilience4j:resilience4j-micrometer;1.3.1 -io.github.resilience4j:resilience4j-reactor;1.3.1 -io.github.resilience4j:resilience4j-timelimiter;1.3.1 -io.grafeas:grafeas;0.24.1 -io.grpc:grpc-alts;1.30.2 -io.grpc:grpc-api;1.30.2 -io.grpc:grpc-auth;1.30.2 -io.grpc:grpc-context;1.30.2 -io.grpc:grpc-core;1.30.2 -io.grpc:grpc-grpclb;1.30.2 -io.grpc:grpc-netty;1.30.2 -io.grpc:grpc-netty-shaded;1.30.2 -io.grpc:grpc-okhttp;1.30.2 -io.grpc:grpc-protobuf;1.30.2 -io.grpc:grpc-services;1.30.2 -io.grpc:grpc-stub;1.30.2 -io.grpc:grpc-testing;1.30.2 -io.lettuce:lettuce-core;5.3.5.RELEASE -io.micrometer:micrometer-bom;1.5.6 -io.micrometer:micrometer-core;1.5.6 -io.micrometer:micrometer-jersey2;1.5.6 -io.micrometer:micrometer-registry-appoptics;1.5.6 -io.micrometer:micrometer-registry-atlas;1.5.6 -io.micrometer:micrometer-registry-azure-monitor;1.5.6 -io.micrometer:micrometer-registry-cloudwatch;1.5.6 -io.micrometer:micrometer-registry-cloudwatch2;1.5.6 -io.micrometer:micrometer-registry-datadog;1.5.6 -io.micrometer:micrometer-registry-dynatrace;1.5.6 -io.micrometer:micrometer-registry-elastic;1.5.6 -io.micrometer:micrometer-registry-ganglia;1.5.6 -io.micrometer:micrometer-registry-graphite;1.5.6 -io.micrometer:micrometer-registry-humio;1.5.6 -io.micrometer:micrometer-registry-influx;1.5.6 -io.micrometer:micrometer-registry-jmx;1.5.6 -io.micrometer:micrometer-registry-kairos;1.5.6 -io.micrometer:micrometer-registry-new-relic;1.5.6 -io.micrometer:micrometer-registry-opentsdb;1.5.6 -io.micrometer:micrometer-registry-prometheus;1.5.6 -io.micrometer:micrometer-registry-signalfx;1.5.6 -io.micrometer:micrometer-registry-stackdriver;1.5.6 -io.micrometer:micrometer-registry-statsd;1.5.6 -io.micrometer:micrometer-registry-wavefront;1.5.6 -io.micrometer:micrometer-test;1.5.6 -io.netty:netty-all;4.1.53.Final -io.netty:netty-bom;4.1.53.Final -io.netty:netty-buffer;4.1.53.Final -io.netty:netty-codec;4.1.53.Final -io.netty:netty-codec-dns;4.1.53.Final -io.netty:netty-codec-haproxy;4.1.53.Final -io.netty:netty-codec-http;4.1.53.Final -io.netty:netty-codec-http2;4.1.53.Final -io.netty:netty-codec-memcache;4.1.53.Final -io.netty:netty-codec-mqtt;4.1.53.Final -io.netty:netty-codec-redis;4.1.53.Final -io.netty:netty-codec-smtp;4.1.53.Final -io.netty:netty-codec-socks;4.1.53.Final -io.netty:netty-codec-stomp;4.1.53.Final -io.netty:netty-codec-xml;4.1.53.Final -io.netty:netty-common;4.1.53.Final -io.netty:netty-dev-tools;4.1.53.Final -io.netty:netty-example;4.1.53.Final -io.netty:netty-handler;4.1.53.Final -io.netty:netty-handler-proxy;4.1.53.Final -io.netty:netty-resolver;4.1.53.Final -io.netty:netty-resolver-dns;4.1.53.Final -io.netty:netty-resolver-dns-native-macos;4.1.53.Final +io.github.resilience4j:resilience4j-all;1.6.1 +io.github.resilience4j:resilience4j-annotations;1.6.1 +io.github.resilience4j:resilience4j-bom;1.6.1 +io.github.resilience4j:resilience4j-bulkhead;1.6.1 +io.github.resilience4j:resilience4j-cache;1.6.1 +io.github.resilience4j:resilience4j-circuitbreaker;1.6.1 +io.github.resilience4j:resilience4j-circularbuffer;1.6.1 +io.github.resilience4j:resilience4j-consumer;1.6.1 +io.github.resilience4j:resilience4j-core;1.6.1 +io.github.resilience4j:resilience4j-feign;1.6.1 +io.github.resilience4j:resilience4j-kotlin;1.6.1 +io.github.resilience4j:resilience4j-metrics;1.6.1 +io.github.resilience4j:resilience4j-micrometer;1.6.1 +io.github.resilience4j:resilience4j-prometheus;1.6.1 +io.github.resilience4j:resilience4j-ratelimiter;1.6.1 +io.github.resilience4j:resilience4j-ratpack;1.6.1 +io.github.resilience4j:resilience4j-reactor;1.6.1 +io.github.resilience4j:resilience4j-retrofit;1.6.1 +io.github.resilience4j:resilience4j-retry;1.6.1 +io.github.resilience4j:resilience4j-rxjava2;1.6.1 +io.github.resilience4j:resilience4j-rxjava3;1.6.1 +io.github.resilience4j:resilience4j-spring;1.6.1 +io.github.resilience4j:resilience4j-spring-boot2;1.6.1 +io.github.resilience4j:resilience4j-spring-cloud2;1.6.1 +io.github.resilience4j:resilience4j-timelimiter;1.6.1 +io.github.resilience4j:resilience4j-vertx;1.6.1 +io.kubernetes:client-java;10.0.0 +io.kubernetes:client-java-extended;10.0.0 +io.kubernetes:client-java-spring-integration;10.0.0 +io.lettuce:lettuce-core;6.0.1.RELEASE +io.micrometer:micrometer-bom;1.6.1 +io.micrometer:micrometer-core;1.6.1 +io.micrometer:micrometer-jersey2;1.6.1 +io.micrometer:micrometer-registry-appoptics;1.6.1 +io.micrometer:micrometer-registry-atlas;1.6.1 +io.micrometer:micrometer-registry-azure-monitor;1.6.1 +io.micrometer:micrometer-registry-cloudwatch;1.6.1 +io.micrometer:micrometer-registry-cloudwatch2;1.6.1 +io.micrometer:micrometer-registry-datadog;1.6.1 +io.micrometer:micrometer-registry-dynatrace;1.6.1 +io.micrometer:micrometer-registry-elastic;1.6.1 +io.micrometer:micrometer-registry-ganglia;1.6.1 +io.micrometer:micrometer-registry-graphite;1.6.1 +io.micrometer:micrometer-registry-health;1.6.1 +io.micrometer:micrometer-registry-humio;1.6.1 +io.micrometer:micrometer-registry-influx;1.6.1 +io.micrometer:micrometer-registry-jmx;1.6.1 +io.micrometer:micrometer-registry-kairos;1.6.1 +io.micrometer:micrometer-registry-new-relic;1.6.1 +io.micrometer:micrometer-registry-opentsdb;1.6.1 +io.micrometer:micrometer-registry-prometheus;1.6.1 +io.micrometer:micrometer-registry-signalfx;1.6.1 +io.micrometer:micrometer-registry-stackdriver;1.6.1 +io.micrometer:micrometer-registry-statsd;1.6.1 +io.micrometer:micrometer-registry-wavefront;1.6.1 +io.micrometer:micrometer-test;1.6.1 +io.netty:netty-all;4.1.54.Final +io.netty:netty-bom;4.1.54.Final +io.netty:netty-buffer;4.1.54.Final +io.netty:netty-codec;4.1.54.Final +io.netty:netty-codec-dns;4.1.54.Final +io.netty:netty-codec-haproxy;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-codec-memcache;4.1.54.Final +io.netty:netty-codec-mqtt;4.1.54.Final +io.netty:netty-codec-redis;4.1.54.Final +io.netty:netty-codec-smtp;4.1.54.Final +io.netty:netty-codec-socks;4.1.54.Final +io.netty:netty-codec-stomp;4.1.54.Final +io.netty:netty-codec-xml;4.1.54.Final +io.netty:netty-common;4.1.54.Final +io.netty:netty-dev-tools;4.1.54.Final +io.netty:netty-example;4.1.54.Final +io.netty:netty-handler;4.1.54.Final +io.netty:netty-handler-proxy;4.1.54.Final +io.netty:netty-resolver;4.1.54.Final +io.netty:netty-resolver-dns;4.1.54.Final +io.netty:netty-resolver-dns-native-macos;4.1.54.Final io.netty:netty-tcnative;2.0.34.Final io.netty:netty-tcnative-boringssl-static;2.0.34.Final -io.netty:netty-transport;4.1.53.Final -io.netty:netty-transport-native-epoll;4.1.53.Final -io.netty:netty-transport-native-kqueue;4.1.53.Final -io.netty:netty-transport-native-unix-common;4.1.53.Final -io.netty:netty-transport-rxtx;4.1.53.Final -io.netty:netty-transport-sctp;4.1.53.Final -io.netty:netty-transport-udt;4.1.53.Final -io.opentracing.brave:brave-opentracing;0.37.2 -io.pivotal.cfenv:java-cfenv-test-support;2.1.0.RELEASE -io.projectreactor.addons:reactor-adapter;3.3.4.RELEASE -io.projectreactor.addons:reactor-extra;3.3.4.RELEASE -io.projectreactor.addons:reactor-pool;0.1.7.RELEASE -io.projectreactor.kafka:reactor-kafka;1.2.4.RELEASE -io.projectreactor.kotlin:reactor-kotlin-extensions;1.0.2.RELEASE -io.projectreactor.netty:reactor-netty;0.9.13.RELEASE -io.projectreactor.rabbitmq:reactor-rabbitmq;1.4.4.RELEASE -io.projectreactor:reactor-bom;Dysprosium-SR13 -io.projectreactor:reactor-core;3.3.11.RELEASE -io.projectreactor:reactor-test;3.3.11.RELEASE -io.projectreactor:reactor-tools;3.3.11.RELEASE +io.netty:netty-transport;4.1.54.Final +io.netty:netty-transport-native-epoll;4.1.54.Final +io.netty:netty-transport-native-kqueue;4.1.54.Final +io.netty:netty-transport-native-unix-common;4.1.54.Final +io.netty:netty-transport-rxtx;4.1.54.Final +io.netty:netty-transport-sctp;4.1.54.Final +io.netty:netty-transport-udt;4.1.54.Final +io.opentracing.brave:brave-opentracing;0.37.4 +io.projectreactor.addons:reactor-adapter;3.4.0 +io.projectreactor.addons:reactor-extra;3.4.0 +io.projectreactor.addons:reactor-pool;0.2.0 +io.projectreactor.kafka:reactor-kafka;1.3.0 +io.projectreactor.kotlin:reactor-kotlin-extensions;1.1.0 +io.projectreactor.netty:reactor-netty;1.0.1 +io.projectreactor.netty:reactor-netty-core;1.0.1 +io.projectreactor.netty:reactor-netty-http;1.0.1 +io.projectreactor.netty:reactor-netty-http-brave;1.0.1 +io.projectreactor.rabbitmq:reactor-rabbitmq;1.5.0 +io.projectreactor:reactor-bom;2020.0.1 +io.projectreactor:reactor-core;3.4.0 +io.projectreactor:reactor-test;3.4.0 +io.projectreactor:reactor-tools;3.4.0 io.prometheus:simpleclient_pushgateway;0.9.0 io.r2dbc:r2dbc-bom;Arabba-SR8 io.r2dbc:r2dbc-h2;0.8.4.RELEASE @@ -929,70 +373,69 @@ io.rest-assured:scala-support;3.3.0 io.rest-assured:spring-mock-mvc;3.3.0 io.rest-assured:spring-web-test-client;3.3.0 io.rest-assured:xml-path;3.3.0 -io.rsocket:rsocket-bom;1.0.3 -io.rsocket:rsocket-core;1.0.3 -io.rsocket:rsocket-load-balancer;1.0.3 -io.rsocket:rsocket-micrometer;1.0.3 -io.rsocket:rsocket-test;1.0.3 -io.rsocket:rsocket-transport-local;1.0.3 -io.rsocket:rsocket-transport-netty;1.0.3 +io.rsocket:rsocket-bom;1.1.0 +io.rsocket:rsocket-core;1.1.0 +io.rsocket:rsocket-load-balancer;1.1.0 +io.rsocket:rsocket-micrometer;1.1.0 +io.rsocket:rsocket-test;1.1.0 +io.rsocket:rsocket-transport-local;1.1.0 +io.rsocket:rsocket-transport-netty;1.1.0 io.specto:hoverfly-java;0.13.0 io.specto:hoverfly-java-junit5;0.13.0 io.spring.gradle:dependency-management-plugin;1.0.10.RELEASE -io.undertow:undertow-core;2.1.4.Final -io.undertow:undertow-servlet;2.1.4.Final -io.undertow:undertow-websockets-jsr;2.1.4.Final -io.zipkin.brave:brave;5.12.3 -io.zipkin.brave:brave-bom;5.12.3 -io.zipkin.brave:brave-context-jfr;5.12.3 -io.zipkin.brave:brave-context-log4j12;5.12.3 -io.zipkin.brave:brave-context-log4j2;5.12.3 -io.zipkin.brave:brave-context-rxjava2;5.12.3 -io.zipkin.brave:brave-context-slf4j;5.12.3 -io.zipkin.brave:brave-instrumentation-dubbo;5.12.3 -io.zipkin.brave:brave-instrumentation-dubbo-rpc;5.12.3 -io.zipkin.brave:brave-instrumentation-grpc;5.12.3 -io.zipkin.brave:brave-instrumentation-http;5.12.3 -io.zipkin.brave:brave-instrumentation-http-tests;5.12.3 -io.zipkin.brave:brave-instrumentation-httpasyncclient;5.12.3 -io.zipkin.brave:brave-instrumentation-httpclient;5.12.3 -io.zipkin.brave:brave-instrumentation-jaxrs2;5.12.3 -io.zipkin.brave:brave-instrumentation-jersey-server;5.12.3 -io.zipkin.brave:brave-instrumentation-jms;5.12.3 -io.zipkin.brave:brave-instrumentation-kafka-clients;5.12.3 -io.zipkin.brave:brave-instrumentation-kafka-streams;5.12.3 -io.zipkin.brave:brave-instrumentation-messaging;5.12.3 -io.zipkin.brave:brave-instrumentation-mongodb;5.12.3 -io.zipkin.brave:brave-instrumentation-mysql;5.12.3 -io.zipkin.brave:brave-instrumentation-mysql6;5.12.3 -io.zipkin.brave:brave-instrumentation-mysql8;5.12.3 -io.zipkin.brave:brave-instrumentation-netty-codec-http;5.12.3 -io.zipkin.brave:brave-instrumentation-okhttp3;5.12.3 -io.zipkin.brave:brave-instrumentation-p6spy;5.12.3 -io.zipkin.brave:brave-instrumentation-rpc;5.12.3 -io.zipkin.brave:brave-instrumentation-servlet;5.12.3 -io.zipkin.brave:brave-instrumentation-sparkjava;5.12.3 -io.zipkin.brave:brave-instrumentation-spring-rabbit;5.12.3 -io.zipkin.brave:brave-instrumentation-spring-web;5.12.3 -io.zipkin.brave:brave-instrumentation-spring-webmvc;5.12.3 -io.zipkin.brave:brave-instrumentation-vertx-web;5.12.3 -io.zipkin.brave:brave-spring-beans;5.12.3 -io.zipkin.brave:brave-tests;5.12.3 -io.zipkin.reporter2:zipkin-reporter;2.15.0 -io.zipkin.reporter2:zipkin-reporter-bom;2.15.0 -io.zipkin.reporter2:zipkin-reporter-brave;2.15.0 -io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;2.15.0 -io.zipkin.reporter2:zipkin-reporter-spring-beans;2.15.0 -io.zipkin.reporter2:zipkin-sender-activemq-client;2.15.0 -io.zipkin.reporter2:zipkin-sender-amqp-client;2.15.0 -io.zipkin.reporter2:zipkin-sender-kafka;2.15.0 -io.zipkin.reporter2:zipkin-sender-kafka08;2.15.0 -io.zipkin.reporter2:zipkin-sender-libthrift;2.15.0 -io.zipkin.reporter2:zipkin-sender-okhttp3;2.15.0 -io.zipkin.reporter2:zipkin-sender-urlconnection;2.15.0 -io.zipkin.zipkin2:zipkin;2.21.1 -io.zipkin.zipkin2:zipkin-junit;2.21.1 -io.zipkin.zipkin2:zipkin-tests;2.21.1 +io.undertow:undertow-core;2.2.2.Final +io.undertow:undertow-servlet;2.2.2.Final +io.undertow:undertow-websockets-jsr;2.2.2.Final +io.zipkin.brave:brave;5.13.2 +io.zipkin.brave:brave-bom;5.13.2 +io.zipkin.brave:brave-context-jfr;5.13.2 +io.zipkin.brave:brave-context-log4j12;5.13.2 +io.zipkin.brave:brave-context-log4j2;5.13.2 +io.zipkin.brave:brave-context-rxjava2;5.13.2 +io.zipkin.brave:brave-context-slf4j;5.13.2 +io.zipkin.brave:brave-instrumentation-dubbo;5.13.2 +io.zipkin.brave:brave-instrumentation-dubbo-rpc;5.13.2 +io.zipkin.brave:brave-instrumentation-grpc;5.13.2 +io.zipkin.brave:brave-instrumentation-http;5.13.2 +io.zipkin.brave:brave-instrumentation-http-tests;5.13.2 +io.zipkin.brave:brave-instrumentation-httpasyncclient;5.13.2 +io.zipkin.brave:brave-instrumentation-httpclient;5.13.2 +io.zipkin.brave:brave-instrumentation-jaxrs2;5.13.2 +io.zipkin.brave:brave-instrumentation-jersey-server;5.13.2 +io.zipkin.brave:brave-instrumentation-jms;5.13.2 +io.zipkin.brave:brave-instrumentation-kafka-clients;5.13.2 +io.zipkin.brave:brave-instrumentation-kafka-streams;5.13.2 +io.zipkin.brave:brave-instrumentation-messaging;5.13.2 +io.zipkin.brave:brave-instrumentation-mongodb;5.13.2 +io.zipkin.brave:brave-instrumentation-mysql;5.13.2 +io.zipkin.brave:brave-instrumentation-mysql6;5.13.2 +io.zipkin.brave:brave-instrumentation-mysql8;5.13.2 +io.zipkin.brave:brave-instrumentation-netty-codec-http;5.13.2 +io.zipkin.brave:brave-instrumentation-okhttp3;5.13.2 +io.zipkin.brave:brave-instrumentation-p6spy;5.13.2 +io.zipkin.brave:brave-instrumentation-rpc;5.13.2 +io.zipkin.brave:brave-instrumentation-servlet;5.13.2 +io.zipkin.brave:brave-instrumentation-sparkjava;5.13.2 +io.zipkin.brave:brave-instrumentation-spring-rabbit;5.13.2 +io.zipkin.brave:brave-instrumentation-spring-web;5.13.2 +io.zipkin.brave:brave-instrumentation-spring-webmvc;5.13.2 +io.zipkin.brave:brave-instrumentation-vertx-web;5.13.2 +io.zipkin.brave:brave-spring-beans;5.13.2 +io.zipkin.brave:brave-tests;5.13.2 +io.zipkin.proto3:zipkin-proto3;1.0.0 +io.zipkin.reporter2:zipkin-reporter;2.16.1 +io.zipkin.reporter2:zipkin-reporter-bom;2.16.1 +io.zipkin.reporter2:zipkin-reporter-brave;2.16.1 +io.zipkin.reporter2:zipkin-reporter-metrics-micrometer;2.16.1 +io.zipkin.reporter2:zipkin-reporter-spring-beans;2.16.1 +io.zipkin.reporter2:zipkin-sender-activemq-client;2.16.1 +io.zipkin.reporter2:zipkin-sender-amqp-client;2.16.1 +io.zipkin.reporter2:zipkin-sender-kafka;2.16.1 +io.zipkin.reporter2:zipkin-sender-kafka08;2.16.1 +io.zipkin.reporter2:zipkin-sender-libthrift;2.16.1 +io.zipkin.reporter2:zipkin-sender-okhttp3;2.16.1 +io.zipkin.reporter2:zipkin-sender-urlconnection;2.16.1 +io.zipkin.zipkin2:zipkin;2.23.0 jakarta.activation:jakarta.activation-api;1.2.2 jakarta.annotation:jakarta.annotation-api;1.3.5 jakarta.jms:jakarta.jms-api;2.0.3 @@ -1016,7 +459,7 @@ javax.jms:javax.jms-api;2.0.1 javax.json.bind:javax.json.bind-api;1.0 javax.json:javax.json-api;1.1.4 javax.mail:javax.mail-api;1.6.2 -javax.money:money-api;1.0.3 +javax.money:money-api;1.1 javax.persistence:javax.persistence-api;2.2 javax.servlet:javax.servlet-api;4.0.1 javax.servlet:jstl;1.2 @@ -1027,59 +470,59 @@ javax.xml.bind:jaxb-api;2.3.1 javax.xml.ws:jaxws-api;2.3.1 jaxen:jaxen;1.2.0 junit:junit;4.13.1 -me.snowdrop:istio-client;1.0.0 +me.snowdrop:istio-client;1.5.5 mysql:mysql-connector-java;8.0.22 -net.bytebuddy:byte-buddy;1.10.17 -net.bytebuddy:byte-buddy-agent;1.10.17 +net.bytebuddy:byte-buddy;1.10.18 +net.bytebuddy:byte-buddy-agent;1.10.18 net.minidev:json-smart;2.3 net.sf.ehcache:ehcache;2.10.6 -net.sourceforge.htmlunit:htmlunit;2.40.0 +net.sourceforge.htmlunit:htmlunit;2.44.0 net.sourceforge.jtds:jtds;1.3.1 net.sourceforge.nekohtml:nekohtml;1.9.22 -nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;2.4.1 -org.apache.activemq:activemq-amqp;5.15.13 -org.apache.activemq:activemq-blueprint;5.15.13 -org.apache.activemq:activemq-broker;5.15.13 -org.apache.activemq:activemq-camel;5.15.13 -org.apache.activemq:activemq-client;5.15.13 -org.apache.activemq:activemq-console;5.15.13 -org.apache.activemq:activemq-http;5.15.13 -org.apache.activemq:activemq-jaas;5.15.13 -org.apache.activemq:activemq-jdbc-store;5.15.13 -org.apache.activemq:activemq-jms-pool;5.15.13 -org.apache.activemq:activemq-kahadb-store;5.15.13 -org.apache.activemq:activemq-karaf;5.15.13 -org.apache.activemq:activemq-leveldb-store;5.15.13 -org.apache.activemq:activemq-log4j-appender;5.15.13 -org.apache.activemq:activemq-mqtt;5.15.13 -org.apache.activemq:activemq-openwire-generator;5.15.13 -org.apache.activemq:activemq-openwire-legacy;5.15.13 -org.apache.activemq:activemq-osgi;5.15.13 -org.apache.activemq:activemq-partition;5.15.13 -org.apache.activemq:activemq-pool;5.15.13 -org.apache.activemq:activemq-ra;5.15.13 -org.apache.activemq:activemq-run;5.15.13 -org.apache.activemq:activemq-runtime-config;5.15.13 -org.apache.activemq:activemq-shiro;5.15.13 -org.apache.activemq:activemq-spring;5.15.13 -org.apache.activemq:activemq-stomp;5.15.13 -org.apache.activemq:activemq-web;5.15.13 -org.apache.activemq:artemis-amqp-protocol;2.12.0 -org.apache.activemq:artemis-commons;2.12.0 -org.apache.activemq:artemis-core-client;2.12.0 -org.apache.activemq:artemis-jms-client;2.12.0 -org.apache.activemq:artemis-jms-server;2.12.0 -org.apache.activemq:artemis-journal;2.12.0 -org.apache.activemq:artemis-selector;2.12.0 -org.apache.activemq:artemis-server;2.12.0 -org.apache.activemq:artemis-service-extensions;2.12.0 -org.apache.commons:commons-dbcp2;2.7.0 -org.apache.commons:commons-lang3;3.10 -org.apache.commons:commons-pool2;2.8.1 -org.apache.curator:curator-framework;4.0.1 -org.apache.curator:curator-recipes;4.0.1 -org.apache.curator:curator-test;4.0.1 -org.apache.curator:curator-x-discovery;4.0.1 +nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect;2.5.1 +org.apache.activemq:activemq-amqp;5.16.0 +org.apache.activemq:activemq-blueprint;5.16.0 +org.apache.activemq:activemq-broker;5.16.0 +org.apache.activemq:activemq-camel;5.16.0 +org.apache.activemq:activemq-client;5.16.0 +org.apache.activemq:activemq-console;5.16.0 +org.apache.activemq:activemq-http;5.16.0 +org.apache.activemq:activemq-jaas;5.16.0 +org.apache.activemq:activemq-jdbc-store;5.16.0 +org.apache.activemq:activemq-jms-pool;5.16.0 +org.apache.activemq:activemq-kahadb-store;5.16.0 +org.apache.activemq:activemq-karaf;5.16.0 +org.apache.activemq:activemq-leveldb-store;5.16.0 +org.apache.activemq:activemq-log4j-appender;5.16.0 +org.apache.activemq:activemq-mqtt;5.16.0 +org.apache.activemq:activemq-openwire-generator;5.16.0 +org.apache.activemq:activemq-openwire-legacy;5.16.0 +org.apache.activemq:activemq-osgi;5.16.0 +org.apache.activemq:activemq-partition;5.16.0 +org.apache.activemq:activemq-pool;5.16.0 +org.apache.activemq:activemq-ra;5.16.0 +org.apache.activemq:activemq-run;5.16.0 +org.apache.activemq:activemq-runtime-config;5.16.0 +org.apache.activemq:activemq-shiro;5.16.0 +org.apache.activemq:activemq-spring;5.16.0 +org.apache.activemq:activemq-stomp;5.16.0 +org.apache.activemq:activemq-web;5.16.0 +org.apache.activemq:artemis-amqp-protocol;2.15.0 +org.apache.activemq:artemis-commons;2.15.0 +org.apache.activemq:artemis-core-client;2.15.0 +org.apache.activemq:artemis-jms-client;2.15.0 +org.apache.activemq:artemis-jms-server;2.15.0 +org.apache.activemq:artemis-journal;2.15.0 +org.apache.activemq:artemis-selector;2.15.0 +org.apache.activemq:artemis-server;2.15.0 +org.apache.activemq:artemis-service-extensions;2.15.0 +org.apache.commons:commons-dbcp2;2.8.0 +org.apache.commons:commons-lang3;3.11 +org.apache.commons:commons-pool2;2.9.0 +org.apache.curator:curator-framework;5.1.0 +org.apache.curator:curator-recipes;5.1.0 +org.apache.curator:curator-test;5.1.0 +org.apache.curator:curator-x-discovery;5.1.0 org.apache.derby:derby;10.14.2.0 org.apache.derby:derbyclient;10.14.2.0 org.apache.httpcomponents:fluent-hc;4.5.13 @@ -1098,21 +541,21 @@ org.apache.johnzon:johnzon-jsonb-extras;1.2.8 org.apache.johnzon:johnzon-jsonschema;1.2.8 org.apache.johnzon:johnzon-mapper;1.2.8 org.apache.johnzon:johnzon-websocket;1.2.8 -org.apache.kafka:connect-api;2.5.1 -org.apache.kafka:connect-basic-auth-extension;2.5.1 -org.apache.kafka:connect-file;2.5.1 -org.apache.kafka:connect-json;2.5.1 -org.apache.kafka:connect-runtime;2.5.1 -org.apache.kafka:connect-transforms;2.5.1 -org.apache.kafka:kafka-clients;2.5.1 -org.apache.kafka:kafka-log4j-appender;2.5.1 -org.apache.kafka:kafka-streams;2.5.1 -org.apache.kafka:kafka-streams-scala_2.12;2.5.1 -org.apache.kafka:kafka-streams-scala_2.13;2.5.1 -org.apache.kafka:kafka-streams-test-utils;2.5.1 -org.apache.kafka:kafka-tools;2.5.1 -org.apache.kafka:kafka_2.12;2.5.1 -org.apache.kafka:kafka_2.13;2.5.1 +org.apache.kafka:connect-api;2.6.0 +org.apache.kafka:connect-basic-auth-extension;2.6.0 +org.apache.kafka:connect-file;2.6.0 +org.apache.kafka:connect-json;2.6.0 +org.apache.kafka:connect-runtime;2.6.0 +org.apache.kafka:connect-transforms;2.6.0 +org.apache.kafka:kafka-clients;2.6.0 +org.apache.kafka:kafka-log4j-appender;2.6.0 +org.apache.kafka:kafka-streams;2.6.0 +org.apache.kafka:kafka-streams-scala_2.12;2.6.0 +org.apache.kafka:kafka-streams-scala_2.13;2.6.0 +org.apache.kafka:kafka-streams-test-utils;2.6.0 +org.apache.kafka:kafka-tools;2.6.0 +org.apache.kafka:kafka_2.12;2.6.0 +org.apache.kafka:kafka_2.13;2.6.0 org.apache.logging.log4j:log4j-1.2-api;2.13.3 org.apache.logging.log4j:log4j-api;2.13.3 org.apache.logging.log4j:log4j-appserver;2.13.3 @@ -1163,7 +606,7 @@ org.arquillian.cube:arquillian-cube-requirement;1.15.2 org.aspectj:aspectjrt;1.9.6 org.aspectj:aspectjtools;1.9.6 org.aspectj:aspectjweaver;1.9.6 -org.assertj:assertj-core;3.16.1 +org.assertj:assertj-core;3.18.1 org.awaitility:awaitility;4.0.3 org.awaitility:awaitility-groovy;4.0.3 org.awaitility:awaitility-kotlin;4.0.3 @@ -1199,88 +642,88 @@ org.codehaus.groovy:groovy-xml;2.5.13 org.codehaus.janino:commons-compiler;3.1.2 org.codehaus.janino:commons-compiler-jdk;3.1.2 org.codehaus.janino:janino;3.1.2 -org.eclipse.jetty.fcgi:fcgi-client;9.4.33.v20201020 -org.eclipse.jetty.fcgi:fcgi-server;9.4.33.v20201020 -org.eclipse.jetty.gcloud:jetty-gcloud-session-manager;9.4.33.v20201020 -org.eclipse.jetty.http2:http2-client;9.4.33.v20201020 -org.eclipse.jetty.http2:http2-common;9.4.33.v20201020 -org.eclipse.jetty.http2:http2-hpack;9.4.33.v20201020 -org.eclipse.jetty.http2:http2-http-client-transport;9.4.33.v20201020 -org.eclipse.jetty.http2:http2-server;9.4.33.v20201020 -org.eclipse.jetty.memcached:jetty-memcached-sessions;9.4.33.v20201020 +org.eclipse.jetty.fcgi:fcgi-client;9.4.34.v20201102 +org.eclipse.jetty.fcgi:fcgi-server;9.4.34.v20201102 +org.eclipse.jetty.gcloud:jetty-gcloud-session-manager;9.4.34.v20201102 +org.eclipse.jetty.http2:http2-client;9.4.34.v20201102 +org.eclipse.jetty.http2:http2-common;9.4.34.v20201102 +org.eclipse.jetty.http2:http2-hpack;9.4.34.v20201102 +org.eclipse.jetty.http2:http2-http-client-transport;9.4.34.v20201102 +org.eclipse.jetty.http2:http2-server;9.4.34.v20201102 +org.eclipse.jetty.memcached:jetty-memcached-sessions;9.4.34.v20201102 org.eclipse.jetty.orbit:javax.servlet.jsp;2.2.0.v201112011158 -org.eclipse.jetty.osgi:jetty-httpservice;9.4.33.v20201020 -org.eclipse.jetty.osgi:jetty-osgi-boot;9.4.33.v20201020 -org.eclipse.jetty.osgi:jetty-osgi-boot-jsp;9.4.33.v20201020 -org.eclipse.jetty.osgi:jetty-osgi-boot-warurl;9.4.33.v20201020 -org.eclipse.jetty.websocket:javax-websocket-client-impl;9.4.33.v20201020 -org.eclipse.jetty.websocket:javax-websocket-server-impl;9.4.33.v20201020 -org.eclipse.jetty.websocket:websocket-api;9.4.33.v20201020 -org.eclipse.jetty.websocket:websocket-client;9.4.33.v20201020 -org.eclipse.jetty.websocket:websocket-common;9.4.33.v20201020 -org.eclipse.jetty.websocket:websocket-server;9.4.33.v20201020 -org.eclipse.jetty.websocket:websocket-servlet;9.4.33.v20201020 -org.eclipse.jetty:apache-jsp;9.4.33.v20201020 -org.eclipse.jetty:apache-jstl;9.4.33.v20201020 -org.eclipse.jetty:infinispan-common;9.4.33.v20201020 -org.eclipse.jetty:infinispan-embedded-query;9.4.33.v20201020 -org.eclipse.jetty:infinispan-remote-query;9.4.33.v20201020 -org.eclipse.jetty:jetty-alpn-client;9.4.33.v20201020 -org.eclipse.jetty:jetty-alpn-conscrypt-client;9.4.33.v20201020 -org.eclipse.jetty:jetty-alpn-conscrypt-server;9.4.33.v20201020 -org.eclipse.jetty:jetty-alpn-java-client;9.4.33.v20201020 -org.eclipse.jetty:jetty-alpn-java-server;9.4.33.v20201020 -org.eclipse.jetty:jetty-alpn-openjdk8-client;9.4.33.v20201020 -org.eclipse.jetty:jetty-alpn-openjdk8-server;9.4.33.v20201020 -org.eclipse.jetty:jetty-alpn-server;9.4.33.v20201020 -org.eclipse.jetty:jetty-annotations;9.4.33.v20201020 -org.eclipse.jetty:jetty-ant;9.4.33.v20201020 -org.eclipse.jetty:jetty-bom;9.4.33.v20201020 -org.eclipse.jetty:jetty-client;9.4.33.v20201020 -org.eclipse.jetty:jetty-continuation;9.4.33.v20201020 -org.eclipse.jetty:jetty-deploy;9.4.33.v20201020 -org.eclipse.jetty:jetty-distribution;9.4.33.v20201020 -org.eclipse.jetty:jetty-hazelcast;9.4.33.v20201020 -org.eclipse.jetty:jetty-home;9.4.33.v20201020 -org.eclipse.jetty:jetty-http;9.4.33.v20201020 -org.eclipse.jetty:jetty-http-spi;9.4.33.v20201020 -org.eclipse.jetty:jetty-io;9.4.33.v20201020 -org.eclipse.jetty:jetty-jaas;9.4.33.v20201020 -org.eclipse.jetty:jetty-jaspi;9.4.33.v20201020 -org.eclipse.jetty:jetty-jmx;9.4.33.v20201020 -org.eclipse.jetty:jetty-jndi;9.4.33.v20201020 -org.eclipse.jetty:jetty-nosql;9.4.33.v20201020 -org.eclipse.jetty:jetty-openid;9.4.33.v20201020 -org.eclipse.jetty:jetty-plus;9.4.33.v20201020 -org.eclipse.jetty:jetty-proxy;9.4.33.v20201020 -org.eclipse.jetty:jetty-quickstart;9.4.33.v20201020 +org.eclipse.jetty.osgi:jetty-httpservice;9.4.34.v20201102 +org.eclipse.jetty.osgi:jetty-osgi-boot;9.4.34.v20201102 +org.eclipse.jetty.osgi:jetty-osgi-boot-jsp;9.4.34.v20201102 +org.eclipse.jetty.osgi:jetty-osgi-boot-warurl;9.4.34.v20201102 +org.eclipse.jetty.websocket:javax-websocket-client-impl;9.4.34.v20201102 +org.eclipse.jetty.websocket:javax-websocket-server-impl;9.4.34.v20201102 +org.eclipse.jetty.websocket:websocket-api;9.4.34.v20201102 +org.eclipse.jetty.websocket:websocket-client;9.4.34.v20201102 +org.eclipse.jetty.websocket:websocket-common;9.4.34.v20201102 +org.eclipse.jetty.websocket:websocket-server;9.4.34.v20201102 +org.eclipse.jetty.websocket:websocket-servlet;9.4.34.v20201102 +org.eclipse.jetty:apache-jsp;9.4.34.v20201102 +org.eclipse.jetty:apache-jstl;9.4.34.v20201102 +org.eclipse.jetty:infinispan-common;9.4.34.v20201102 +org.eclipse.jetty:infinispan-embedded-query;9.4.34.v20201102 +org.eclipse.jetty:infinispan-remote-query;9.4.34.v20201102 +org.eclipse.jetty:jetty-alpn-client;9.4.34.v20201102 +org.eclipse.jetty:jetty-alpn-conscrypt-client;9.4.34.v20201102 +org.eclipse.jetty:jetty-alpn-conscrypt-server;9.4.34.v20201102 +org.eclipse.jetty:jetty-alpn-java-client;9.4.34.v20201102 +org.eclipse.jetty:jetty-alpn-java-server;9.4.34.v20201102 +org.eclipse.jetty:jetty-alpn-openjdk8-client;9.4.34.v20201102 +org.eclipse.jetty:jetty-alpn-openjdk8-server;9.4.34.v20201102 +org.eclipse.jetty:jetty-alpn-server;9.4.34.v20201102 +org.eclipse.jetty:jetty-annotations;9.4.34.v20201102 +org.eclipse.jetty:jetty-ant;9.4.34.v20201102 +org.eclipse.jetty:jetty-bom;9.4.34.v20201102 +org.eclipse.jetty:jetty-client;9.4.34.v20201102 +org.eclipse.jetty:jetty-continuation;9.4.34.v20201102 +org.eclipse.jetty:jetty-deploy;9.4.34.v20201102 +org.eclipse.jetty:jetty-distribution;9.4.34.v20201102 +org.eclipse.jetty:jetty-hazelcast;9.4.34.v20201102 +org.eclipse.jetty:jetty-home;9.4.34.v20201102 +org.eclipse.jetty:jetty-http;9.4.34.v20201102 +org.eclipse.jetty:jetty-http-spi;9.4.34.v20201102 +org.eclipse.jetty:jetty-io;9.4.34.v20201102 +org.eclipse.jetty:jetty-jaas;9.4.34.v20201102 +org.eclipse.jetty:jetty-jaspi;9.4.34.v20201102 +org.eclipse.jetty:jetty-jmx;9.4.34.v20201102 +org.eclipse.jetty:jetty-jndi;9.4.34.v20201102 +org.eclipse.jetty:jetty-nosql;9.4.34.v20201102 +org.eclipse.jetty:jetty-openid;9.4.34.v20201102 +org.eclipse.jetty:jetty-plus;9.4.34.v20201102 +org.eclipse.jetty:jetty-proxy;9.4.34.v20201102 +org.eclipse.jetty:jetty-quickstart;9.4.34.v20201102 org.eclipse.jetty:jetty-reactive-httpclient;1.1.4 -org.eclipse.jetty:jetty-rewrite;9.4.33.v20201020 -org.eclipse.jetty:jetty-security;9.4.33.v20201020 -org.eclipse.jetty:jetty-server;9.4.33.v20201020 -org.eclipse.jetty:jetty-servlet;9.4.33.v20201020 -org.eclipse.jetty:jetty-servlets;9.4.33.v20201020 -org.eclipse.jetty:jetty-spring;9.4.33.v20201020 -org.eclipse.jetty:jetty-unixsocket;9.4.33.v20201020 -org.eclipse.jetty:jetty-util;9.4.33.v20201020 -org.eclipse.jetty:jetty-util-ajax;9.4.33.v20201020 -org.eclipse.jetty:jetty-webapp;9.4.33.v20201020 -org.eclipse.jetty:jetty-xml;9.4.33.v20201020 +org.eclipse.jetty:jetty-rewrite;9.4.34.v20201102 +org.eclipse.jetty:jetty-security;9.4.34.v20201102 +org.eclipse.jetty:jetty-server;9.4.34.v20201102 +org.eclipse.jetty:jetty-servlet;9.4.34.v20201102 +org.eclipse.jetty:jetty-servlets;9.4.34.v20201102 +org.eclipse.jetty:jetty-spring;9.4.34.v20201102 +org.eclipse.jetty:jetty-unixsocket;9.4.34.v20201102 +org.eclipse.jetty:jetty-util;9.4.34.v20201102 +org.eclipse.jetty:jetty-util-ajax;9.4.34.v20201102 +org.eclipse.jetty:jetty-webapp;9.4.34.v20201102 +org.eclipse.jetty:jetty-xml;9.4.34.v20201102 org.eclipse.jgit:org.eclipse.jgit;5.1.3.201810200350-r org.eclipse.jgit:org.eclipse.jgit.http.apache;5.1.3.201810200350-r org.eclipse.jgit:org.eclipse.jgit.junit.http;5.1.3.201810200350-r -org.ehcache:ehcache;3.8.1 -org.ehcache:ehcache-clustered;3.8.1 -org.ehcache:ehcache-transactions;3.8.1 -org.elasticsearch.client:elasticsearch-rest-client;7.6.2 -org.elasticsearch.client:elasticsearch-rest-high-level-client;7.6.2 -org.elasticsearch.client:transport;7.6.2 -org.elasticsearch.distribution.integ-test-zip:elasticsearch;7.6.2 -org.elasticsearch.plugin:transport-netty4-client;7.6.2 -org.elasticsearch:elasticsearch;7.6.2 +org.ehcache:ehcache;3.9.0 +org.ehcache:ehcache-clustered;3.9.0 +org.ehcache:ehcache-transactions;3.9.0 +org.elasticsearch.client:elasticsearch-rest-client;7.9.3 +org.elasticsearch.client:elasticsearch-rest-high-level-client;7.9.3 +org.elasticsearch.client:transport;7.9.3 +org.elasticsearch.distribution.integ-test-zip:elasticsearch;7.9.3 +org.elasticsearch.plugin:transport-netty4-client;7.9.3 +org.elasticsearch:elasticsearch;7.9.3 org.firebirdsql.jdbc:jaybird-jdk17;3.0.9 org.firebirdsql.jdbc:jaybird-jdk18;3.0.9 -org.flywaydb:flyway-core;6.4.4 +org.flywaydb:flyway-core;7.1.1 org.freemarker:freemarker;2.3.30 org.glassfish.jaxb:codemodel;2.3.3 org.glassfish.jaxb:codemodel-annotation-compiler;2.3.3 @@ -1290,234 +733,246 @@ org.glassfish.jaxb:jaxb-xjc;2.3.3 org.glassfish.jaxb:txw2;2.3.3 org.glassfish.jaxb:txwc2;2.3.3 org.glassfish.jaxb:xsom;2.3.3 -org.glassfish.jersey.bundles:jaxrs-ri;2.30.1 -org.glassfish.jersey.connectors:jersey-apache-connector;2.30.1 -org.glassfish.jersey.connectors:jersey-grizzly-connector;2.30.1 -org.glassfish.jersey.connectors:jersey-jdk-connector;2.30.1 -org.glassfish.jersey.connectors:jersey-jetty-connector;2.30.1 -org.glassfish.jersey.connectors:jersey-netty-connector;2.30.1 -org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;2.30.1 -org.glassfish.jersey.containers:jersey-container-grizzly2-http;2.30.1 -org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;2.30.1 -org.glassfish.jersey.containers:jersey-container-jdk-http;2.30.1 -org.glassfish.jersey.containers:jersey-container-jetty-http;2.30.1 -org.glassfish.jersey.containers:jersey-container-jetty-servlet;2.30.1 -org.glassfish.jersey.containers:jersey-container-netty-http;2.30.1 -org.glassfish.jersey.containers:jersey-container-servlet;2.30.1 -org.glassfish.jersey.containers:jersey-container-servlet-core;2.30.1 -org.glassfish.jersey.containers:jersey-container-simple-http;2.30.1 -org.glassfish.jersey.core:jersey-client;2.30.1 -org.glassfish.jersey.core:jersey-common;2.30.1 -org.glassfish.jersey.core:jersey-server;2.30.1 -org.glassfish.jersey.ext.cdi:jersey-cdi1x;2.30.1 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;2.30.1 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;2.30.1 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;2.30.1 -org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;2.30.1 -org.glassfish.jersey.ext.cdi:jersey-weld2-se;2.30.1 -org.glassfish.jersey.ext.microprofile:jersey-mp-config;2.30.1 -org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;2.30.1 -org.glassfish.jersey.ext.rx:jersey-rx-client-guava;2.30.1 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;2.30.1 -org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;2.30.1 -org.glassfish.jersey.ext:jersey-bean-validation;2.30.1 -org.glassfish.jersey.ext:jersey-declarative-linking;2.30.1 -org.glassfish.jersey.ext:jersey-entity-filtering;2.30.1 -org.glassfish.jersey.ext:jersey-metainf-services;2.30.1 -org.glassfish.jersey.ext:jersey-mvc;2.30.1 -org.glassfish.jersey.ext:jersey-mvc-bean-validation;2.30.1 -org.glassfish.jersey.ext:jersey-mvc-freemarker;2.30.1 -org.glassfish.jersey.ext:jersey-mvc-jsp;2.30.1 -org.glassfish.jersey.ext:jersey-mvc-mustache;2.30.1 -org.glassfish.jersey.ext:jersey-proxy-client;2.30.1 -org.glassfish.jersey.ext:jersey-servlet-portability;2.30.1 -org.glassfish.jersey.ext:jersey-spring4;2.30.1 -org.glassfish.jersey.ext:jersey-spring5;2.30.1 -org.glassfish.jersey.ext:jersey-wadl-doclet;2.30.1 -org.glassfish.jersey.inject:jersey-cdi2-se;2.30.1 -org.glassfish.jersey.inject:jersey-hk2;2.30.1 -org.glassfish.jersey.media:jersey-media-jaxb;2.30.1 -org.glassfish.jersey.media:jersey-media-json-binding;2.30.1 -org.glassfish.jersey.media:jersey-media-json-jackson;2.30.1 -org.glassfish.jersey.media:jersey-media-json-jackson1;2.30.1 -org.glassfish.jersey.media:jersey-media-json-jettison;2.30.1 -org.glassfish.jersey.media:jersey-media-json-processing;2.30.1 -org.glassfish.jersey.media:jersey-media-kryo;2.30.1 -org.glassfish.jersey.media:jersey-media-moxy;2.30.1 -org.glassfish.jersey.media:jersey-media-multipart;2.30.1 -org.glassfish.jersey.media:jersey-media-sse;2.30.1 -org.glassfish.jersey.security:oauth1-client;2.30.1 -org.glassfish.jersey.security:oauth1-server;2.30.1 -org.glassfish.jersey.security:oauth1-signature;2.30.1 -org.glassfish.jersey.security:oauth2-client;2.30.1 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;2.30.1 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;2.30.1 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;2.30.1 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;2.30.1 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;2.30.1 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;2.30.1 -org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-simple;2.30.1 -org.glassfish.jersey.test-framework:jersey-test-framework-core;2.30.1 -org.glassfish.jersey.test-framework:jersey-test-framework-util;2.30.1 -org.glassfish.jersey:jersey-bom;2.30.1 +org.glassfish.jersey.bundles:jaxrs-ri;2.32 +org.glassfish.jersey.connectors:jersey-apache-connector;2.32 +org.glassfish.jersey.connectors:jersey-grizzly-connector;2.32 +org.glassfish.jersey.connectors:jersey-helidon-connector;2.32 +org.glassfish.jersey.connectors:jersey-jdk-connector;2.32 +org.glassfish.jersey.connectors:jersey-jetty-connector;2.32 +org.glassfish.jersey.connectors:jersey-netty-connector;2.32 +org.glassfish.jersey.containers.glassfish:jersey-gf-ejb;2.32 +org.glassfish.jersey.containers:jersey-container-grizzly2-http;2.32 +org.glassfish.jersey.containers:jersey-container-grizzly2-servlet;2.32 +org.glassfish.jersey.containers:jersey-container-jdk-http;2.32 +org.glassfish.jersey.containers:jersey-container-jetty-http;2.32 +org.glassfish.jersey.containers:jersey-container-jetty-servlet;2.32 +org.glassfish.jersey.containers:jersey-container-netty-http;2.32 +org.glassfish.jersey.containers:jersey-container-servlet;2.32 +org.glassfish.jersey.containers:jersey-container-servlet-core;2.32 +org.glassfish.jersey.containers:jersey-container-simple-http;2.32 +org.glassfish.jersey.core:jersey-client;2.32 +org.glassfish.jersey.core:jersey-common;2.32 +org.glassfish.jersey.core:jersey-server;2.32 +org.glassfish.jersey.ext.cdi:jersey-cdi1x;2.32 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-ban-custom-hk2-binding;2.32 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-servlet;2.32 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-transaction;2.32 +org.glassfish.jersey.ext.cdi:jersey-cdi1x-validation;2.32 +org.glassfish.jersey.ext.cdi:jersey-weld2-se;2.32 +org.glassfish.jersey.ext.microprofile:jersey-mp-config;2.32 +org.glassfish.jersey.ext.microprofile:jersey-mp-rest-client;2.32 +org.glassfish.jersey.ext.rx:jersey-rx-client-guava;2.32 +org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava;2.32 +org.glassfish.jersey.ext.rx:jersey-rx-client-rxjava2;2.32 +org.glassfish.jersey.ext:jersey-bean-validation;2.32 +org.glassfish.jersey.ext:jersey-declarative-linking;2.32 +org.glassfish.jersey.ext:jersey-entity-filtering;2.32 +org.glassfish.jersey.ext:jersey-metainf-services;2.32 +org.glassfish.jersey.ext:jersey-mvc;2.32 +org.glassfish.jersey.ext:jersey-mvc-bean-validation;2.32 +org.glassfish.jersey.ext:jersey-mvc-freemarker;2.32 +org.glassfish.jersey.ext:jersey-mvc-jsp;2.32 +org.glassfish.jersey.ext:jersey-mvc-mustache;2.32 +org.glassfish.jersey.ext:jersey-proxy-client;2.32 +org.glassfish.jersey.ext:jersey-servlet-portability;2.32 +org.glassfish.jersey.ext:jersey-spring4;2.32 +org.glassfish.jersey.ext:jersey-spring5;2.32 +org.glassfish.jersey.ext:jersey-wadl-doclet;2.32 +org.glassfish.jersey.inject:jersey-cdi2-se;2.32 +org.glassfish.jersey.inject:jersey-hk2;2.32 +org.glassfish.jersey.media:jersey-media-jaxb;2.32 +org.glassfish.jersey.media:jersey-media-json-binding;2.32 +org.glassfish.jersey.media:jersey-media-json-jackson;2.32 +org.glassfish.jersey.media:jersey-media-json-jettison;2.32 +org.glassfish.jersey.media:jersey-media-json-processing;2.32 +org.glassfish.jersey.media:jersey-media-kryo;2.32 +org.glassfish.jersey.media:jersey-media-moxy;2.32 +org.glassfish.jersey.media:jersey-media-multipart;2.32 +org.glassfish.jersey.media:jersey-media-sse;2.32 +org.glassfish.jersey.security:oauth1-client;2.32 +org.glassfish.jersey.security:oauth1-server;2.32 +org.glassfish.jersey.security:oauth1-signature;2.32 +org.glassfish.jersey.security:oauth2-client;2.32 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-bundle;2.32 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-external;2.32 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2;2.32 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory;2.32 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http;2.32 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jetty;2.32 +org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-simple;2.32 +org.glassfish.jersey.test-framework:jersey-test-framework-core;2.32 +org.glassfish.jersey.test-framework:jersey-test-framework-util;2.32 +org.glassfish.jersey:jersey-bom;2.32 org.glassfish:jakarta.el;3.0.3 org.hamcrest:hamcrest;2.2 org.hamcrest:hamcrest-core;2.2 org.hamcrest:hamcrest-library;2.2 org.hibernate.validator:hibernate-validator;6.1.6.Final org.hibernate.validator:hibernate-validator-annotation-processor;6.1.6.Final -org.hibernate:hibernate-c3p0;5.4.22.Final -org.hibernate:hibernate-core;5.4.22.Final -org.hibernate:hibernate-ehcache;5.4.22.Final -org.hibernate:hibernate-entitymanager;5.4.22.Final -org.hibernate:hibernate-envers;5.4.22.Final -org.hibernate:hibernate-hikaricp;5.4.22.Final -org.hibernate:hibernate-java8;5.4.22.Final -org.hibernate:hibernate-jcache;5.4.22.Final -org.hibernate:hibernate-jpamodelgen;5.4.22.Final -org.hibernate:hibernate-proxool;5.4.22.Final -org.hibernate:hibernate-spatial;5.4.22.Final -org.hibernate:hibernate-testing;5.4.22.Final -org.hibernate:hibernate-vibur;5.4.22.Final +org.hibernate:hibernate-c3p0;5.4.23.Final +org.hibernate:hibernate-core;5.4.23.Final +org.hibernate:hibernate-ehcache;5.4.23.Final +org.hibernate:hibernate-entitymanager;5.4.23.Final +org.hibernate:hibernate-envers;5.4.23.Final +org.hibernate:hibernate-hikaricp;5.4.23.Final +org.hibernate:hibernate-java8;5.4.23.Final +org.hibernate:hibernate-jcache;5.4.23.Final +org.hibernate:hibernate-jpamodelgen;5.4.23.Final +org.hibernate:hibernate-proxool;5.4.23.Final +org.hibernate:hibernate-spatial;5.4.23.Final +org.hibernate:hibernate-testing;5.4.23.Final +org.hibernate:hibernate-vibur;5.4.23.Final org.hsqldb:hsqldb;2.5.1 -org.infinispan:infinispan-api;10.1.8.Final -org.infinispan:infinispan-cachestore-jdbc;10.1.8.Final -org.infinispan:infinispan-cachestore-jpa;10.1.8.Final -org.infinispan:infinispan-cachestore-remote;10.1.8.Final -org.infinispan:infinispan-cachestore-rest;10.1.8.Final -org.infinispan:infinispan-cachestore-rocksdb;10.1.8.Final -org.infinispan:infinispan-cdi-common;10.1.8.Final -org.infinispan:infinispan-cdi-embedded;10.1.8.Final -org.infinispan:infinispan-cdi-remote;10.1.8.Final -org.infinispan:infinispan-client-hotrod;10.1.8.Final -org.infinispan:infinispan-client-rest;10.1.8.Final -org.infinispan:infinispan-clustered-counter;10.1.8.Final -org.infinispan:infinispan-clustered-lock;10.1.8.Final -org.infinispan:infinispan-commons;10.1.8.Final -org.infinispan:infinispan-component-annotations;10.1.8.Final -org.infinispan:infinispan-core;10.1.8.Final -org.infinispan:infinispan-directory-provider;10.1.8.Final -org.infinispan:infinispan-hibernate-cache-v53;10.1.8.Final -org.infinispan:infinispan-jboss-marshalling;10.1.8.Final -org.infinispan:infinispan-jcache;10.1.8.Final -org.infinispan:infinispan-jcache-commons;10.1.8.Final -org.infinispan:infinispan-jcache-remote;10.1.8.Final -org.infinispan:infinispan-key-value-store-client;10.1.8.Final -org.infinispan:infinispan-lucene-directory;10.1.8.Final -org.infinispan:infinispan-objectfilter;10.1.8.Final -org.infinispan:infinispan-osgi;10.1.8.Final -org.infinispan:infinispan-persistence-soft-index;10.1.8.Final -org.infinispan:infinispan-query;10.1.8.Final -org.infinispan:infinispan-query-core;10.1.8.Final -org.infinispan:infinispan-query-dsl;10.1.8.Final -org.infinispan:infinispan-remote-query-client;10.1.8.Final -org.infinispan:infinispan-remote-query-server;10.1.8.Final -org.infinispan:infinispan-scripting;10.1.8.Final -org.infinispan:infinispan-server-core;10.1.8.Final -org.infinispan:infinispan-server-hotrod;10.1.8.Final -org.infinispan:infinispan-server-memcached;10.1.8.Final -org.infinispan:infinispan-server-rest;10.1.8.Final -org.infinispan:infinispan-server-router;10.1.8.Final -org.infinispan:infinispan-spring5-common;10.1.8.Final -org.infinispan:infinispan-spring5-embedded;10.1.8.Final -org.infinispan:infinispan-spring5-remote;10.1.8.Final -org.infinispan:infinispan-tasks;10.1.8.Final -org.infinispan:infinispan-tasks-api;10.1.8.Final -org.infinispan:infinispan-tools;10.1.8.Final -org.influxdb:influxdb-java;2.18 -org.jboss.arquillian.junit:arquillian-junit-standalone;1.4.0.Final +org.infinispan.protostream:protostream;4.3.4.Final +org.infinispan.protostream:protostream-processor;4.3.4.Final +org.infinispan:infinispan-anchored-keys;11.0.5.Final +org.infinispan:infinispan-api;11.0.5.Final +org.infinispan:infinispan-bom;11.0.5.Final +org.infinispan:infinispan-cachestore-jdbc;11.0.5.Final +org.infinispan:infinispan-cachestore-jpa;11.0.5.Final +org.infinispan:infinispan-cachestore-remote;11.0.5.Final +org.infinispan:infinispan-cachestore-rest;11.0.5.Final +org.infinispan:infinispan-cachestore-rocksdb;11.0.5.Final +org.infinispan:infinispan-cdi-common;11.0.5.Final +org.infinispan:infinispan-cdi-embedded;11.0.5.Final +org.infinispan:infinispan-cdi-remote;11.0.5.Final +org.infinispan:infinispan-checkstyle;11.0.5.Final +org.infinispan:infinispan-cli-client;11.0.5.Final +org.infinispan:infinispan-client-hotrod;11.0.5.Final +org.infinispan:infinispan-client-rest;11.0.5.Final +org.infinispan:infinispan-clustered-counter;11.0.5.Final +org.infinispan:infinispan-clustered-lock;11.0.5.Final +org.infinispan:infinispan-commons;11.0.5.Final +org.infinispan:infinispan-commons-test;11.0.5.Final +org.infinispan:infinispan-component-annotations;11.0.5.Final +org.infinispan:infinispan-component-processor;11.0.5.Final +org.infinispan:infinispan-console;0.7.1.Final +org.infinispan:infinispan-core;11.0.5.Final +org.infinispan:infinispan-extended-statistics;11.0.5.Final +org.infinispan:infinispan-hibernate-cache-commons;11.0.5.Final +org.infinispan:infinispan-hibernate-cache-spi;11.0.5.Final +org.infinispan:infinispan-hibernate-cache-v51;11.0.5.Final +org.infinispan:infinispan-hibernate-cache-v53;11.0.5.Final +org.infinispan:infinispan-jboss-marshalling;11.0.5.Final +org.infinispan:infinispan-jcache;11.0.5.Final +org.infinispan:infinispan-jcache-commons;11.0.5.Final +org.infinispan:infinispan-jcache-remote;11.0.5.Final +org.infinispan:infinispan-key-value-store-client;11.0.5.Final +org.infinispan:infinispan-marshaller-kryo;11.0.5.Final +org.infinispan:infinispan-marshaller-kryo-bundle;11.0.5.Final +org.infinispan:infinispan-marshaller-protostuff;11.0.5.Final +org.infinispan:infinispan-marshaller-protostuff-bundle;11.0.5.Final +org.infinispan:infinispan-multimap;11.0.5.Final +org.infinispan:infinispan-objectfilter;11.0.5.Final +org.infinispan:infinispan-osgi;11.0.5.Final +org.infinispan:infinispan-persistence-soft-index;11.0.5.Final +org.infinispan:infinispan-query;11.0.5.Final +org.infinispan:infinispan-query-core;11.0.5.Final +org.infinispan:infinispan-query-dsl;11.0.5.Final +org.infinispan:infinispan-remote-query-client;11.0.5.Final +org.infinispan:infinispan-remote-query-server;11.0.5.Final +org.infinispan:infinispan-scripting;11.0.5.Final +org.infinispan:infinispan-server-core;11.0.5.Final +org.infinispan:infinispan-server-hotrod;11.0.5.Final +org.infinispan:infinispan-server-memcached;11.0.5.Final +org.infinispan:infinispan-server-rest;11.0.5.Final +org.infinispan:infinispan-server-router;11.0.5.Final +org.infinispan:infinispan-server-runtime;11.0.5.Final +org.infinispan:infinispan-spring5-common;11.0.5.Final +org.infinispan:infinispan-spring5-embedded;11.0.5.Final +org.infinispan:infinispan-spring5-remote;11.0.5.Final +org.infinispan:infinispan-tasks;11.0.5.Final +org.infinispan:infinispan-tasks-api;11.0.5.Final +org.infinispan:infinispan-tools;11.0.5.Final +org.influxdb:influxdb-java;2.20 +org.jboss.arquillian.junit:arquillian-junit-standalone;1.6.0.Final org.jboss.logging:jboss-logging;3.4.1.Final org.jboss:jboss-transaction-spi;7.6.0.Final org.jdom:jdom2;2.0.6 -org.jetbrains.kotlin:kotlin-bom;1.3.72 -org.jetbrains.kotlin:kotlin-compiler;1.3.72 -org.jetbrains.kotlin:kotlin-compiler-embeddable;1.3.72 -org.jetbrains.kotlin:kotlin-daemon-client;1.3.72 -org.jetbrains.kotlin:kotlin-main-kts;1.3.72 -org.jetbrains.kotlin:kotlin-osgi-bundle;1.3.72 -org.jetbrains.kotlin:kotlin-reflect;1.3.72 -org.jetbrains.kotlin:kotlin-script-runtime;1.3.72 -org.jetbrains.kotlin:kotlin-script-util;1.3.72 -org.jetbrains.kotlin:kotlin-scripting-common;1.3.72 -org.jetbrains.kotlin:kotlin-scripting-jvm;1.3.72 -org.jetbrains.kotlin:kotlin-scripting-jvm-host;1.3.72 -org.jetbrains.kotlin:kotlin-stdlib;1.3.72 -org.jetbrains.kotlin:kotlin-stdlib-common;1.3.72 -org.jetbrains.kotlin:kotlin-stdlib-jdk7;1.3.72 -org.jetbrains.kotlin:kotlin-stdlib-jdk8;1.3.72 -org.jetbrains.kotlin:kotlin-stdlib-js;1.3.72 -org.jetbrains.kotlin:kotlin-test;1.3.72 -org.jetbrains.kotlin:kotlin-test-annotations-common;1.3.72 -org.jetbrains.kotlin:kotlin-test-common;1.3.72 -org.jetbrains.kotlin:kotlin-test-js;1.3.72 -org.jetbrains.kotlin:kotlin-test-junit;1.3.72 -org.jetbrains.kotlin:kotlin-test-junit5;1.3.72 -org.jetbrains.kotlin:kotlin-test-testng;1.3.72 -org.jetbrains.kotlinx:kotlinx-coroutines-android;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-core;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-core-common;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-core-js;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-core-native;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.3.8 -org.jetbrains.kotlinx:kotlinx-coroutines-test;1.3.8 +org.jetbrains.kotlin:kotlin-bom;1.4.10 +org.jetbrains.kotlin:kotlin-compiler;1.4.10 +org.jetbrains.kotlin:kotlin-compiler-embeddable;1.4.10 +org.jetbrains.kotlin:kotlin-daemon-client;1.4.10 +org.jetbrains.kotlin:kotlin-main-kts;1.4.10 +org.jetbrains.kotlin:kotlin-osgi-bundle;1.4.10 +org.jetbrains.kotlin:kotlin-reflect;1.4.10 +org.jetbrains.kotlin:kotlin-script-runtime;1.4.10 +org.jetbrains.kotlin:kotlin-script-util;1.4.10 +org.jetbrains.kotlin:kotlin-scripting-common;1.4.10 +org.jetbrains.kotlin:kotlin-scripting-ide-services;1.4.10 +org.jetbrains.kotlin:kotlin-scripting-jvm;1.4.10 +org.jetbrains.kotlin:kotlin-scripting-jvm-host;1.4.10 +org.jetbrains.kotlin:kotlin-stdlib;1.4.10 +org.jetbrains.kotlin:kotlin-stdlib-common;1.4.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7;1.4.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8;1.4.10 +org.jetbrains.kotlin:kotlin-stdlib-js;1.4.10 +org.jetbrains.kotlin:kotlin-test;1.4.10 +org.jetbrains.kotlin:kotlin-test-annotations-common;1.4.10 +org.jetbrains.kotlin:kotlin-test-common;1.4.10 +org.jetbrains.kotlin:kotlin-test-js;1.4.10 +org.jetbrains.kotlin:kotlin-test-junit;1.4.10 +org.jetbrains.kotlin:kotlin-test-junit5;1.4.10 +org.jetbrains.kotlin:kotlin-test-testng;1.4.10 +org.jetbrains.kotlinx:kotlinx-coroutines-android;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-bom;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-debug;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-guava;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-javafx;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk8;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-jdk9;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-play-services;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-reactive;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-reactor;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-rx2;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-rx3;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-slf4j;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-swing;1.4.1 +org.jetbrains.kotlinx:kotlinx-coroutines-test;1.4.1 org.jolokia:jolokia-core;1.6.2 -org.jooq:jooq;3.13.5 -org.jooq:jooq-codegen;3.13.5 -org.jooq:jooq-meta;3.13.5 -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:junit-bom;5.6.3 +org.jooq:jooq;3.14.3 +org.jooq:jooq-codegen;3.14.3 +org.jooq:jooq-kotlin;3.14.3 +org.jooq:jooq-meta;3.14.3 +org.junit.jupiter:junit-jupiter;5.7.0 +org.junit.jupiter:junit-jupiter-api;5.7.0 +org.junit.jupiter:junit-jupiter-engine;5.7.0 +org.junit.jupiter:junit-jupiter-migrationsupport;5.7.0 +org.junit.jupiter:junit-jupiter-params;5.7.0 +org.junit.platform:junit-platform-commons;1.7.0 +org.junit.platform:junit-platform-console;1.7.0 +org.junit.platform:junit-platform-engine;1.7.0 +org.junit.platform:junit-platform-jfr;1.7.0 +org.junit.platform:junit-platform-launcher;1.7.0 +org.junit.platform:junit-platform-reporting;1.7.0 +org.junit.platform:junit-platform-runner;1.7.0 +org.junit.platform:junit-platform-suite-api;1.7.0 +org.junit.platform:junit-platform-testkit;1.7.0 +org.junit.vintage:junit-vintage-engine;5.7.0 +org.junit:junit-bom;5.7.0 org.jvnet.mimepull:mimepull;1.9.13 -org.liquibase:liquibase-core;3.8.9 -org.mariadb.jdbc:mariadb-java-client;2.6.2 +org.liquibase:liquibase-core;3.10.3 +org.mariadb.jdbc:mariadb-java-client;2.7.0 org.mariadb:r2dbc-mariadb;0.8.4-rc -org.messaginghub:pooled-jms;1.1.2 -org.mockito:mockito-core;3.3.3 -org.mockito:mockito-inline;3.3.3 -org.mockito:mockito-junit-jupiter;3.3.3 -org.mongodb:bson;4.0.5 -org.mongodb:mongodb-driver-core;4.0.5 -org.mongodb:mongodb-driver-legacy;4.0.5 -org.mongodb:mongodb-driver-reactivestreams;4.0.5 -org.mongodb:mongodb-driver-sync;4.0.5 +org.messaginghub:pooled-jms;1.2.1 +org.mockito:mockito-core;3.6.0 +org.mockito:mockito-inline;3.6.0 +org.mockito:mockito-junit-jupiter;3.6.0 +org.mongodb:bson;4.1.1 +org.mongodb:mongodb-driver-core;4.1.1 +org.mongodb:mongodb-driver-legacy;4.1.1 +org.mongodb:mongodb-driver-reactivestreams;4.1.1 +org.mongodb:mongodb-driver-sync;4.1.1 org.mortbay.jasper:apache-el;8.5.54 -org.neo4j:neo4j-ogm-api;3.2.17 -org.neo4j:neo4j-ogm-bolt-driver;3.2.17 -org.neo4j:neo4j-ogm-bolt-native-types;3.2.17 -org.neo4j:neo4j-ogm-core;3.2.17 -org.neo4j:neo4j-ogm-embedded-driver;3.2.17 -org.neo4j:neo4j-ogm-embedded-native-types;3.2.17 -org.neo4j:neo4j-ogm-http-driver;3.2.17 +org.neo4j.driver:neo4j-java-driver;4.1.1 org.postgresql:postgresql;42.2.18 org.projectlombok:lombok;1.18.16 org.quartz-scheduler:quartz;2.3.2 org.quartz-scheduler:quartz-jobs;2.3.2 org.reactivestreams:reactive-streams;1.0.3 -org.seleniumhq.selenium:htmlunit-driver;2.40.0 +org.seleniumhq.selenium:htmlunit-driver;2.44.0 org.seleniumhq.selenium:selenium-api;3.141.59 org.seleniumhq.selenium:selenium-chrome-driver;3.141.59 org.seleniumhq.selenium:selenium-edge-driver;3.141.59 @@ -1539,348 +994,294 @@ org.slf4j:slf4j-jdk14;1.7.30 org.slf4j:slf4j-log4j12;1.7.30 org.slf4j:slf4j-nop;1.7.30 org.slf4j:slf4j-simple;1.7.30 -org.springframework.amqp:spring-amqp;2.2.12.RELEASE -org.springframework.amqp:spring-rabbit;2.2.12.RELEASE -org.springframework.amqp:spring-rabbit-junit;2.2.12.RELEASE -org.springframework.amqp:spring-rabbit-test;2.2.12.RELEASE -org.springframework.batch:spring-batch-core;4.2.4.RELEASE -org.springframework.batch:spring-batch-infrastructure;4.2.4.RELEASE -org.springframework.batch:spring-batch-integration;4.2.4.RELEASE -org.springframework.batch:spring-batch-test;4.2.4.RELEASE -org.springframework.boot:spring-boot;2.3.5.RELEASE -org.springframework.boot:spring-boot-actuator;2.3.5.RELEASE -org.springframework.boot:spring-boot-actuator-autoconfigure;2.3.5.RELEASE -org.springframework.boot:spring-boot-autoconfigure;2.3.5.RELEASE -org.springframework.boot:spring-boot-autoconfigure-processor;2.3.5.RELEASE -org.springframework.boot:spring-boot-buildpack-platform;2.3.5.RELEASE -org.springframework.boot:spring-boot-configuration-metadata;2.3.5.RELEASE -org.springframework.boot:spring-boot-configuration-processor;2.3.5.RELEASE -org.springframework.boot:spring-boot-dependencies;2.3.5.RELEASE -org.springframework.boot:spring-boot-devtools;2.3.5.RELEASE -org.springframework.boot:spring-boot-jarmode-layertools;2.3.5.RELEASE -org.springframework.boot:spring-boot-loader;2.3.5.RELEASE -org.springframework.boot:spring-boot-loader-tools;2.3.5.RELEASE -org.springframework.boot:spring-boot-properties-migrator;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-activemq;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-actuator;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-amqp;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-aop;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-artemis;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-batch;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-cache;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-cassandra;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-cassandra-reactive;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-couchbase;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-couchbase-reactive;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-elasticsearch;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-jdbc;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-jpa;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-ldap;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-mongodb;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-mongodb-reactive;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-neo4j;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-r2dbc;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-redis;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-redis-reactive;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-rest;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-data-solr;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-freemarker;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-groovy-templates;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-hateoas;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-integration;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-jdbc;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-jersey;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-jetty;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-jooq;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-json;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-jta-atomikos;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-jta-bitronix;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-log4j2;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-logging;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-mail;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-mustache;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-oauth2-client;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-oauth2-resource-server;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-quartz;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-reactor-netty;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-rsocket;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-security;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-test;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-thymeleaf;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-tomcat;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-undertow;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-web-services;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-webflux;2.3.5.RELEASE -org.springframework.boot:spring-boot-starter-websocket;2.3.5.RELEASE -org.springframework.boot:spring-boot-test;2.3.5.RELEASE -org.springframework.boot:spring-boot-test-autoconfigure;2.3.5.RELEASE -org.springframework.cloud:spring-cloud-aws-actuator;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-aws-autoconfigure;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-aws-context;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-aws-core;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-aws-dependencies;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-aws-jdbc;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-aws-messaging;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-aws-parameter-store-config;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-aws-secrets-manager-config;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-bus;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-bus-dependencies;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-circuitbreaker-dependencies;1.0.4.RELEASE -org.springframework.cloud:spring-cloud-circuitbreaker-resilience4j;1.0.4.RELEASE -org.springframework.cloud:spring-cloud-circuitbreaker-spring-retry;1.0.4.RELEASE -org.springframework.cloud:spring-cloud-cloudfoundry-commons;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-cloudfoundry-dependencies;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-cloudfoundry-discovery;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-cloudfoundry-web;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-commons;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-commons-dependencies;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-config-client;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-config-dependencies;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-config-monitor;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-config-server;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-consul-binder;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-consul-config;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-consul-core;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-consul-dependencies;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-consul-discovery;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-context;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-contract-converters;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-dependencies;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-gradle-plugin;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-maven-plugin;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-pact;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-shade;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-spec;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-spec-groovy;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-spec-java;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-spec-kotlin;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-stub-runner;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-stub-runner-boot;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-verifier;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-contract-wiremock;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-dependencies;Hoxton.SR8 -org.springframework.cloud:spring-cloud-function-adapter-aws;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-adapter-azure;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-adapter-gcp;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-adapter-openwhisk;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-compiler;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-context;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-core;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-dependencies;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-deployer;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-kotlin;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-task;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-function-web;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-gateway-core;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-gateway-dependencies;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-gateway-mvc;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-gateway-webflux;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-autoconfigure;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-bigquery;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-cloudfoundry;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-core;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-data-datastore;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-data-firestore;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-data-spanner;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-dependencies;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-logging;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-pubsub;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-pubsub-stream-binder;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-secretmanager;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-security-firebase;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-security-iap;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-bigquery;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-bus-pubsub;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-cloudfoundry;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-data-datastore;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-data-firestore;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-data-spanner;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-firestore;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-logging;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-metrics;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-pubsub;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-secretmanager;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-security-firebase;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-security-iap;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-sql-mysql;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-sql-postgresql;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-storage;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-trace;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-starter-vision;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-storage;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-gcp-vision;1.2.5.RELEASE -org.springframework.cloud:spring-cloud-kubernetes-config;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-kubernetes-core;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-kubernetes-dependencies;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-kubernetes-discovery;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-kubernetes-istio;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-kubernetes-leader;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-kubernetes-loadbalancer;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-kubernetes-ribbon;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-loadbalancer;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-archaius;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-core;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-dependencies;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-eureka-client;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-eureka-server;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-hystrix;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-hystrix-dashboard;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-hystrix-stream;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-ribbon;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-sidecar;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-turbine;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-turbine-stream;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-netflix-zuul;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-openfeign-core;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-openfeign-dependencies;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-schema-registry-client;1.0.8.RELEASE -org.springframework.cloud:spring-cloud-schema-registry-core;1.0.8.RELEASE -org.springframework.cloud:spring-cloud-schema-registry-server;1.0.8.RELEASE -org.springframework.cloud:spring-cloud-security;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-security-dependencies;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-sleuth-core;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-sleuth-dependencies;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-sleuth-zipkin;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-aws;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-aws-jdbc;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-aws-messaging;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-aws-parameter-store-config;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-aws-secrets-manager-config;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-bus-amqp;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-starter-bus-kafka;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j;1.0.4.RELEASE -org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j;1.0.4.RELEASE -org.springframework.cloud:spring-cloud-starter-cloudfoundry;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-starter-config;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-consul;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-consul-all;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-consul-bus;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-consul-config;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-consul-discovery;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-contract-stub-runner;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-contract-stub-runner-jetty;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-contract-verifier;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-function-web;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-starter-function-webflux;3.0.10.RELEASE -org.springframework.cloud:spring-cloud-starter-gateway;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-kubernetes;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-starter-kubernetes-all;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-starter-kubernetes-config;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-starter-kubernetes-loadbalancer;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-starter-kubernetes-ribbon;1.1.6.RELEASE -org.springframework.cloud:spring-cloud-starter-loadbalancer;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-archaius;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-eureka-client;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-eureka-server;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-hystrix;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-hystrix-dashboard;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-ribbon;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-turbine;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-turbine-stream;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-netflix-zuul;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-oauth2;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-openfeign;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-security;2.2.4.RELEASE -org.springframework.cloud:spring-cloud-starter-sleuth;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-stream-kafka;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-starter-stream-rabbit;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-starter-task;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-starter-vault-config;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-zipkin;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-starter-zookeeper;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-starter-zookeeper-all;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-starter-zookeeper-config;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-starter-zookeeper-discovery;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-stream;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-stream-binder-kafka;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-stream-binder-kafka-core;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-stream-binder-kafka-streams;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-stream-binder-rabbit;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-stream-binder-rabbit-core;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-stream-binder-rabbit-test-support;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-stream-binder-test;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-stream-dependencies;Horsham.SR8 -org.springframework.cloud:spring-cloud-stream-test-support;3.0.8.RELEASE -org.springframework.cloud:spring-cloud-task-batch;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-task-core;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-task-dependencies;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-task-stream;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-vault-config;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-vault-config-aws;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-vault-config-consul;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-vault-config-databases;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-vault-config-rabbitmq;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-vault-dependencies;2.2.5.RELEASE -org.springframework.cloud:spring-cloud-zookeeper-config;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-zookeeper-core;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-zookeeper-dependencies;2.2.3.RELEASE -org.springframework.cloud:spring-cloud-zookeeper-discovery;2.2.3.RELEASE +org.springframework.amqp:spring-amqp;2.3.1 +org.springframework.amqp:spring-rabbit;2.3.1 +org.springframework.amqp:spring-rabbit-junit;2.3.1 +org.springframework.amqp:spring-rabbit-test;2.3.1 +org.springframework.batch:spring-batch-core;4.3.0 +org.springframework.batch:spring-batch-infrastructure;4.3.0 +org.springframework.batch:spring-batch-integration;4.3.0 +org.springframework.batch:spring-batch-test;4.3.0 +org.springframework.boot:spring-boot;2.4.0 +org.springframework.boot:spring-boot-actuator;2.4.0 +org.springframework.boot:spring-boot-actuator-autoconfigure;2.4.0 +org.springframework.boot:spring-boot-autoconfigure;2.4.0 +org.springframework.boot:spring-boot-autoconfigure-processor;2.4.0 +org.springframework.boot:spring-boot-buildpack-platform;2.4.0 +org.springframework.boot:spring-boot-configuration-metadata;2.4.0 +org.springframework.boot:spring-boot-configuration-processor;2.4.0 +org.springframework.boot:spring-boot-dependencies;2.4.0 +org.springframework.boot:spring-boot-devtools;2.4.0 +org.springframework.boot:spring-boot-jarmode-layertools;2.4.0 +org.springframework.boot:spring-boot-loader;2.4.0 +org.springframework.boot:spring-boot-loader-tools;2.4.0 +org.springframework.boot:spring-boot-properties-migrator;2.4.0 +org.springframework.boot:spring-boot-starter;2.4.0 +org.springframework.boot:spring-boot-starter-activemq;2.4.0 +org.springframework.boot:spring-boot-starter-actuator;2.4.0 +org.springframework.boot:spring-boot-starter-amqp;2.4.0 +org.springframework.boot:spring-boot-starter-aop;2.4.0 +org.springframework.boot:spring-boot-starter-artemis;2.4.0 +org.springframework.boot:spring-boot-starter-batch;2.4.0 +org.springframework.boot:spring-boot-starter-cache;2.4.0 +org.springframework.boot:spring-boot-starter-data-cassandra;2.4.0 +org.springframework.boot:spring-boot-starter-data-cassandra-reactive;2.4.0 +org.springframework.boot:spring-boot-starter-data-couchbase;2.4.0 +org.springframework.boot:spring-boot-starter-data-couchbase-reactive;2.4.0 +org.springframework.boot:spring-boot-starter-data-elasticsearch;2.4.0 +org.springframework.boot:spring-boot-starter-data-jdbc;2.4.0 +org.springframework.boot:spring-boot-starter-data-jpa;2.4.0 +org.springframework.boot:spring-boot-starter-data-ldap;2.4.0 +org.springframework.boot:spring-boot-starter-data-mongodb;2.4.0 +org.springframework.boot:spring-boot-starter-data-mongodb-reactive;2.4.0 +org.springframework.boot:spring-boot-starter-data-neo4j;2.4.0 +org.springframework.boot:spring-boot-starter-data-r2dbc;2.4.0 +org.springframework.boot:spring-boot-starter-data-redis;2.4.0 +org.springframework.boot:spring-boot-starter-data-redis-reactive;2.4.0 +org.springframework.boot:spring-boot-starter-data-rest;2.4.0 +org.springframework.boot:spring-boot-starter-data-solr;2.4.0 +org.springframework.boot:spring-boot-starter-freemarker;2.4.0 +org.springframework.boot:spring-boot-starter-groovy-templates;2.4.0 +org.springframework.boot:spring-boot-starter-hateoas;2.4.0 +org.springframework.boot:spring-boot-starter-integration;2.4.0 +org.springframework.boot:spring-boot-starter-jdbc;2.4.0 +org.springframework.boot:spring-boot-starter-jersey;2.4.0 +org.springframework.boot:spring-boot-starter-jetty;2.4.0 +org.springframework.boot:spring-boot-starter-jooq;2.4.0 +org.springframework.boot:spring-boot-starter-json;2.4.0 +org.springframework.boot:spring-boot-starter-jta-atomikos;2.4.0 +org.springframework.boot:spring-boot-starter-jta-bitronix;2.4.0 +org.springframework.boot:spring-boot-starter-log4j2;2.4.0 +org.springframework.boot:spring-boot-starter-logging;2.4.0 +org.springframework.boot:spring-boot-starter-mail;2.4.0 +org.springframework.boot:spring-boot-starter-mustache;2.4.0 +org.springframework.boot:spring-boot-starter-oauth2-client;2.4.0 +org.springframework.boot:spring-boot-starter-oauth2-resource-server;2.4.0 +org.springframework.boot:spring-boot-starter-parent;2.4.0 +org.springframework.boot:spring-boot-starter-quartz;2.4.0 +org.springframework.boot:spring-boot-starter-reactor-netty;2.4.0 +org.springframework.boot:spring-boot-starter-rsocket;2.4.0 +org.springframework.boot:spring-boot-starter-security;2.4.0 +org.springframework.boot:spring-boot-starter-test;2.4.0 +org.springframework.boot:spring-boot-starter-thymeleaf;2.4.0 +org.springframework.boot:spring-boot-starter-tomcat;2.4.0 +org.springframework.boot:spring-boot-starter-undertow;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-web-services;2.4.0 +org.springframework.boot:spring-boot-starter-webflux;2.4.0 +org.springframework.boot:spring-boot-starter-websocket;2.4.0 +org.springframework.boot:spring-boot-test;2.4.0 +org.springframework.boot:spring-boot-test-autoconfigure;2.4.0 +org.springframework.cloud:spring-cloud-bus;3.0.0 +org.springframework.cloud:spring-cloud-bus-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-bus-rsocket;3.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-dependencies;2.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-resilience4j;2.0.0 +org.springframework.cloud:spring-cloud-circuitbreaker-spring-retry;2.0.0 +org.springframework.cloud:spring-cloud-cloudfoundry-commons;3.0.0 +org.springframework.cloud:spring-cloud-cloudfoundry-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-cloudfoundry-discovery;3.0.0 +org.springframework.cloud:spring-cloud-cloudfoundry-web;3.0.0 +org.springframework.cloud:spring-cloud-commons;3.0.0 +org.springframework.cloud:spring-cloud-commons-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-config-client;3.0.0 +org.springframework.cloud:spring-cloud-config-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-config-monitor;3.0.0 +org.springframework.cloud:spring-cloud-config-server;3.0.0 +org.springframework.cloud:spring-cloud-consul-binder;3.0.0 +org.springframework.cloud:spring-cloud-consul-config;3.0.0 +org.springframework.cloud:spring-cloud-consul-core;3.0.0 +org.springframework.cloud:spring-cloud-consul-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-consul-discovery;3.0.0 +org.springframework.cloud:spring-cloud-context;3.0.0 +org.springframework.cloud:spring-cloud-contract-converters;3.0.0 +org.springframework.cloud:spring-cloud-contract-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-contract-gradle-plugin;3.0.0 +org.springframework.cloud:spring-cloud-contract-maven-plugin;3.0.0 +org.springframework.cloud:spring-cloud-contract-pact;3.0.0 +org.springframework.cloud:spring-cloud-contract-shade;3.0.0 +org.springframework.cloud:spring-cloud-contract-spec;3.0.0 +org.springframework.cloud:spring-cloud-contract-spec-groovy;3.0.0 +org.springframework.cloud:spring-cloud-contract-spec-java;3.0.0 +org.springframework.cloud:spring-cloud-contract-spec-kotlin;3.0.0 +org.springframework.cloud:spring-cloud-contract-stub-runner;3.0.0 +org.springframework.cloud:spring-cloud-contract-stub-runner-boot;3.0.0 +org.springframework.cloud:spring-cloud-contract-verifier;3.0.0 +org.springframework.cloud:spring-cloud-contract-wiremock;3.0.0 +org.springframework.cloud:spring-cloud-dependencies;2020.0.0 +org.springframework.cloud:spring-cloud-function-adapter-aws;3.1.0 +org.springframework.cloud:spring-cloud-function-adapter-azure;3.1.0 +org.springframework.cloud:spring-cloud-function-adapter-gcp;3.1.0 +org.springframework.cloud:spring-cloud-function-adapter-openwhisk;3.1.0 +org.springframework.cloud:spring-cloud-function-context;3.1.0 +org.springframework.cloud:spring-cloud-function-core;3.1.0 +org.springframework.cloud:spring-cloud-function-dependencies;3.1.0 +org.springframework.cloud:spring-cloud-function-deployer;3.1.0 +org.springframework.cloud:spring-cloud-function-kotlin;3.1.0 +org.springframework.cloud:spring-cloud-function-rsocket;3.1.0 +org.springframework.cloud:spring-cloud-function-web;3.1.0 +org.springframework.cloud:spring-cloud-gateway-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-gateway-mvc;3.0.0 +org.springframework.cloud:spring-cloud-gateway-server;3.0.0 +org.springframework.cloud:spring-cloud-gateway-server-security;3.0.0 +org.springframework.cloud:spring-cloud-gateway-webflux;3.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-autoconfig;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-config;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-discovery;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-client-loadbalancer;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-commons;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-dependencies;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-autoconfig;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-config;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-discovery;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-istio;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-leader;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-fabric8-loadbalancer;2.0.0 +org.springframework.cloud:spring-cloud-kubernetes-test-support;2.0.0 +org.springframework.cloud:spring-cloud-loadbalancer;3.0.0 +org.springframework.cloud:spring-cloud-netflix-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-netflix-eureka-client;3.0.0 +org.springframework.cloud:spring-cloud-netflix-eureka-server;3.0.0 +org.springframework.cloud:spring-cloud-openfeign-core;3.0.0 +org.springframework.cloud:spring-cloud-openfeign-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-schema-registry-client;1.1.0 +org.springframework.cloud:spring-cloud-schema-registry-core;1.1.0 +org.springframework.cloud:spring-cloud-schema-registry-server;1.1.0 +org.springframework.cloud:spring-cloud-sleuth-api;3.0.0 +org.springframework.cloud:spring-cloud-sleuth-autoconfigure;3.0.0 +org.springframework.cloud:spring-cloud-sleuth-brave;3.0.0 +org.springframework.cloud:spring-cloud-sleuth-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-sleuth-instrumentation;3.0.0 +org.springframework.cloud:spring-cloud-sleuth-tests-common;3.0.0 +org.springframework.cloud:spring-cloud-sleuth-zipkin;3.0.0 +org.springframework.cloud:spring-cloud-starter;3.0.0 +org.springframework.cloud:spring-cloud-starter-bootstrap;3.0.0 +org.springframework.cloud:spring-cloud-starter-bus-amqp;3.0.0 +org.springframework.cloud:spring-cloud-starter-bus-kafka;3.0.0 +org.springframework.cloud:spring-cloud-starter-bus-stream;3.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-reactor-resilience4j;2.0.0 +org.springframework.cloud:spring-cloud-starter-circuitbreaker-resilience4j;2.0.0 +org.springframework.cloud:spring-cloud-starter-cloudfoundry;3.0.0 +org.springframework.cloud:spring-cloud-starter-config;3.0.0 +org.springframework.cloud:spring-cloud-starter-consul;3.0.0 +org.springframework.cloud:spring-cloud-starter-consul-all;3.0.0 +org.springframework.cloud:spring-cloud-starter-consul-bus;3.0.0 +org.springframework.cloud:spring-cloud-starter-consul-config;3.0.0 +org.springframework.cloud:spring-cloud-starter-consul-discovery;3.0.0 +org.springframework.cloud:spring-cloud-starter-contract-stub-runner;3.0.0 +org.springframework.cloud:spring-cloud-starter-contract-stub-runner-jetty;3.0.0 +org.springframework.cloud:spring-cloud-starter-contract-verifier;3.0.0 +org.springframework.cloud:spring-cloud-starter-function-web;3.1.0 +org.springframework.cloud:spring-cloud-starter-function-webflux;3.1.0 +org.springframework.cloud:spring-cloud-starter-gateway;3.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client;2.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-all;2.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-config;2.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-client-loadbalancer;2.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8;2.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-all;2.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-config;2.0.0 +org.springframework.cloud:spring-cloud-starter-kubernetes-fabric8-loadbalancer;2.0.0 +org.springframework.cloud:spring-cloud-starter-loadbalancer;3.0.0 +org.springframework.cloud:spring-cloud-starter-netflix-eureka-client;3.0.0 +org.springframework.cloud:spring-cloud-starter-netflix-eureka-server;3.0.0 +org.springframework.cloud:spring-cloud-starter-openfeign;3.0.0 +org.springframework.cloud:spring-cloud-starter-sleuth;3.0.0 +org.springframework.cloud:spring-cloud-starter-stream-kafka;3.1.0 +org.springframework.cloud:spring-cloud-starter-stream-rabbit;3.1.0 +org.springframework.cloud:spring-cloud-starter-task;2.3.0 +org.springframework.cloud:spring-cloud-starter-vault-config;3.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper;3.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-all;3.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-config;3.0.0 +org.springframework.cloud:spring-cloud-starter-zookeeper-discovery;3.0.0 +org.springframework.cloud:spring-cloud-stream;3.1.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka;3.1.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka-core;3.1.0 +org.springframework.cloud:spring-cloud-stream-binder-kafka-streams;3.1.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit;3.1.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit-core;3.1.0 +org.springframework.cloud:spring-cloud-stream-binder-rabbit-test-support;3.1.0 +org.springframework.cloud:spring-cloud-stream-binder-test;3.1.0 +org.springframework.cloud:spring-cloud-stream-dependencies;3.1.0 +org.springframework.cloud:spring-cloud-stream-test-support;3.1.0 +org.springframework.cloud:spring-cloud-task-batch;2.3.0 +org.springframework.cloud:spring-cloud-task-core;2.3.0 +org.springframework.cloud:spring-cloud-task-dependencies;2.3.0 +org.springframework.cloud:spring-cloud-task-stream;2.3.0 +org.springframework.cloud:spring-cloud-vault-config;3.0.0 +org.springframework.cloud:spring-cloud-vault-config-aws;3.0.0 +org.springframework.cloud:spring-cloud-vault-config-consul;3.0.0 +org.springframework.cloud:spring-cloud-vault-config-databases;3.0.0 +org.springframework.cloud:spring-cloud-vault-config-rabbitmq;3.0.0 +org.springframework.cloud:spring-cloud-vault-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-zookeeper-config;3.0.0 +org.springframework.cloud:spring-cloud-zookeeper-core;3.0.0 +org.springframework.cloud:spring-cloud-zookeeper-dependencies;3.0.0 +org.springframework.cloud:spring-cloud-zookeeper-discovery;3.0.0 org.springframework.credhub:spring-credhub-core;2.0.0.RELEASE -org.springframework.data:spring-data-cassandra;3.0.5.RELEASE -org.springframework.data:spring-data-commons;2.3.5.RELEASE -org.springframework.data:spring-data-couchbase;4.0.5.RELEASE -org.springframework.data:spring-data-elasticsearch;4.0.5.RELEASE -org.springframework.data:spring-data-envers;2.3.5.RELEASE -org.springframework.data:spring-data-gemfire;2.3.5.RELEASE -org.springframework.data:spring-data-geode;2.3.5.RELEASE -org.springframework.data:spring-data-jdbc;2.0.5.RELEASE -org.springframework.data:spring-data-jpa;2.3.5.RELEASE -org.springframework.data:spring-data-keyvalue;2.3.5.RELEASE -org.springframework.data:spring-data-ldap;2.3.5.RELEASE -org.springframework.data:spring-data-mongodb;3.0.5.RELEASE -org.springframework.data:spring-data-neo4j;5.3.5.RELEASE -org.springframework.data:spring-data-r2dbc;1.1.5.RELEASE -org.springframework.data:spring-data-redis;2.3.5.RELEASE -org.springframework.data:spring-data-relational;2.0.5.RELEASE -org.springframework.data:spring-data-releasetrain;Neumann-SR5 -org.springframework.data:spring-data-rest-core;3.3.5.RELEASE -org.springframework.data:spring-data-rest-hal-browser;3.3.5.RELEASE -org.springframework.data:spring-data-rest-hal-explorer;3.3.5.RELEASE -org.springframework.data:spring-data-rest-webmvc;3.3.5.RELEASE -org.springframework.data:spring-data-solr;4.2.5.RELEASE -org.springframework.hateoas:spring-hateoas;1.1.2.RELEASE -org.springframework.integration:spring-integration-amqp;5.3.3.RELEASE -org.springframework.integration:spring-integration-bom;5.3.3.RELEASE -org.springframework.integration:spring-integration-core;5.3.3.RELEASE -org.springframework.integration:spring-integration-event;5.3.3.RELEASE -org.springframework.integration:spring-integration-feed;5.3.3.RELEASE -org.springframework.integration:spring-integration-file;5.3.3.RELEASE -org.springframework.integration:spring-integration-ftp;5.3.3.RELEASE -org.springframework.integration:spring-integration-gemfire;5.3.3.RELEASE -org.springframework.integration:spring-integration-groovy;5.3.3.RELEASE -org.springframework.integration:spring-integration-http;5.3.3.RELEASE -org.springframework.integration:spring-integration-ip;5.3.3.RELEASE -org.springframework.integration:spring-integration-jdbc;5.3.3.RELEASE -org.springframework.integration:spring-integration-jms;5.3.3.RELEASE -org.springframework.integration:spring-integration-jmx;5.3.3.RELEASE -org.springframework.integration:spring-integration-jpa;5.3.3.RELEASE -org.springframework.integration:spring-integration-mail;5.3.3.RELEASE -org.springframework.integration:spring-integration-mongodb;5.3.3.RELEASE -org.springframework.integration:spring-integration-mqtt;5.3.3.RELEASE -org.springframework.integration:spring-integration-redis;5.3.3.RELEASE -org.springframework.integration:spring-integration-rmi;5.3.3.RELEASE -org.springframework.integration:spring-integration-rsocket;5.3.3.RELEASE -org.springframework.integration:spring-integration-scripting;5.3.3.RELEASE -org.springframework.integration:spring-integration-security;5.3.3.RELEASE -org.springframework.integration:spring-integration-sftp;5.3.3.RELEASE -org.springframework.integration:spring-integration-stomp;5.3.3.RELEASE -org.springframework.integration:spring-integration-stream;5.3.3.RELEASE -org.springframework.integration:spring-integration-syslog;5.3.3.RELEASE -org.springframework.integration:spring-integration-test;5.3.3.RELEASE -org.springframework.integration:spring-integration-test-support;5.3.3.RELEASE -org.springframework.integration:spring-integration-webflux;5.3.3.RELEASE -org.springframework.integration:spring-integration-websocket;5.3.3.RELEASE -org.springframework.integration:spring-integration-ws;5.3.3.RELEASE -org.springframework.integration:spring-integration-xml;5.3.3.RELEASE -org.springframework.integration:spring-integration-xmpp;5.3.3.RELEASE -org.springframework.integration:spring-integration-zookeeper;5.3.3.RELEASE -org.springframework.kafka:spring-kafka;2.5.7.RELEASE -org.springframework.kafka:spring-kafka-test;2.5.7.RELEASE +org.springframework.data:spring-data-bom;2020.0.1 +org.springframework.data:spring-data-cassandra;3.1.1 +org.springframework.data:spring-data-commons;2.4.1 +org.springframework.data:spring-data-couchbase;4.1.1 +org.springframework.data:spring-data-elasticsearch;4.1.1 +org.springframework.data:spring-data-envers;2.4.1 +org.springframework.data:spring-data-geode;2.4.1 +org.springframework.data:spring-data-jdbc;2.1.1 +org.springframework.data:spring-data-jpa;2.4.1 +org.springframework.data:spring-data-keyvalue;2.4.1 +org.springframework.data:spring-data-ldap;2.4.1 +org.springframework.data:spring-data-mongodb;3.1.1 +org.springframework.data:spring-data-neo4j;6.0.1 +org.springframework.data:spring-data-r2dbc;1.2.1 +org.springframework.data:spring-data-redis;2.4.1 +org.springframework.data:spring-data-relational;2.1.1 +org.springframework.data:spring-data-rest-core;3.4.1 +org.springframework.data:spring-data-rest-hal-explorer;3.4.1 +org.springframework.data:spring-data-rest-webmvc;3.4.1 +org.springframework.data:spring-data-solr;4.3.1 +org.springframework.hateoas:spring-hateoas;1.2.1 +org.springframework.integration:spring-integration-amqp;5.4.1 +org.springframework.integration:spring-integration-bom;5.4.1 +org.springframework.integration:spring-integration-core;5.4.1 +org.springframework.integration:spring-integration-event;5.4.1 +org.springframework.integration:spring-integration-feed;5.4.1 +org.springframework.integration:spring-integration-file;5.4.1 +org.springframework.integration:spring-integration-ftp;5.4.1 +org.springframework.integration:spring-integration-gemfire;5.4.1 +org.springframework.integration:spring-integration-groovy;5.4.1 +org.springframework.integration:spring-integration-http;5.4.1 +org.springframework.integration:spring-integration-ip;5.4.1 +org.springframework.integration:spring-integration-jdbc;5.4.1 +org.springframework.integration:spring-integration-jms;5.4.1 +org.springframework.integration:spring-integration-jmx;5.4.1 +org.springframework.integration:spring-integration-jpa;5.4.1 +org.springframework.integration:spring-integration-kafka;5.4.1 +org.springframework.integration:spring-integration-mail;5.4.1 +org.springframework.integration:spring-integration-mongodb;5.4.1 +org.springframework.integration:spring-integration-mqtt;5.4.1 +org.springframework.integration:spring-integration-r2dbc;5.4.1 +org.springframework.integration:spring-integration-redis;5.4.1 +org.springframework.integration:spring-integration-rmi;5.4.1 +org.springframework.integration:spring-integration-rsocket;5.4.1 +org.springframework.integration:spring-integration-scripting;5.4.1 +org.springframework.integration:spring-integration-security;5.4.1 +org.springframework.integration:spring-integration-sftp;5.4.1 +org.springframework.integration:spring-integration-stomp;5.4.1 +org.springframework.integration:spring-integration-stream;5.4.1 +org.springframework.integration:spring-integration-syslog;5.4.1 +org.springframework.integration:spring-integration-test;5.4.1 +org.springframework.integration:spring-integration-test-support;5.4.1 +org.springframework.integration:spring-integration-webflux;5.4.1 +org.springframework.integration:spring-integration-websocket;5.4.1 +org.springframework.integration:spring-integration-ws;5.4.1 +org.springframework.integration:spring-integration-xml;5.4.1 +org.springframework.integration:spring-integration-xmpp;5.4.1 +org.springframework.integration:spring-integration-zeromq;5.4.1 +org.springframework.integration:spring-integration-zookeeper;5.4.1 +org.springframework.kafka:spring-kafka;2.6.3 +org.springframework.kafka:spring-kafka-test;2.6.3 org.springframework.ldap:spring-ldap-core;2.3.3.RELEASE org.springframework.ldap:spring-ldap-core-tiger;2.3.3.RELEASE org.springframework.ldap:spring-ldap-ldif-batch;2.3.3.RELEASE @@ -1892,79 +1293,79 @@ org.springframework.restdocs:spring-restdocs-core;2.0.5.RELEASE org.springframework.restdocs:spring-restdocs-mockmvc;2.0.5.RELEASE org.springframework.restdocs:spring-restdocs-restassured;2.0.5.RELEASE org.springframework.restdocs:spring-restdocs-webtestclient;2.0.5.RELEASE -org.springframework.retry:spring-retry;1.2.5.RELEASE +org.springframework.retry:spring-retry;1.3.0 org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure;2.1.2.RELEASE -org.springframework.security:spring-security-acl;5.3.5.RELEASE -org.springframework.security:spring-security-aspects;5.3.5.RELEASE -org.springframework.security:spring-security-bom;5.3.5.RELEASE -org.springframework.security:spring-security-cas;5.3.5.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-crypto;5.3.5.RELEASE -org.springframework.security:spring-security-data;5.3.5.RELEASE -org.springframework.security:spring-security-ldap;5.3.5.RELEASE -org.springframework.security:spring-security-messaging;5.3.5.RELEASE -org.springframework.security:spring-security-oauth2-client;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-oauth2-resource-server;5.3.5.RELEASE -org.springframework.security:spring-security-openid;5.3.5.RELEASE -org.springframework.security:spring-security-remoting;5.3.5.RELEASE +org.springframework.security:spring-security-acl;5.4.1 +org.springframework.security:spring-security-aspects;5.4.1 +org.springframework.security:spring-security-bom;5.4.1 +org.springframework.security:spring-security-cas;5.4.1 +org.springframework.security:spring-security-config;5.4.1 +org.springframework.security:spring-security-core;5.4.1 +org.springframework.security:spring-security-crypto;5.4.1 +org.springframework.security:spring-security-data;5.4.1 +org.springframework.security:spring-security-ldap;5.4.1 +org.springframework.security:spring-security-messaging;5.4.1 +org.springframework.security:spring-security-oauth2-client;5.4.1 +org.springframework.security:spring-security-oauth2-core;5.4.1 +org.springframework.security:spring-security-oauth2-jose;5.4.1 +org.springframework.security:spring-security-oauth2-resource-server;5.4.1 +org.springframework.security:spring-security-openid;5.4.1 +org.springframework.security:spring-security-remoting;5.4.1 org.springframework.security:spring-security-rsa;1.0.9.RELEASE -org.springframework.security:spring-security-rsocket;5.3.5.RELEASE -org.springframework.security:spring-security-saml2-service-provider;5.3.5.RELEASE -org.springframework.security:spring-security-taglibs;5.3.5.RELEASE -org.springframework.security:spring-security-test;5.3.5.RELEASE -org.springframework.security:spring-security-web;5.3.5.RELEASE -org.springframework.session:spring-session-bom;Dragonfruit-SR1 -org.springframework.session:spring-session-core;2.3.1.RELEASE -org.springframework.session:spring-session-data-geode;2.3.1.RELEASE -org.springframework.session:spring-session-data-mongodb;2.3.0.RELEASE -org.springframework.session:spring-session-data-redis;2.3.1.RELEASE -org.springframework.session:spring-session-hazelcast;2.3.1.RELEASE -org.springframework.session:spring-session-jdbc;2.3.1.RELEASE -org.springframework.vault:spring-vault-core;2.2.0.RELEASE +org.springframework.security:spring-security-rsocket;5.4.1 +org.springframework.security:spring-security-saml2-service-provider;5.4.1 +org.springframework.security:spring-security-taglibs;5.4.1 +org.springframework.security:spring-security-test;5.4.1 +org.springframework.security:spring-security-web;5.4.1 +org.springframework.session:spring-session-bom;2020.0.1 +org.springframework.session:spring-session-core;2.4.1 +org.springframework.session:spring-session-data-geode;2.4.0 +org.springframework.session:spring-session-data-mongodb;2.4.1 +org.springframework.session:spring-session-data-redis;2.4.1 +org.springframework.session:spring-session-hazelcast;2.4.1 +org.springframework.session:spring-session-jdbc;2.4.1 +org.springframework.vault:spring-vault-core;2.3.0-M1 org.springframework.ws:spring-ws-core;3.0.10.RELEASE org.springframework.ws:spring-ws-security;3.0.10.RELEASE org.springframework.ws:spring-ws-support;3.0.10.RELEASE org.springframework.ws:spring-ws-test;3.0.10.RELEASE org.springframework.ws:spring-xml;3.0.10.RELEASE -org.springframework:spring-aop;5.2.10.RELEASE -org.springframework:spring-aspects;5.2.10.RELEASE -org.springframework:spring-beans;5.2.10.RELEASE -org.springframework:spring-context;5.2.10.RELEASE -org.springframework:spring-context-indexer;5.2.10.RELEASE -org.springframework:spring-context-support;5.2.10.RELEASE -org.springframework:spring-core;5.2.10.RELEASE -org.springframework:spring-expression;5.2.10.RELEASE -org.springframework:spring-framework-bom;5.2.10.RELEASE -org.springframework:spring-instrument;5.2.10.RELEASE -org.springframework:spring-jcl;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-orm;5.2.10.RELEASE -org.springframework:spring-oxm;5.2.10.RELEASE -org.springframework:spring-test;5.2.10.RELEASE -org.springframework:spring-tx;5.2.10.RELEASE -org.springframework:spring-web;5.2.10.RELEASE -org.springframework:spring-webflux;5.2.10.RELEASE -org.springframework:spring-webmvc;5.2.10.RELEASE -org.springframework:spring-websocket;5.2.10.RELEASE -org.synchronoss.cloud:nio-multipart-parser;1.1.0 +org.springframework:spring-aop;5.3.1 +org.springframework:spring-aspects;5.3.1 +org.springframework:spring-beans;5.3.1 +org.springframework:spring-context;5.3.1 +org.springframework:spring-context-indexer;5.3.1 +org.springframework:spring-context-support;5.3.1 +org.springframework:spring-core;5.3.1 +org.springframework:spring-expression;5.3.1 +org.springframework:spring-framework-bom;5.3.1 +org.springframework:spring-instrument;5.3.1 +org.springframework:spring-jcl;5.3.1 +org.springframework:spring-jdbc;5.3.1 +org.springframework:spring-jms;5.3.1 +org.springframework:spring-messaging;5.3.1 +org.springframework:spring-orm;5.3.1 +org.springframework:spring-oxm;5.3.1 +org.springframework:spring-r2dbc;5.3.1 +org.springframework:spring-test;5.3.1 +org.springframework:spring-tx;5.3.1 +org.springframework:spring-web;5.3.1 +org.springframework:spring-webflux;5.3.1 +org.springframework:spring-webmvc;5.3.1 +org.springframework:spring-websocket;5.3.1 org.thymeleaf.extras:thymeleaf-extras-java8time;3.0.4.RELEASE org.thymeleaf.extras:thymeleaf-extras-springsecurity5;3.0.4.RELEASE org.thymeleaf:thymeleaf;3.0.11.RELEASE org.thymeleaf:thymeleaf-spring5;3.0.11.RELEASE org.tmatesoft.svnkit:svnkit;1.8.12 org.webjars:hal-browser;3325375 -org.webjars:webjars-locator-core;0.45 -org.xerial:sqlite-jdbc;3.31.1 +org.webjars:webjars-locator-core;0.46 +org.xerial:sqlite-jdbc;3.32.3.2 org.xmlunit:xmlunit-assertj;2.7.0 org.xmlunit:xmlunit-core;2.7.0 org.xmlunit:xmlunit-legacy;2.7.0 org.xmlunit:xmlunit-matchers;2.7.0 org.xmlunit:xmlunit-placeholders;2.7.0 -org.yaml:snakeyaml;1.26 +org.yaml:snakeyaml;1.27 redis.clients:jedis;3.3.0 -wsdl4j:wsdl4j;1.6.3 +wsdl4j:wsdl4j;1.6.3 \ No newline at end of file diff --git a/sdk/spring/scripts/update_spring_managed_external_dependencies.py b/sdk/spring/scripts/update_spring_managed_external_dependencies.py index 719e03e27263c..32f2827b360d2 100644 --- a/sdk/spring/scripts/update_spring_managed_external_dependencies.py +++ b/sdk/spring/scripts/update_spring_managed_external_dependencies.py @@ -18,8 +18,8 @@ EXTERNAL_DEPENDENCIES_FILE = 'eng/versioning/external_dependencies.txt' ROOT_POMS = [ - 'org.springframework.boot:spring-boot-dependencies;2.3.5.RELEASE', - 'org.springframework.cloud:spring-cloud-dependencies;Hoxton.SR8' + 'org.springframework.boot:spring-boot-dependencies;2.4.0', + 'org.springframework.cloud:spring-cloud-dependencies;2020.0.0' ] SKIP_IDS = [ 'org.eclipse.jgit:org.eclipse.jgit' # Refs: https://github.com/Azure/azure-sdk-for-java/pull/13956/files#r468368271 @@ -247,4 +247,4 @@ def init(): if __name__ == '__main__': # unittest.main() init() - main() + main() \ No newline at end of file diff --git a/sdk/spring/spring-test-template.yml b/sdk/spring/spring-test-template.yml index 0f50665083931..76261158dfdd3 100644 --- a/sdk/spring/spring-test-template.yml +++ b/sdk/spring/spring-test-template.yml @@ -102,38 +102,6 @@ stages: displayName: 'Create On-demand test user' PostSteps: - - powershell: | - az ad user delete --id "${{ parameters.EnvVars.AAD_USER_NAME_ON_DEMAND }}" - az ad user create --user-principal-name "${{ parameters.EnvVars.AAD_USER_NAME_ON_DEMAND }}" --display-name "${{ parameters.AadOnDemandUserDisplayName }}" --password "${{ parameters.EnvVars.AAD_USER_PASSWORD_ON_DEMAND }}" --force-change-password-next-login false - condition: always() - displayName: 'Delete On-demand test user and create again' - - - script: | - python --version - python -m pip install setuptools termcolor in_place - python sdk/spring/scripts/replace_util.py --module spring --log debug --color false - displayName: 'Run replace_util.py' - - - task: Maven@3 - displayName: 'Build and Install again, JDK Version: $(JavaBuildVersion)' - inputs: - mavenPomFile: pom.xml - goals: 'install' - options: '$(DefaultOptions) -DskipTests -Dgpg.skip -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true -Drevapi.skip=true -pl $(ProjectList) -am' - mavenOptions: '$(MemoryOptions) $(LoggingOptions)' - javaHomeOption: 'JDKVersion' - jdkVersionOption: $(JavaBuildVersion) - jdkArchitectureOption: 'x64' - publishJUnitResults: false - - - task: Maven@3 - displayName: 'Run tests again, JDK Version: $(JavaBuildVersion)' - inputs: - mavenPomFile: pom.xml - goals: verify - options: '-Dmaven.wagon.http.pool=false $(DefaultOptions) -Dmaven.javadoc.skip=true -Drevapi.skip=true -DskipSpringITs=false -pl $(ProjectList)' - env: ${{ parameters.EnvVars }} - - powershell: | az ad user delete --id "${{ parameters.EnvVars.AAD_USER_NAME_ON_DEMAND }}" az logout diff --git a/sdk/storage/azure-storage-blob-batch/pom.xml b/sdk/storage/azure-storage-blob-batch/pom.xml index 7aa62e12b0b0a..6edfdca1e0bb9 100644 --- a/sdk/storage/azure-storage-blob-batch/pom.xml +++ b/sdk/storage/azure-storage-blob-batch/pom.xml @@ -55,12 +55,12 @@ com.azure azure-core - 1.13.0 + 1.14.0-beta.1 com.azure azure-core-http-netty - 1.8.0 + 1.9.0-beta.1 com.azure @@ -93,7 +93,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/storage/azure-storage-blob-changefeed/pom.xml b/sdk/storage/azure-storage-blob-changefeed/pom.xml index 82956d98e3b73..e5338ade3e6d6 100644 --- a/sdk/storage/azure-storage-blob-changefeed/pom.xml +++ b/sdk/storage/azure-storage-blob-changefeed/pom.xml @@ -55,12 +55,12 @@ com.azure azure-core - 1.13.0 + 1.14.0-beta.1 com.azure azure-core-http-netty - 1.8.0 + 1.9.0-beta.1 com.azure @@ -93,7 +93,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -117,7 +117,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/storage/azure-storage-blob-cryptography/pom.xml b/sdk/storage/azure-storage-blob-cryptography/pom.xml index a82659e9aeee8..48989351f79ca 100644 --- a/sdk/storage/azure-storage-blob-cryptography/pom.xml +++ b/sdk/storage/azure-storage-blob-cryptography/pom.xml @@ -41,12 +41,12 @@ com.azure azure-core - 1.13.0 + 1.14.0-beta.1 com.azure azure-core-http-netty - 1.8.0 + 1.9.0-beta.1 com.azure diff --git a/sdk/storage/azure-storage-blob-nio/pom.xml b/sdk/storage/azure-storage-blob-nio/pom.xml index b6d54d97da149..bd85d66c02fe3 100644 --- a/sdk/storage/azure-storage-blob-nio/pom.xml +++ b/sdk/storage/azure-storage-blob-nio/pom.xml @@ -51,6 +51,16 @@ + + com.azure + azure-core + 1.14.0-beta.1 + + + com.azure + azure-core-http-netty + 1.9.0-beta.1 + com.azure azure-storage-blob @@ -66,7 +76,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/storage/azure-storage-blob/pom.xml b/sdk/storage/azure-storage-blob/pom.xml index 07352e70ed468..4eeb12536a52c 100644 --- a/sdk/storage/azure-storage-blob/pom.xml +++ b/sdk/storage/azure-storage-blob/pom.xml @@ -55,7 +55,12 @@ com.azure azure-core - 1.13.0 + 1.14.0-beta.1 + + + com.azure + azure-core-http-netty + 1.9.0-beta.1 com.azure @@ -83,12 +88,6 @@ 1.5.3 test - - com.azure - azure-core-http-netty - 1.8.0 - test - com.azure azure-identity @@ -98,7 +97,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/storage/azure-storage-common/pom.xml b/sdk/storage/azure-storage-common/pom.xml index cc989a6b61ec3..f47434870ef70 100644 --- a/sdk/storage/azure-storage-common/pom.xml +++ b/sdk/storage/azure-storage-common/pom.xml @@ -41,12 +41,12 @@ com.azure azure-core - 1.13.0 + 1.14.0-beta.1 com.azure azure-core-http-netty - 1.8.0 + 1.9.0-beta.1 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/storage/azure-storage-file-datalake/pom.xml b/sdk/storage/azure-storage-file-datalake/pom.xml index 45f31bcd89dd2..b3529614ca041 100644 --- a/sdk/storage/azure-storage-file-datalake/pom.xml +++ b/sdk/storage/azure-storage-file-datalake/pom.xml @@ -52,6 +52,16 @@ + + com.azure + azure-core + 1.14.0-beta.1 + + + com.azure + azure-core-http-netty + 1.9.0-beta.1 + com.azure azure-storage-blob @@ -74,12 +84,6 @@ 1.5.3 test - - com.azure - azure-core-http-netty - 1.8.0 - test - com.azure azure-identity @@ -89,7 +93,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/storage/azure-storage-file-share/pom.xml b/sdk/storage/azure-storage-file-share/pom.xml index ea1fbd5975e15..0cbf6958be811 100644 --- a/sdk/storage/azure-storage-file-share/pom.xml +++ b/sdk/storage/azure-storage-file-share/pom.xml @@ -33,6 +33,16 @@ + + com.azure + azure-core + 1.14.0-beta.1 + + + com.azure + azure-core-http-netty + 1.9.0-beta.1 + com.azure azure-storage-common @@ -55,16 +65,10 @@ 1.5.3 test - - com.azure - azure-core-http-netty - 1.8.0 - test - io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/storage/azure-storage-internal-avro/pom.xml b/sdk/storage/azure-storage-internal-avro/pom.xml index 69a75745f1548..9d056e2f23352 100644 --- a/sdk/storage/azure-storage-internal-avro/pom.xml +++ b/sdk/storage/azure-storage-internal-avro/pom.xml @@ -38,6 +38,16 @@ + + com.azure + azure-core + 1.14.0-beta.1 + + + com.azure + azure-core-http-netty + 1.9.0-beta.1 + com.azure azure-storage-common @@ -46,7 +56,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/storage/azure-storage-queue/pom.xml b/sdk/storage/azure-storage-queue/pom.xml index 4124788380056..2af6a5feb171b 100644 --- a/sdk/storage/azure-storage-queue/pom.xml +++ b/sdk/storage/azure-storage-queue/pom.xml @@ -36,7 +36,12 @@ com.azure azure-core - 1.13.0 + 1.14.0-beta.1 + + + com.azure + azure-core-http-netty + 1.9.0-beta.1 com.azure @@ -49,12 +54,6 @@ 1.5.3 test - - com.azure - azure-core-http-netty - 1.8.0 - test - org.spockframework @@ -65,7 +64,7 @@ io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test diff --git a/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml b/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml index fe0b0747f1237..25924c1b6da7e 100644 --- a/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-accesscontrol/pom.xml @@ -65,19 +65,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml b/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml index 7172393a8b4b1..208708f5ec66c 100644 --- a/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-artifacts/pom.xml @@ -65,19 +65,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml b/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml index f0be23b25d904..91b1b217045cc 100644 --- a/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-managedprivateendpoints/pom.xml @@ -65,19 +65,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml b/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml index 0a4718f8e27b7..f55e254e2b0dd 100644 --- a/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-monitoring/pom.xml @@ -65,19 +65,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/synapse/azure-analytics-synapse-spark/pom.xml b/sdk/synapse/azure-analytics-synapse-spark/pom.xml index dd84c3781157c..9c3f028c1924a 100644 --- a/sdk/synapse/azure-analytics-synapse-spark/pom.xml +++ b/sdk/synapse/azure-analytics-synapse-spark/pom.xml @@ -65,19 +65,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/tables/azure-data-tables/pom.xml b/sdk/tables/azure-data-tables/pom.xml index 21eb1076e9a81..02e37d5f1a775 100644 --- a/sdk/tables/azure-data-tables/pom.xml +++ b/sdk/tables/azure-data-tables/pom.xml @@ -50,25 +50,25 @@ Licensed under the MIT License. org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test io.projectreactor reactor-test - 3.3.12.RELEASE + 3.4.3 test @@ -80,7 +80,7 @@ Licensed under the MIT License. org.mockito mockito-core - 3.3.3 + 3.6.0 test diff --git a/sdk/template/azure-sdk-template/pom.xml b/sdk/template/azure-sdk-template/pom.xml index 08d3ce3c56916..da43fbd3ed547 100644 --- a/sdk/template/azure-sdk-template/pom.xml +++ b/sdk/template/azure-sdk-template/pom.xml @@ -36,19 +36,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test diff --git a/sdk/textanalytics/azure-ai-textanalytics/pom.xml b/sdk/textanalytics/azure-ai-textanalytics/pom.xml index 5e394419b458e..ff89311104626 100644 --- a/sdk/textanalytics/azure-ai-textanalytics/pom.xml +++ b/sdk/textanalytics/azure-ai-textanalytics/pom.xml @@ -70,19 +70,19 @@ org.junit.jupiter junit-jupiter-api - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-engine - 5.6.3 + 5.7.1 test org.junit.jupiter junit-jupiter-params - 5.6.3 + 5.7.1 test @@ -94,7 +94,7 @@ org.mockito mockito-core - 3.3.3 + 3.6.0 test