From 1be0b1ec6c1b3ab056e965c55b707fd3c0996c2b Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Mon, 15 Jun 2020 17:25:12 +0800 Subject: [PATCH 01/13] Update spring-boot related modules' version to 2.3.3-beta.1. --- eng/jacoco-test-coverage/pom.xml | 18 +++---- eng/versioning/version_client.txt | 54 ++++++++++--------- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../azure-spring-boot-sample-cosmosdb/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../CHANGELOG.md | 2 +- .../pom.xml | 6 +-- .../CHANGELOG.md | 2 +- .../README.md | 2 +- .../pom.xml | 6 +-- .../CHANGELOG.md | 2 +- .../README.md | 2 +- .../pom.xml | 6 +-- .../CHANGELOG.md | 2 +- .../README.md | 2 +- .../pom.xml | 6 +-- .../CHANGELOG.md | 2 +- .../README.md | 2 +- .../pom.xml | 6 +-- .../CHANGELOG.md | 2 +- .../README.md | 2 +- .../azure-spring-boot-starter-metrics/pom.xml | 6 +-- .../CHANGELOG.md | 2 +- .../README.md | 2 +- .../pom.xml | 6 +-- .../azure-spring-boot-starter/CHANGELOG.md | 2 +- sdk/spring/azure-spring-boot-starter/pom.xml | 6 +-- .../azure-spring-boot-test-aad/pom.xml | 6 +-- ...ppRoleStatelessAuthenticationFilterIT.java | 1 - .../pom.xml | 2 +- .../azure-spring-boot-test-core/pom.xml | 4 +- .../azure-spring-boot-test-cosmosdb/pom.xml | 6 +-- .../azure-spring-boot-test-keyvault/pom.xml | 6 +-- sdk/spring/azure-spring-boot-tests/pom.xml | 2 +- sdk/spring/azure-spring-boot/CHANGELOG.md | 2 +- sdk/spring/azure-spring-boot/pom.xml | 2 +- 43 files changed, 102 insertions(+), 97 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 492a91fdc506..9f4747fffefe 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -206,47 +206,47 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-active-directory-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-keyvault-secrets-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-spring-boot-metrics-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-servicebus-jms-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-active-directory-b2c-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-cosmosdb-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-data-gremlin-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index e711a94b69eb..b0e010be6d85 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -1,12 +1,10 @@ # Format; # :;dependency-version;current-version -com.azure:azure-sdk-all;1.0.0;1.0.0 -com.azure:azure-sdk-parent;1.6.0;1.6.0 -com.azure:azure-client-sdk-parent;1.7.0;1.7.0 +com.azure:azure-active-directory-spring-boot-starter;2.3.2;2.3.3-beta.1 com.azure:azure-ai-formrecognizer;1.0.0-beta.3;1.0.0-beta.4 com.azure:azure-ai-textanalytics;1.0.0;1.1.0-beta.1 -com.azure:azure-core;1.5.1;1.6.0-beta.1 +com.azure:azure-client-sdk-parent;1.7.0;1.7.0 com.azure:azure-core-amqp;1.2.0;1.3.0-beta.1 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core-http-netty;1.5.2;1.6.0-beta.1 @@ -16,46 +14,54 @@ com.azure:azure-core-serializer-json-gson;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-core-serializer-json-jackson;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-core-test;1.3.0;1.4.0-beta.1 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.5;1.0.0-beta.6 -com.azure:azure-cosmos;4.0.1;4.1.0-beta.1 -com.azure:azure-cosmos-examples;4.0.1-beta.1;4.0.1-beta.1 +com.azure:azure-core;1.5.1;1.6.0-beta.1 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 +com.azure:azure-cosmos-examples;4.0.1-beta.1;4.0.1-beta.1 +com.azure:azure-cosmos;4.0.1;4.1.0-beta.1 +com.azure:azure-cosmosdb-spring-boot-starter;2.3.2;2.3.3-beta.1 com.azure:azure-data-appconfiguration;1.1.2;1.2.0-beta.1 -com.azure:azure-data-schemaregistry;1.0.0-beta.1;1.0.0-beta.2 +com.azure:azure-data-gremlin-spring-boot-starter;2.3.2;2.3.3-beta.1 com.azure:azure-data-schemaregistry-avro;1.0.0-beta.1;1.0.0-beta.2 +com.azure:azure-data-schemaregistry;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-data-tables;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-identity;1.0.7;1.1.0-beta.6 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-messaging-eventhubs;5.1.1;5.2.0-beta.1 +com.azure:azure-identity;1.0.7;1.1.0-beta.6 +com.azure:azure-keyvault-secrets-spring-boot-starter;2.3.2;2.3.3-beta.1 com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.1.1;1.2.0-beta.1 +com.azure:azure-messaging-eventhubs;5.1.1;5.2.0-beta.1 com.azure:azure-messaging-servicebus;7.0.0-beta.3;7.0.0-beta.4 +com.azure:azure-sdk-all;1.0.0;1.0.0 +com.azure:azure-sdk-parent;1.6.0;1.6.0 +com.azure:azure-sdk-template;1.0.4-beta.19;1.0.4-beta.20 com.azure:azure-search-documents;1.0.0-beta.4;1.0.0-beta.5 com.azure:azure-security-keyvault-certificates;4.1.0-beta.3;4.1.0-beta.4 com.azure:azure-security-keyvault-keys;4.2.0-beta.4;4.2.0-beta.5 com.azure:azure-security-keyvault-secrets;4.2.0-beta.3;4.2.0-beta.4 -com.azure:azure-sdk-template;1.0.4-beta.19;1.0.4-beta.20 -com.azure:azure-storage-blob;12.7.0;12.8.0-beta.1 +com.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1 com.azure:azure-storage-blob-batch;12.5.2;12.6.0-beta.1 com.azure:azure-storage-blob-cryptography;12.7.0;12.8.0-beta.1 com.azure:azure-storage-blob-nio;12.0.0-beta.1;12.0.0-beta.1 +com.azure:azure-storage-blob;12.7.0;12.8.0-beta.1 com.azure:azure-storage-common;12.7.0;12.8.0-beta.1 -com.azure:azure-storage-file-share;12.5.0;12.6.0-beta.1 com.azure:azure-storage-file-datalake;12.1.2;12.2.0-beta.1 +com.azure:azure-storage-file-share;12.5.0;12.6.0-beta.1 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-storage-queue;12.5.2;12.6.0-beta.1 -com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1 -com.microsoft.azure:azure-spring-boot;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-active-directory-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-spring-boot-metrics-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-spring-boot-tests;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-spring-boot-test-core;2.2.4;2.2.5-beta.1 +com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1 +com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-active-directory-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-bom;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-test-core;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-tests;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot;2.3.2;2.3.3-beta.1 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current 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 4e5727282e12..ec15c4c34ddc 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 @@ -21,7 +21,7 @@ com.microsoft.azure azure-active-directory-b2c-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml index 0534c1a707ff..cbd0d92c837d 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml @@ -21,7 +21,7 @@ com.microsoft.azure azure-active-directory-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml index b6dbbfcd8a32..292780bbe355 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml @@ -21,7 +21,7 @@ com.microsoft.azure azure-active-directory-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml index 2806115c9792..1a82a9d4b10d 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml @@ -22,7 +22,7 @@ com.microsoft.azure azure-active-directory-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml index 1efff6e3fbd2..042fec4e4c15 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml @@ -21,7 +21,7 @@ com.microsoft.azure azure-active-directory-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 org.springframework.boot diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml index db0a2f558d95..e9b6195ab0ae 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml @@ -21,7 +21,7 @@ com.microsoft.azure azure-cosmosdb-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 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 8e672d61bd7b..fdf7507fa6e9 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 @@ -22,7 +22,7 @@ com.microsoft.azure azure-data-gremlin-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 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 7d540b2f951a..2878f8bdc0b8 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 @@ -22,7 +22,7 @@ com.microsoft.azure azure-keyvault-secrets-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 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 467ffe1b58a8..b6854172191e 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 @@ -27,7 +27,7 @@ com.microsoft.azure azure-servicebus-jms-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 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 6362c917d56c..ea0698400c45 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 @@ -27,7 +27,7 @@ com.microsoft.azure azure-servicebus-jms-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 diff --git a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) 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 9e6eb17edab3..f3242d763fa4 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 @@ -13,7 +13,7 @@ com.microsoft.azure azure-active-directory-b2c-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 Azure AD B2C Spring Security Integration Spring Boot Starter Spring Boot Starter for Azure AD B2C and Spring Security Integration @@ -34,7 +34,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 @@ -98,7 +98,7 @@ - com.microsoft.azure:azure-spring-boot:[2.2.5-beta.1] + com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] javax.validation:validation-api:[2.0.1.Final] org.springframework:spring-web:[5.2.5.RELEASE] org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/README.md b/sdk/spring/azure-spring-boot-starter-active-directory/README.md index c3df84339277..9644843b0f1e 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/README.md +++ b/sdk/spring/azure-spring-boot-starter-active-directory/README.md @@ -30,7 +30,7 @@ If you are using Maven, add the following dependency. com.azure azure-active-directory-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 ``` [//]: # "{x-version-update-end}" 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 3d104750108f..2c4e1d689a19 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml @@ -13,7 +13,7 @@ com.microsoft.azure azure-active-directory-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 Azure AD Spring Security Integration Spring Boot Starter Spring Boot Starter for Azure AD and Spring Security Integration @@ -33,7 +33,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 org.springframework @@ -82,7 +82,7 @@ - com.microsoft.azure:azure-spring-boot:[2.2.5-beta.1] --> + com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] --> com.fasterxml.jackson.core:jackson-databind:[2.10.1] com.microsoft.azure:msal4j:[1.3.0] com.nimbusds:nimbus-jose-jwt:[7.9] diff --git a/sdk/spring/azure-spring-boot-starter-cosmosdb/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-cosmosdb/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot-starter-cosmosdb/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-cosmosdb/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) diff --git a/sdk/spring/azure-spring-boot-starter-cosmosdb/README.md b/sdk/spring/azure-spring-boot-starter-cosmosdb/README.md index 37b71d43fa99..c9d20f8580b9 100644 --- a/sdk/spring/azure-spring-boot-starter-cosmosdb/README.md +++ b/sdk/spring/azure-spring-boot-starter-cosmosdb/README.md @@ -43,7 +43,7 @@ If you are using Maven, add the following dependency. com.azure azure-cosmosdb-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml b/sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml index b5a290d9f3d2..9684f932fdaf 100644 --- a/sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml @@ -13,7 +13,7 @@ com.microsoft.azure azure-cosmosdb-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 Azure Cosmos DB Spring Boot Starter Spring Boot Starter for Azure Document DB service @@ -33,7 +33,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure @@ -52,7 +52,7 @@ - com.microsoft.azure:azure-spring-boot:[2.2.5-beta.1] + com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] com.microsoft.azure:spring-data-cosmosdb:[2.2.3.FIX1] org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter-data-gremlin/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-data-gremlin/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot-starter-data-gremlin/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-data-gremlin/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) diff --git a/sdk/spring/azure-spring-boot-starter-data-gremlin/README.md b/sdk/spring/azure-spring-boot-starter-data-gremlin/README.md index 53f13c8f0dab..aea93d36807c 100644 --- a/sdk/spring/azure-spring-boot-starter-data-gremlin/README.md +++ b/sdk/spring/azure-spring-boot-starter-data-gremlin/README.md @@ -19,7 +19,7 @@ Please refer to [sample project here](../azure-spring-boot-samples/azure-spring- com.azure azure-data-gremlin-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 ``` [//]: # ({x-version-update-end}) 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 e1a87c5e0eca..4e5a0a4b35e1 100644 --- a/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-data-gremlin/pom.xml @@ -12,7 +12,7 @@ com.microsoft.azure azure-data-gremlin-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 Spring Data Gremlin Boot Starter Spring Boot Starter for Spring Data Gremlin @@ -32,7 +32,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.spring.data.gremlin @@ -56,7 +56,7 @@ - com.microsoft.azure:azure-spring-boot:[2.2.5-beta.1] + com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] com.fasterxml.jackson.core:jackson-core:[2.10.1] com.microsoft.spring.data.gremlin:spring-data-gremlin:[2.2.3] org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/README.md b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/README.md index 5d836ae8f86f..d6835c5eb2a2 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/README.md +++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/README.md @@ -14,7 +14,7 @@ If you are using Maven, add the following dependency. com.azure azure-keyvault-secrets-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 ``` [//]: # ({x-version-update-end}) 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 628956c58889..c1091bb70dce 100644 --- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml @@ -13,7 +13,7 @@ com.microsoft.azure azure-keyvault-secrets-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 Azure Key Vault Secrets Spring Boot Starter Spring Boot Starter supporting Azure Key Vault Secrets as PropertySource @@ -33,7 +33,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 @@ -46,7 +46,7 @@ - com.microsoft.azure:azure-spring-boot:[2.2.5-beta.1] + com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter-metrics/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-metrics/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot-starter-metrics/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-metrics/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) diff --git a/sdk/spring/azure-spring-boot-starter-metrics/README.md b/sdk/spring/azure-spring-boot-starter-metrics/README.md index ce27c5a6fd36..c13b3c58cfb1 100644 --- a/sdk/spring/azure-spring-boot-starter-metrics/README.md +++ b/sdk/spring/azure-spring-boot-starter-metrics/README.md @@ -24,7 +24,7 @@ If you are using Maven, add the following dependency. com.microsoft.azure azure-spring-boot-metrics-starter - 2.2.5-beta.1 + 2.3.3-beta.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/spring/azure-spring-boot-starter-metrics/pom.xml b/sdk/spring/azure-spring-boot-starter-metrics/pom.xml index 527ebeda8c12..a060a5645db9 100644 --- a/sdk/spring/azure-spring-boot-starter-metrics/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-metrics/pom.xml @@ -13,7 +13,7 @@ com.microsoft.azure azure-spring-boot-metrics-starter - 2.2.5-beta.1 + 2.3.3-beta.1 Azure Metrics Spring Boot Starter Spring Boot Starter for Micrometer Metrics @@ -33,7 +33,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 io.micrometer @@ -57,7 +57,7 @@ - com.microsoft.azure:azure-spring-boot:[2.2.5-beta.1] + com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] io.micrometer:micrometer-core:[1.3.0] io.micrometer:micrometer-registry-azure-monitor:[1.3.0] org.springframework.boot:spring-boot-actuator-autoconfigure:[2.2.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) diff --git a/sdk/spring/azure-spring-boot-starter-servicebus-jms/README.md b/sdk/spring/azure-spring-boot-starter-servicebus-jms/README.md index 81fcfffd858e..c313a3d49379 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/README.md +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/README.md @@ -24,7 +24,7 @@ Add the following dependency to your project: com.microsoft.azure azure-servicebus-jms-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 ``` [//]: # ({x-version-update-end}) 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 b5ae13f87fbd..e3f02afe2d4c 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml @@ -13,7 +13,7 @@ com.microsoft.azure azure-servicebus-jms-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 Azure Service Bus JMS Spring Boot Starter Spring Boot Starter for Azure Service Bus JMS @@ -23,7 +23,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 @@ -51,7 +51,7 @@ com.microsoft.azure:azure-servicebus-jms:[0.0.2] - com.microsoft.azure:azure-spring-boot:[2.2.5-beta.1] + com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] org.springframework:spring-jms:[5.2.5.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot-starter/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot-starter/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) diff --git a/sdk/spring/azure-spring-boot-starter/pom.xml b/sdk/spring/azure-spring-boot-starter/pom.xml index 4660eefef579..43cb4b02eec9 100644 --- a/sdk/spring/azure-spring-boot-starter/pom.xml +++ b/sdk/spring/azure-spring-boot-starter/pom.xml @@ -13,7 +13,7 @@ com.microsoft.azure azure-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 Azure Spring Boot Starter Core starter, including auto-configuration support @@ -33,7 +33,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 @@ -47,7 +47,7 @@ - com.microsoft.azure:azure-spring-boot:[2.2.5-beta.1] + com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml index fac57c9a0259..c212ce5189f2 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml @@ -5,7 +5,7 @@ azure-spring-boot-tests com.microsoft.azure - 2.2.5-beta.1 + 2.3.3-beta.1 ../pom.xml 4.0.0 @@ -16,12 +16,12 @@ com.microsoft.azure azure-spring-boot-test-core - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-active-directory-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 org.springframework.boot diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/keyvault/approle/AADAppRoleStatelessAuthenticationFilterIT.java b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/keyvault/approle/AADAppRoleStatelessAuthenticationFilterIT.java index 1de20f0db386..b3edd5c5f3a1 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/keyvault/approle/AADAppRoleStatelessAuthenticationFilterIT.java +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/src/test/java/com/microsoft/azure/test/keyvault/approle/AADAppRoleStatelessAuthenticationFilterIT.java @@ -7,7 +7,6 @@ import com.microsoft.azure.test.utils.AppRunner; import com.microsoft.azure.test.oauth.OAuthResponse; import com.microsoft.azure.test.oauth.OAuthUtils; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml index 7a351bfbfea9..5b97bca9818b 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml @@ -39,7 +39,7 @@ com.microsoft.azure azure-keyvault-secrets-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml index c37124956bb7..576a935db16d 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml @@ -5,7 +5,7 @@ azure-spring-boot-tests com.microsoft.azure - 2.2.5-beta.1 + 2.3.3-beta.1 ../pom.xml 4.0.0 @@ -79,7 +79,7 @@ com.microsoft.azure azure-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml index 5bedcfce3df2..c54acdbc7b64 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml @@ -5,7 +5,7 @@ azure-spring-boot-tests com.microsoft.azure - 2.2.5-beta.1 + 2.3.3-beta.1 ../pom.xml 4.0.0 @@ -16,12 +16,12 @@ com.microsoft.azure azure-cosmosdb-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-spring-boot-test-core - 2.2.5-beta.1 + 2.3.3-beta.1 org.springframework.boot diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml index 44c532a5731d..fadf921a1df2 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml @@ -5,7 +5,7 @@ azure-spring-boot-tests com.microsoft.azure - 2.2.5-beta.1 + 2.3.3-beta.1 ../pom.xml 4.0.0 @@ -22,12 +22,12 @@ com.microsoft.azure azure-keyvault-secrets-spring-boot-starter - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure azure-spring-boot-test-core - 2.2.5-beta.1 + 2.3.3-beta.1 com.microsoft.azure diff --git a/sdk/spring/azure-spring-boot-tests/pom.xml b/sdk/spring/azure-spring-boot-tests/pom.xml index 2e12e3085ee1..2647b21503a5 100644 --- a/sdk/spring/azure-spring-boot-tests/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/pom.xml @@ -14,7 +14,7 @@ com.microsoft.azure azure-spring-boot-tests - 2.2.5-beta.1 + 2.3.3-beta.1 pom Azure Spring Boot Tests diff --git a/sdk/spring/azure-spring-boot/CHANGELOG.md b/sdk/spring/azure-spring-boot/CHANGELOG.md index d51e263177a9..a942fd9a9b9b 100644 --- a/sdk/spring/azure-spring-boot/CHANGELOG.md +++ b/sdk/spring/azure-spring-boot/CHANGELOG.md @@ -1,3 +1,3 @@ # Release History -## 2.2.5-beta.1 (Unreleased) +## 2.3.3-beta.1 (Unreleased) diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml index d60f85736594..5089fec46c11 100644 --- a/sdk/spring/azure-spring-boot/pom.xml +++ b/sdk/spring/azure-spring-boot/pom.xml @@ -13,7 +13,7 @@ com.microsoft.azure azure-spring-boot - 2.2.5-beta.1 + 2.3.3-beta.1 jar Azure Spring Boot AutoConfigure From 5dad38feef0b0ec5ef141efc649286e5d7d4e7a5 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 16 Jun 2020 13:24:21 +0800 Subject: [PATCH 02/13] Add the content which help to update version. --- sdk/spring/azure-spring-boot-samples/pom.xml | 2 +- .../azure-spring-boot-test-core/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/spring/azure-spring-boot-samples/pom.xml b/sdk/spring/azure-spring-boot-samples/pom.xml index d5d0035be75e..fea29512ffa2 100644 --- a/sdk/spring/azure-spring-boot-samples/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.RELEASE + 2.2.0.RELEASE diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml index 576a935db16d..fc865f9486d1 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml @@ -103,8 +103,8 @@ org.apache.maven.wagon:wagon-provider-api:[3.3.4] org.eclipse.aether:aether-connector-basic:[1.1.0] org.eclipse.aether:aether-transport-wagon:[1.1.0] - org.springframework.boot:spring-boot:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-web:[2.2.0.RELEASE] + org.springframework.boot:spring-boot:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter-web:[2.2.0.RELEASE] org.springframework:spring-context:[5.2.0.RELEASE] From cce9a945545f7ed3edfb2fc446319fd3e1536e5d Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 16 Jun 2020 13:38:48 +0800 Subject: [PATCH 03/13] Change the order of spring-boot related dependencies. --- eng/versioning/external_dependencies.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 16d2e7a1af90..72425b02fc80 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -61,15 +61,19 @@ org.powermock:powermock-api-mockito2;2.0.2 org.powermock:powermock-module-junit4;2.0.2 org.slf4j:slf4j-api;1.7.28 org.slf4j:slf4j-simple;1.7.25 + +## Spring boot dependency versions org.springframework.boot:spring-boot-actuator-autoconfigure;2.2.0.RELEASE -org.springframework.boot:spring-boot-autoconfigure;2.2.0.RELEASE org.springframework.boot:spring-boot-autoconfigure-processor;2.2.0.RELEASE +org.springframework.boot:spring-boot-autoconfigure;2.2.0.RELEASE org.springframework.boot:spring-boot-configuration-processor;2.2.0.RELEASE org.springframework.boot:spring-boot-dependencies;2.2.0.RELEASE -org.springframework.boot:spring-boot-starter;2.2.0.RELEASE org.springframework.boot:spring-boot-starter-test;2.2.0.RELEASE org.springframework.boot:spring-boot-starter-validation;2.2.0.RELEASE org.springframework.boot:spring-boot-starter-web;2.2.0.RELEASE +org.springframework.boot:spring-boot-starter;2.2.0.RELEASE +org.springframework.boot:spring-boot;2.2.0.RELEASE + org.springframework.security:spring-security-config;5.2.0.RELEASE org.springframework.security:spring-security-core;5.2.0.RELEASE org.springframework.security:spring-security-web;5.2.0.RELEASE @@ -135,7 +139,6 @@ org.junit.platform:junit-platform-testkit;1.6.2 org.junit.vintage:junit-vintage-engine;5.6.2 org.openjdk.jmh:jmh-core;1.22 org.openjdk.jmh:jmh-generator-annprocess;1.22 -org.springframework.boot:spring-boot;2.2.0.RELEASE org.springframework:spring-context;5.2.0.RELEASE org.spockframework:spock-core;1.3-groovy-2.5 org.testng:testng;6.14.3 From 7c4554ae3183d2d35cadf0a505b7f358efd98b76 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 16 Jun 2020 13:39:46 +0800 Subject: [PATCH 04/13] Update spring-boot version to 2.3.0 --- eng/versioning/external_dependencies.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index 72425b02fc80..a64b56d205fa 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -63,16 +63,16 @@ org.slf4j:slf4j-api;1.7.28 org.slf4j:slf4j-simple;1.7.25 ## Spring boot dependency versions -org.springframework.boot:spring-boot-actuator-autoconfigure;2.2.0.RELEASE -org.springframework.boot:spring-boot-autoconfigure-processor;2.2.0.RELEASE -org.springframework.boot:spring-boot-autoconfigure;2.2.0.RELEASE -org.springframework.boot:spring-boot-configuration-processor;2.2.0.RELEASE -org.springframework.boot:spring-boot-dependencies;2.2.0.RELEASE -org.springframework.boot:spring-boot-starter-test;2.2.0.RELEASE -org.springframework.boot:spring-boot-starter-validation;2.2.0.RELEASE -org.springframework.boot:spring-boot-starter-web;2.2.0.RELEASE -org.springframework.boot:spring-boot-starter;2.2.0.RELEASE -org.springframework.boot:spring-boot;2.2.0.RELEASE +org.springframework.boot:spring-boot-actuator-autoconfigure;2.3.0.RELEASE +org.springframework.boot:spring-boot-autoconfigure-processor;2.3.0.RELEASE +org.springframework.boot:spring-boot-autoconfigure;2.3.0.RELEASE +org.springframework.boot:spring-boot-configuration-processor;2.3.0.RELEASE +org.springframework.boot:spring-boot-dependencies;2.3.0.RELEASE +org.springframework.boot:spring-boot-starter-test;2.3.0.RELEASE +org.springframework.boot:spring-boot-starter-validation;2.3.0.RELEASE +org.springframework.boot:spring-boot-starter-web;2.3.0.RELEASE +org.springframework.boot:spring-boot-starter;2.3.0.RELEASE +org.springframework.boot:spring-boot;2.3.0.RELEASE org.springframework.security:spring-security-config;5.2.0.RELEASE org.springframework.security:spring-security-core;5.2.0.RELEASE From 2c107c97e8521d130573df4a17061fdfad290315 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 16 Jun 2020 13:41:05 +0800 Subject: [PATCH 05/13] Update version by update_version.py --- .../pom.xml | 8 +++---- .../pom.xml | 8 +++---- .../pom.xml | 8 +++---- .../pom.xml | 8 +++---- .../pom.xml | 8 +++---- .../azure-spring-boot-starter-metrics/pom.xml | 12 +++++----- sdk/spring/azure-spring-boot-starter/pom.xml | 8 +++---- .../azure-spring-boot-test-aad/pom.xml | 4 ++-- .../azure-spring-boot-test-core/pom.xml | 8 +++---- .../azure-spring-boot-test-cosmosdb/pom.xml | 4 ++-- .../azure-spring-boot-test-keyvault/pom.xml | 2 +- sdk/spring/azure-spring-boot/pom.xml | 24 +++++++++---------- 12 files changed, 51 insertions(+), 51 deletions(-) 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 f3242d763fa4..f7e9f1b78950 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.2.0.RELEASE + 2.3.0.RELEASE org.springframework.boot spring-boot-starter-validation - 2.2.0.RELEASE + 2.3.0.RELEASE @@ -101,8 +101,8 @@ com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] javax.validation:validation-api:[2.0.1.Final] org.springframework:spring-web:[5.2.5.RELEASE] - org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] org.springframework.security:spring-security-config:[5.2.0.RELEASE] org.springframework.security:spring-security-core:[5.2.0.RELEASE] org.springframework.security:spring-security-oauth2-client:[5.2.0.RELEASE] 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 2c4e1d689a19..f6c60ed6881f 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml @@ -23,12 +23,12 @@ org.springframework.boot spring-boot-starter - 2.2.0.RELEASE + 2.3.0.RELEASE org.springframework.boot spring-boot-starter-validation - 2.2.0.RELEASE + 2.3.0.RELEASE com.microsoft.azure @@ -87,8 +87,8 @@ com.microsoft.azure:msal4j:[1.3.0] com.nimbusds:nimbus-jose-jwt:[7.9] org.springframework:spring-web:[5.2.5.RELEASE] - org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] org.springframework.security:spring-security-config:[5.2.0.RELEASE] org.springframework.security:spring-security-core:[5.2.0.RELEASE] org.springframework.security:spring-security-web:[5.2.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml b/sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml index 9684f932fdaf..009481b70cc7 100644 --- a/sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-cosmosdb/pom.xml @@ -23,12 +23,12 @@ org.springframework.boot spring-boot-starter - 2.2.0.RELEASE + 2.3.0.RELEASE org.springframework.boot spring-boot-starter-validation - 2.2.0.RELEASE + 2.3.0.RELEASE com.microsoft.azure @@ -54,8 +54,8 @@ com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] com.microsoft.azure:spring-data-cosmosdb:[2.2.3.FIX1] - org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] 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 4e5a0a4b35e1..ec9a83c55118 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.2.0.RELEASE + 2.3.0.RELEASE org.springframework.boot spring-boot-starter-validation - 2.2.0.RELEASE + 2.3.0.RELEASE com.microsoft.azure @@ -59,8 +59,8 @@ com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] com.fasterxml.jackson.core:jackson-core:[2.10.1] com.microsoft.spring.data.gremlin:spring-data-gremlin:[2.2.3] - org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] 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 c1091bb70dce..53c97383bd0d 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.2.0.RELEASE + 2.3.0.RELEASE org.springframework.boot spring-boot-starter-validation - 2.2.0.RELEASE + 2.3.0.RELEASE com.microsoft.azure @@ -47,8 +47,8 @@ com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] - org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter-metrics/pom.xml b/sdk/spring/azure-spring-boot-starter-metrics/pom.xml index a060a5645db9..325298cb0163 100644 --- a/sdk/spring/azure-spring-boot-starter-metrics/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-metrics/pom.xml @@ -23,12 +23,12 @@ org.springframework.boot spring-boot-starter - 2.2.0.RELEASE + 2.3.0.RELEASE org.springframework.boot spring-boot-starter-validation - 2.2.0.RELEASE + 2.3.0.RELEASE com.microsoft.azure @@ -43,7 +43,7 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 2.2.0.RELEASE + 2.3.0.RELEASE @@ -60,9 +60,9 @@ com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] io.micrometer:micrometer-core:[1.3.0] io.micrometer:micrometer-registry-azure-monitor:[1.3.0] - org.springframework.boot:spring-boot-actuator-autoconfigure:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-actuator-autoconfigure:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-starter/pom.xml b/sdk/spring/azure-spring-boot-starter/pom.xml index 43cb4b02eec9..b4fbdc1c3d3b 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.2.0.RELEASE + 2.3.0.RELEASE org.springframework.boot spring-boot-starter-validation - 2.2.0.RELEASE + 2.3.0.RELEASE com.microsoft.azure @@ -48,8 +48,8 @@ com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] - org.springframework.boot:spring-boot-starter:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-validation:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml index c212ce5189f2..4685339f2b04 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-aad/pom.xml @@ -26,7 +26,7 @@ org.springframework.boot spring-boot-starter-test - 2.2.0.RELEASE + 2.3.0.RELEASE test @@ -42,7 +42,7 @@ com.microsoft.azure:* - org.springframework.boot:spring-boot-starter-web:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml index fc865f9486d1..67541630bb16 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml @@ -17,7 +17,7 @@ org.springframework.boot spring-boot - 2.2.0.RELEASE + 2.3.0.RELEASE org.springframework @@ -27,7 +27,7 @@ org.springframework.boot spring-boot-starter-web - 2.2.0.RELEASE + 2.3.0.RELEASE org.apache.maven @@ -103,8 +103,8 @@ org.apache.maven.wagon:wagon-provider-api:[3.3.4] org.eclipse.aether:aether-connector-basic:[1.1.0] org.eclipse.aether:aether-transport-wagon:[1.1.0] - org.springframework.boot:spring-boot:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-web:[2.2.0.RELEASE] + org.springframework.boot:spring-boot:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE] org.springframework:spring-context:[5.2.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml index c54acdbc7b64..ca98c2dde5d3 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-cosmosdb/pom.xml @@ -26,7 +26,7 @@ org.springframework.boot spring-boot-starter-test - 2.2.0.RELEASE + 2.3.0.RELEASE test @@ -43,7 +43,7 @@ com.azure:* com.microsoft.azure:* - org.springframework.boot:spring-boot-starter-web:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE] diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml index fadf921a1df2..706786536180 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-keyvault/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-test - 2.2.0.RELEASE + 2.3.0.RELEASE test diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml index 5089fec46c11..ed1c80995dcc 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.2.0.RELEASE + 2.3.0.RELEASE @@ -47,7 +47,7 @@ org.springframework.boot spring-boot-configuration-processor - 2.2.0.RELEASE + 2.3.0.RELEASE true @@ -137,7 +137,7 @@ org.springframework.boot spring-boot-actuator-autoconfigure - 2.2.0.RELEASE + 2.3.0.RELEASE true @@ -180,7 +180,7 @@ org.springframework.boot spring-boot-autoconfigure-processor - 2.2.0.RELEASE + 2.3.0.RELEASE true @@ -218,7 +218,7 @@ org.springframework.boot spring-boot-starter-test - 2.2.0.RELEASE + 2.3.0.RELEASE test @@ -230,7 +230,7 @@ org.springframework.boot spring-boot-starter-web - 2.2.0.RELEASE + 2.3.0.RELEASE test @@ -281,12 +281,12 @@ org.hibernate.validator:hibernate-validator:[6.0.17.Final] org.springframework:spring-web:[5.2.5.RELEASE] org.springframework:spring-jms:[5.2.5.RELEASE] - org.springframework.boot:spring-boot-actuator-autoconfigure:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-autoconfigure-processor:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-autoconfigure:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-configuration-processor:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-test:[2.2.0.RELEASE] - org.springframework.boot:spring-boot-starter-web:[2.2.0.RELEASE] + org.springframework.boot:spring-boot-actuator-autoconfigure:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-autoconfigure-processor:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-autoconfigure:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-configuration-processor:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-test:[2.3.0.RELEASE] + org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE] org.springframework.security:spring-security-config:[5.2.0.RELEASE] org.springframework.security:spring-security-core:[5.2.0.RELEASE] org.springframework.security:spring-security-oauth2-client:[5.2.0.RELEASE] From 0d861bd9e5c357bb0175eee196d414601ccac07b Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 16 Jun 2020 13:45:35 +0800 Subject: [PATCH 06/13] Add spring-boot-starter-parent version. --- eng/versioning/external_dependencies.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index a64b56d205fa..d2d5e4ba0644 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -73,6 +73,7 @@ org.springframework.boot:spring-boot-starter-validation;2.3.0.RELEASE org.springframework.boot:spring-boot-starter-web;2.3.0.RELEASE org.springframework.boot:spring-boot-starter;2.3.0.RELEASE org.springframework.boot:spring-boot;2.3.0.RELEASE +org.springframework.boot:spring-boot-starter-parent;2.3.0.RELEASE org.springframework.security:spring-security-config;5.2.0.RELEASE org.springframework.security:spring-security-core;5.2.0.RELEASE From fa6b5b87c5c310523c03a0b97ea9db2665b5f803 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 16 Jun 2020 13:47:06 +0800 Subject: [PATCH 07/13] Update version by update_version.py --- sdk/spring/azure-spring-boot-samples/pom.xml | 2 +- .../azure-spring-boot-test-application/pom.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/spring/azure-spring-boot-samples/pom.xml b/sdk/spring/azure-spring-boot-samples/pom.xml index fea29512ffa2..f775f17c7d3d 100644 --- a/sdk/spring/azure-spring-boot-samples/pom.xml +++ b/sdk/spring/azure-spring-boot-samples/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.RELEASE + 2.3.0.RELEASE diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml index 5b97bca9818b..4f69991ee70c 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.RELEASE + 2.3.0.RELEASE 4.0.0 @@ -26,13 +26,13 @@ org.springframework.boot spring-boot-starter-web - 2.2.0.RELEASE + 2.3.0.RELEASE org.springframework.boot spring-boot-starter-test - 2.2.0.RELEASE + 2.3.0.RELEASE test @@ -45,7 +45,7 @@ com.alibaba fastjson - ${fastjson.version} + 1.2.61 From 71ce297d3959a744e5c4ac6c9c8819e9387c23e6 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 16 Jun 2020 13:47:41 +0800 Subject: [PATCH 08/13] Remove unused property in pom. --- .../azure-spring-boot-test-application/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml index 4f69991ee70c..0027764d24c2 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-application/pom.xml @@ -19,7 +19,6 @@ 1.8 UTF-8 UTF-8 - 1.2.61 From c8d840bdce3b42713efd1f5dc44b07bae6651d67 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Tue, 16 Jun 2020 13:56:00 +0800 Subject: [PATCH 09/13] Fix error caused by spring-boot version up. --- .../azure/jms/queue/ServiceBusJMSQueueApplicationIT.java | 6 +++--- .../azure/jms/topic/ServiceBusJMSTopicApplicationIT.java | 6 +++--- .../autoconfigure/metrics/AzureMonitorPropertiesTest.java | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/src/test/java/com/microsoft/azure/jms/queue/ServiceBusJMSQueueApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/src/test/java/com/microsoft/azure/jms/queue/ServiceBusJMSQueueApplicationIT.java index ba4b63c5c462..2c5b435a026a 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/src/test/java/com/microsoft/azure/jms/queue/ServiceBusJMSQueueApplicationIT.java +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/src/test/java/com/microsoft/azure/jms/queue/ServiceBusJMSQueueApplicationIT.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; @@ -31,7 +31,7 @@ public class ServiceBusJMSQueueApplicationIT { private MockMvc mvc; @Rule - public OutputCapture capture = new OutputCapture(); + public OutputCaptureRule outputCaptureRule = new OutputCaptureRule(); @Test public void testQueueSendAndReceiveMessage() throws Exception { @@ -45,7 +45,7 @@ public void testQueueSendAndReceiveMessage() throws Exception { boolean messageReceived = false; for (int i = 0; i < 100; i++) { - final String output = capture.toString(); + final String output = outputCaptureRule.toString(); if (!messageReceived && output.contains(messageReceivedLog)) { messageReceived = true; } diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/src/test/java/com/microsoft/azure/jms/topic/ServiceBusJMSTopicApplicationIT.java b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/src/test/java/com/microsoft/azure/jms/topic/ServiceBusJMSTopicApplicationIT.java index e3548b85dcef..afeb3e67636a 100644 --- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/src/test/java/com/microsoft/azure/jms/topic/ServiceBusJMSTopicApplicationIT.java +++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/src/test/java/com/microsoft/azure/jms/topic/ServiceBusJMSTopicApplicationIT.java @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.rule.OutputCapture; +import org.springframework.boot.test.system.OutputCaptureRule; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.web.servlet.MockMvc; @@ -31,7 +31,7 @@ public class ServiceBusJMSTopicApplicationIT { private MockMvc mvc; @Rule - public OutputCapture capture = new OutputCapture(); + public OutputCaptureRule outputCaptureRule = new OutputCaptureRule(); @Test public void testTopicSendAndReceiveMessage() throws Exception { @@ -45,7 +45,7 @@ public void testTopicSendAndReceiveMessage() throws Exception { boolean messageReceived = false; for (int i = 0; i < 100; i++) { - final String output = capture.toString(); + final String output = outputCaptureRule.toString(); if (!messageReceived && output.contains(messageReceivedLog)) { messageReceived = true; } diff --git a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/metrics/AzureMonitorPropertiesTest.java b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/metrics/AzureMonitorPropertiesTest.java index f180bfe3152a..351d504a442f 100644 --- a/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/metrics/AzureMonitorPropertiesTest.java +++ b/sdk/spring/azure-spring-boot/src/test/java/com/microsoft/azure/spring/autoconfigure/metrics/AzureMonitorPropertiesTest.java @@ -25,7 +25,6 @@ private void assertStepRegistryDefaultValues(StepRegistryProperties properties, assertThat(properties.isEnabled()).isEqualTo(config.enabled()); assertThat(properties.getConnectTimeout()).isEqualTo(config.connectTimeout()); assertThat(properties.getReadTimeout()).isEqualTo(config.readTimeout()); - assertThat(properties.getNumThreads()).isEqualTo(config.numThreads()); assertThat(properties.getBatchSize()).isEqualTo(config.batchSize()); } From 66ed1af24df3fdaf7680768da10c4f021a0de937 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Wed, 17 Jun 2020 11:10:31 +0800 Subject: [PATCH 10/13] Update vertion of spring framework related artifact. --- eng/versioning/external_dependencies.txt | 19 ++++++------- .../pom.xml | 28 +++++++++---------- .../pom.xml | 16 +++++------ .../pom.xml | 4 +-- .../azure-spring-boot-test-core/pom.xml | 2 +- sdk/spring/azure-spring-boot/pom.xml | 28 +++++++++---------- 6 files changed, 48 insertions(+), 49 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index d2d5e4ba0644..cf2db0239125 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -74,15 +74,14 @@ org.springframework.boot:spring-boot-starter-web;2.3.0.RELEASE org.springframework.boot:spring-boot-starter;2.3.0.RELEASE org.springframework.boot:spring-boot;2.3.0.RELEASE org.springframework.boot:spring-boot-starter-parent;2.3.0.RELEASE - -org.springframework.security:spring-security-config;5.2.0.RELEASE -org.springframework.security:spring-security-core;5.2.0.RELEASE -org.springframework.security:spring-security-web;5.2.0.RELEASE -org.springframework.security:spring-security-oauth2-client;5.2.0.RELEASE -org.springframework.security:spring-security-oauth2-core;5.2.0.RELEASE -org.springframework.security:spring-security-oauth2-jose;5.2.0.RELEASE -org.springframework:spring-web;5.2.5.RELEASE -org.springframework:spring-jms;5.2.5.RELEASE +org.springframework.security:spring-security-config;5.3.2.RELEASE +org.springframework.security:spring-security-core;5.3.2.RELEASE +org.springframework.security:spring-security-web;5.3.2.RELEASE +org.springframework.security:spring-security-oauth2-client;5.3.2.RELEASE +org.springframework.security:spring-security-oauth2-core;5.3.2.RELEASE +org.springframework.security:spring-security-oauth2-jose;5.3.2.RELEASE +org.springframework:spring-web;5.2.6.RELEASE +org.springframework:spring-jms;5.2.6.RELEASE pl.pragmatists:JUnitParams;1.1.1 ## Test dependency versions @@ -140,7 +139,7 @@ org.junit.platform:junit-platform-testkit;1.6.2 org.junit.vintage:junit-vintage-engine;5.6.2 org.openjdk.jmh:jmh-core;1.22 org.openjdk.jmh:jmh-generator-annprocess;1.22 -org.springframework:spring-context;5.2.0.RELEASE +org.springframework:spring-context;5.3.2.RELEASE org.spockframework:spock-core;1.3-groovy-2.5 org.testng:testng;6.14.3 uk.org.lidalia:slf4j-test;1.2.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 f7e9f1b78950..e3c29d91fa49 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 @@ -41,7 +41,7 @@ org.springframework spring-web - 5.2.5.RELEASE + 5.2.6.RELEASE @@ -54,37 +54,37 @@ org.springframework.security spring-security-core - 5.2.0.RELEASE + 5.3.2.RELEASE org.springframework.security spring-security-web - 5.2.0.RELEASE + 5.3.2.RELEASE org.springframework.security spring-security-config - 5.2.0.RELEASE + 5.3.2.RELEASE org.springframework.security spring-security-oauth2-core - 5.2.0.RELEASE + 5.3.2.RELEASE org.springframework.security spring-security-oauth2-client - 5.2.0.RELEASE + 5.3.2.RELEASE org.springframework.security spring-security-oauth2-jose - 5.2.0.RELEASE + 5.3.2.RELEASE @@ -100,15 +100,15 @@ com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] javax.validation:validation-api:[2.0.1.Final] - org.springframework:spring-web:[5.2.5.RELEASE] + org.springframework:spring-web:[5.2.6.RELEASE] org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] - org.springframework.security:spring-security-config:[5.2.0.RELEASE] - org.springframework.security:spring-security-core:[5.2.0.RELEASE] - org.springframework.security:spring-security-oauth2-client:[5.2.0.RELEASE] - org.springframework.security:spring-security-oauth2-core:[5.2.0.RELEASE] - org.springframework.security:spring-security-oauth2-jose:[5.2.0.RELEASE] - org.springframework.security:spring-security-web:[5.2.0.RELEASE] + org.springframework.security:spring-security-config:[5.3.2.RELEASE] + org.springframework.security:spring-security-core:[5.3.2.RELEASE] + org.springframework.security:spring-security-oauth2-client:[5.3.2.RELEASE] + org.springframework.security:spring-security-oauth2-core:[5.3.2.RELEASE] + org.springframework.security:spring-security-oauth2-jose:[5.3.2.RELEASE] + org.springframework.security:spring-security-web:[5.3.2.RELEASE] 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 f6c60ed6881f..4a7746e1303c 100644 --- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml @@ -38,22 +38,22 @@ org.springframework spring-web - 5.2.5.RELEASE + 5.2.6.RELEASE org.springframework.security spring-security-core - 5.2.0.RELEASE + 5.3.2.RELEASE org.springframework.security spring-security-web - 5.2.0.RELEASE + 5.3.2.RELEASE org.springframework.security spring-security-config - 5.2.0.RELEASE + 5.3.2.RELEASE com.microsoft.azure @@ -86,12 +86,12 @@ com.fasterxml.jackson.core:jackson-databind:[2.10.1] com.microsoft.azure:msal4j:[1.3.0] com.nimbusds:nimbus-jose-jwt:[7.9] - org.springframework:spring-web:[5.2.5.RELEASE] + org.springframework:spring-web:[5.2.6.RELEASE] org.springframework.boot:spring-boot-starter:[2.3.0.RELEASE] org.springframework.boot:spring-boot-starter-validation:[2.3.0.RELEASE] - org.springframework.security:spring-security-config:[5.2.0.RELEASE] - org.springframework.security:spring-security-core:[5.2.0.RELEASE] - org.springframework.security:spring-security-web:[5.2.0.RELEASE] + org.springframework.security:spring-security-config:[5.3.2.RELEASE] + org.springframework.security:spring-security-core:[5.3.2.RELEASE] + org.springframework.security:spring-security-web:[5.3.2.RELEASE] 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 e3f02afe2d4c..f84449b7dc7e 100644 --- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml +++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml @@ -30,7 +30,7 @@ org.springframework spring-jms - 5.2.5.RELEASE + 5.2.6.RELEASE @@ -52,7 +52,7 @@ com.microsoft.azure:azure-servicebus-jms:[0.0.2] com.microsoft.azure:azure-spring-boot:[2.3.3-beta.1] - org.springframework:spring-jms:[5.2.5.RELEASE] + org.springframework:spring-jms:[5.2.6.RELEASE] diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml index 67541630bb16..c8cc6cc58dec 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml @@ -22,7 +22,7 @@ org.springframework spring-context - 5.2.0.RELEASE + 5.3.2.RELEASE org.springframework.boot diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml index ed1c80995dcc..6f27be37e83b 100644 --- a/sdk/spring/azure-spring-boot/pom.xml +++ b/sdk/spring/azure-spring-boot/pom.xml @@ -40,7 +40,7 @@ org.springframework spring-web - 5.2.5.RELEASE + 5.2.6.RELEASE true @@ -67,31 +67,31 @@ org.springframework.security spring-security-core - 5.2.0.RELEASE + 5.3.2.RELEASE true org.springframework.security spring-security-web - 5.2.0.RELEASE + 5.3.2.RELEASE true org.springframework.security spring-security-oauth2-client - 5.2.0.RELEASE + 5.3.2.RELEASE true org.springframework.security spring-security-oauth2-jose - 5.2.0.RELEASE + 5.3.2.RELEASE true org.springframework.security spring-security-config - 5.2.0.RELEASE + 5.3.2.RELEASE true @@ -145,7 +145,7 @@ org.springframework spring-jms - 5.2.5.RELEASE + 5.2.6.RELEASE true @@ -279,19 +279,19 @@ javax.validation:validation-api:[2.0.1.Final] org.slf4j:slf4j-api:[1.7.28] org.hibernate.validator:hibernate-validator:[6.0.17.Final] - org.springframework:spring-web:[5.2.5.RELEASE] - org.springframework:spring-jms:[5.2.5.RELEASE] + org.springframework:spring-web:[5.2.6.RELEASE] + org.springframework:spring-jms:[5.2.6.RELEASE] org.springframework.boot:spring-boot-actuator-autoconfigure:[2.3.0.RELEASE] org.springframework.boot:spring-boot-autoconfigure-processor:[2.3.0.RELEASE] org.springframework.boot:spring-boot-autoconfigure:[2.3.0.RELEASE] org.springframework.boot:spring-boot-configuration-processor:[2.3.0.RELEASE] org.springframework.boot:spring-boot-starter-test:[2.3.0.RELEASE] org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE] - org.springframework.security:spring-security-config:[5.2.0.RELEASE] - org.springframework.security:spring-security-core:[5.2.0.RELEASE] - org.springframework.security:spring-security-oauth2-client:[5.2.0.RELEASE] - org.springframework.security:spring-security-oauth2-jose:[5.2.0.RELEASE] - org.springframework.security:spring-security-web:[5.2.0.RELEASE] + org.springframework.security:spring-security-config:[5.3.2.RELEASE] + org.springframework.security:spring-security-core:[5.3.2.RELEASE] + org.springframework.security:spring-security-oauth2-client:[5.3.2.RELEASE] + org.springframework.security:spring-security-oauth2-jose:[5.3.2.RELEASE] + org.springframework.security:spring-security-web:[5.3.2.RELEASE] From a09aafe17ba8a2e9680b6235bf6e7667af72681b Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Wed, 17 Jun 2020 11:19:50 +0800 Subject: [PATCH 11/13] Update vertion of spring-context to 5.2.6-RELEASE. --- eng/versioning/external_dependencies.txt | 2 +- .../azure-spring-boot-test-core/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt index cf2db0239125..bc847e597b03 100644 --- a/eng/versioning/external_dependencies.txt +++ b/eng/versioning/external_dependencies.txt @@ -139,7 +139,7 @@ org.junit.platform:junit-platform-testkit;1.6.2 org.junit.vintage:junit-vintage-engine;5.6.2 org.openjdk.jmh:jmh-core;1.22 org.openjdk.jmh:jmh-generator-annprocess;1.22 -org.springframework:spring-context;5.3.2.RELEASE +org.springframework:spring-context;5.2.6.RELEASE org.spockframework:spock-core;1.3-groovy-2.5 org.testng:testng;6.14.3 uk.org.lidalia:slf4j-test;1.2.0 diff --git a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml index c8cc6cc58dec..5acfaf3cb63b 100644 --- a/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml +++ b/sdk/spring/azure-spring-boot-tests/azure-spring-boot-test-core/pom.xml @@ -22,7 +22,7 @@ org.springframework spring-context - 5.3.2.RELEASE + 5.2.6.RELEASE org.springframework.boot @@ -105,7 +105,7 @@ org.eclipse.aether:aether-transport-wagon:[1.1.0] org.springframework.boot:spring-boot:[2.3.0.RELEASE] org.springframework.boot:spring-boot-starter-web:[2.3.0.RELEASE] - org.springframework:spring-context:[5.2.0.RELEASE] + org.springframework:spring-context:[5.2.6.RELEASE] From 5566b1854c0b5bf802604f7c3b5fab398f2713de Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Wed, 17 Jun 2020 11:31:57 +0800 Subject: [PATCH 12/13] Restore vertion_client.txt from master branch. --- eng/versioning/version_client.txt | 54 ++++++++++++++----------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index b0e010be6d85..e711a94b69eb 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -1,10 +1,12 @@ # Format; # :;dependency-version;current-version -com.azure:azure-active-directory-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.azure:azure-sdk-all;1.0.0;1.0.0 +com.azure:azure-sdk-parent;1.6.0;1.6.0 +com.azure:azure-client-sdk-parent;1.7.0;1.7.0 com.azure:azure-ai-formrecognizer;1.0.0-beta.3;1.0.0-beta.4 com.azure:azure-ai-textanalytics;1.0.0;1.1.0-beta.1 -com.azure:azure-client-sdk-parent;1.7.0;1.7.0 +com.azure:azure-core;1.5.1;1.6.0-beta.1 com.azure:azure-core-amqp;1.2.0;1.3.0-beta.1 com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-core-http-netty;1.5.2;1.6.0-beta.1 @@ -14,54 +16,46 @@ com.azure:azure-core-serializer-json-gson;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-core-serializer-json-jackson;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-core-test;1.3.0;1.4.0-beta.1 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.5;1.0.0-beta.6 -com.azure:azure-core;1.5.1;1.6.0-beta.1 -com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 -com.azure:azure-cosmos-examples;4.0.1-beta.1;4.0.1-beta.1 com.azure:azure-cosmos;4.0.1;4.1.0-beta.1 -com.azure:azure-cosmosdb-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.azure:azure-cosmos-examples;4.0.1-beta.1;4.0.1-beta.1 +com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 com.azure:azure-data-appconfiguration;1.1.2;1.2.0-beta.1 -com.azure:azure-data-gremlin-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.azure:azure-data-schemaregistry-avro;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-data-schemaregistry;1.0.0-beta.1;1.0.0-beta.2 +com.azure:azure-data-schemaregistry-avro;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-data-tables;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-identity;1.0.7;1.1.0-beta.6 -com.azure:azure-keyvault-secrets-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.1.1;1.2.0-beta.1 +com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-messaging-eventhubs;5.1.1;5.2.0-beta.1 +com.azure:azure-messaging-eventhubs-checkpointstore-blob;1.1.1;1.2.0-beta.1 com.azure:azure-messaging-servicebus;7.0.0-beta.3;7.0.0-beta.4 -com.azure:azure-sdk-all;1.0.0;1.0.0 -com.azure:azure-sdk-parent;1.6.0;1.6.0 -com.azure:azure-sdk-template;1.0.4-beta.19;1.0.4-beta.20 com.azure:azure-search-documents;1.0.0-beta.4;1.0.0-beta.5 com.azure:azure-security-keyvault-certificates;4.1.0-beta.3;4.1.0-beta.4 com.azure:azure-security-keyvault-keys;4.2.0-beta.4;4.2.0-beta.5 com.azure:azure-security-keyvault-secrets;4.2.0-beta.3;4.2.0-beta.4 -com.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1 +com.azure:azure-sdk-template;1.0.4-beta.19;1.0.4-beta.20 +com.azure:azure-storage-blob;12.7.0;12.8.0-beta.1 com.azure:azure-storage-blob-batch;12.5.2;12.6.0-beta.1 com.azure:azure-storage-blob-cryptography;12.7.0;12.8.0-beta.1 com.azure:azure-storage-blob-nio;12.0.0-beta.1;12.0.0-beta.1 -com.azure:azure-storage-blob;12.7.0;12.8.0-beta.1 com.azure:azure-storage-common;12.7.0;12.8.0-beta.1 -com.azure:azure-storage-file-datalake;12.1.2;12.2.0-beta.1 com.azure:azure-storage-file-share;12.5.0;12.6.0-beta.1 +com.azure:azure-storage-file-datalake;12.1.2;12.2.0-beta.1 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-storage-queue;12.5.2;12.6.0-beta.1 -com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1 -com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-active-directory-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-spring-boot-bom;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-spring-boot-starter;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-spring-boot-test-core;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-spring-boot-tests;2.3.2;2.3.3-beta.1 -com.microsoft.azure:azure-spring-boot;2.3.2;2.3.3-beta.1 +com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1 +com.microsoft.azure:azure-spring-boot;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-spring-boot-starter;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-active-directory-spring-boot-starter;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-spring-boot-metrics-starter;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-spring-boot-tests;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-spring-boot-test-core;2.2.4;2.2.5-beta.1 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current From 6a84261b0d32d4073aa3be9343948104014a8c91 Mon Sep 17 00:00:00 2001 From: Rujun Chen Date: Wed, 17 Jun 2020 11:39:15 +0800 Subject: [PATCH 13/13] Update spring integration related vertion to 2.3.3-beta.1. --- eng/versioning/version_client.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index e711a94b69eb..34f3a7a765e0 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -45,17 +45,17 @@ com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-storage-queue;12.5.2;12.6.0-beta.1 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1 -com.microsoft.azure:azure-spring-boot;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-active-directory-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-spring-boot-metrics-starter;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-spring-boot-tests;2.2.4;2.2.5-beta.1 -com.microsoft.azure:azure-spring-boot-test-core;2.2.4;2.2.5-beta.1 +com.microsoft.azure:azure-spring-boot;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-active-directory-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-tests;2.3.2;2.3.3-beta.1 +com.microsoft.azure:azure-spring-boot-test-core;2.3.2;2.3.3-beta.1 # Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current