From 704b54f425094a97883ef218c2a3eb8a8609c9ac Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Mon, 6 Jan 2020 10:10:26 -0800 Subject: [PATCH 1/3] Updated release versions to 3.6.0-SNAPSHOT --- eng/versioning/version_data.txt | 8 ++++---- sdk/cosmos/README.md | 2 +- sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml | 6 +++--- sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml | 6 +++--- sdk/cosmos/microsoft-azure-cosmos/pom.xml | 4 ++-- .../com/azure/data/cosmos/internal/HttpConstants.java | 2 +- sdk/cosmos/pom.xml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/versioning/version_data.txt b/eng/versioning/version_data.txt index 3de38f0a2bcf..d83d4d9c8aff 100644 --- a/eng/versioning/version_data.txt +++ b/eng/versioning/version_data.txt @@ -23,10 +23,10 @@ com.microsoft.azure.cognitiveservices:azure-cognitiveservices-contentmoderator;1 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-customvision-prediction;1.1.0-beta.3;1.1.0-beta.3 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-customvision-training;1.1.0-beta.3;1.1.0-beta.3 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-faceapi;1.1.0-beta.1;1.1.0-beta.1 -com.microsoft.azure:azure-cosmos-parent;3.5.0;3.5.1-beta1 -com.microsoft.azure:azure-cosmos;3.5.0;3.5.1-beta1 -com.microsoft.azure:azure-cosmos-benchmark;3.5.1-beta1;3.5.1-beta1 -com.microsoft.azure:azure-cosmos-examples;3.5.1-beta1;3.5.1-beta1 +com.microsoft.azure:azure-cosmos-parent;3.6.0-SNAPSHOT;3.6.0-SNAPSHOT +com.microsoft.azure:azure-cosmos;3.6.0-SNAPSHOT;3.6.0-SNAPSHOT +com.microsoft.azure:azure-cosmos-benchmark;3.6.0-SNAPSHOT;3.6.0-SNAPSHOT +com.microsoft.azure:azure-cosmos-examples;3.6.0-SNAPSHOT;3.6.0-SNAPSHOT com.microsoft.azure:azure-eventhubs;3.1.0;3.1.0 com.microsoft.azure:azure-eventhubs-eph;3.1.0;3.1.0 com.microsoft.azure:azure-eventhubs-extensions;3.1.0;3.1.0 diff --git a/sdk/cosmos/README.md b/sdk/cosmos/README.md index 0d4cc1006c54..b378326f7a99 100644 --- a/sdk/cosmos/README.md +++ b/sdk/cosmos/README.md @@ -92,7 +92,7 @@ For example, using maven, you can add the following dependency to your maven pom com.microsoft.azure azure-cosmos - 3.5.1-beta1 + 3.6.0-SNAPSHOT ``` [//]: # ({x-version-update-end}) diff --git a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml index 1b3f977beda6..5d686187cca4 100644 --- a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml @@ -8,12 +8,12 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.5.1-beta1 + 3.6.0-SNAPSHOT com.microsoft.azure azure-cosmos-benchmark - 3.5.1-beta1 + 3.6.0-SNAPSHOT Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Benchmarking tool This package contains Benchmarking tool for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service https://github.com/Azure/azure-sdk-for-java @@ -33,7 +33,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.5.1-beta1 + 3.6.0-SNAPSHOT diff --git a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml index 890d3fd1157c..e442dc9853d3 100644 --- a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml @@ -8,12 +8,12 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.5.1-beta1 + 3.6.0-SNAPSHOT com.microsoft.azure azure-cosmos-examples - 3.5.1-beta1 + 3.6.0-SNAPSHOT Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Examples This package contains examples for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service https://github.com/Azure/azure-sdk-for-java @@ -94,7 +94,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.5.1-beta1 + 3.6.0-SNAPSHOT diff --git a/sdk/cosmos/microsoft-azure-cosmos/pom.xml b/sdk/cosmos/microsoft-azure-cosmos/pom.xml index fb3764773faf..d30ce46e748e 100644 --- a/sdk/cosmos/microsoft-azure-cosmos/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos/pom.xml @@ -7,12 +7,12 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.5.1-beta1 + 3.6.0-SNAPSHOT com.microsoft.azure azure-cosmos - 3.5.1-beta1 + 3.6.0-SNAPSHOT Microsoft Azure SDK for SQL API of Azure Cosmos DB Service This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension rx support) for Azure Cosmos DB SQL API jar diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java b/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java index 0b13cf4aafd0..7ee361e19e75 100644 --- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java +++ b/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java @@ -257,7 +257,7 @@ public static class Versions { // @see // https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven // {x-version-update-start;com.microsoft.azure:azure-cosmos;current} - public static final String SDK_VERSION = "3.5.1-beta1"; + public static final String SDK_VERSION = "3.6.0-SNAPSHOT"; // {x-version-update-end} public static final String SDK_NAME = "cosmosdb-java-sdk"; } diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index 3d5ed59778a0..c7f581628352 100644 --- a/sdk/cosmos/pom.xml +++ b/sdk/cosmos/pom.xml @@ -13,7 +13,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.5.1-beta1 + 3.6.0-SNAPSHOT pom Microsoft Azure Cosmos DB SQL API From e6f1f23bbfb75ccac05cc5fd576714397141a185 Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Mon, 6 Jan 2020 10:52:13 -0800 Subject: [PATCH 2/3] Updated snapshot to beta.1 suggested by azure core team --- eng/versioning/version_data.txt | 8 ++++---- sdk/cosmos/README.md | 2 +- sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml | 6 +++--- sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml | 6 +++--- sdk/cosmos/microsoft-azure-cosmos/pom.xml | 4 ++-- .../com/azure/data/cosmos/internal/HttpConstants.java | 2 +- sdk/cosmos/pom.xml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/versioning/version_data.txt b/eng/versioning/version_data.txt index d83d4d9c8aff..554d45400b36 100644 --- a/eng/versioning/version_data.txt +++ b/eng/versioning/version_data.txt @@ -23,10 +23,10 @@ com.microsoft.azure.cognitiveservices:azure-cognitiveservices-contentmoderator;1 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-customvision-prediction;1.1.0-beta.3;1.1.0-beta.3 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-customvision-training;1.1.0-beta.3;1.1.0-beta.3 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-faceapi;1.1.0-beta.1;1.1.0-beta.1 -com.microsoft.azure:azure-cosmos-parent;3.6.0-SNAPSHOT;3.6.0-SNAPSHOT -com.microsoft.azure:azure-cosmos;3.6.0-SNAPSHOT;3.6.0-SNAPSHOT -com.microsoft.azure:azure-cosmos-benchmark;3.6.0-SNAPSHOT;3.6.0-SNAPSHOT -com.microsoft.azure:azure-cosmos-examples;3.6.0-SNAPSHOT;3.6.0-SNAPSHOT +com.microsoft.azure:azure-cosmos-parent;3.6.0-beta.1;3.6.0-beta.1 +com.microsoft.azure:azure-cosmos;3.6.0-beta.1;3.6.0-beta.1 +com.microsoft.azure:azure-cosmos-benchmark;3.6.0-beta.1;3.6.0-beta.1 +com.microsoft.azure:azure-cosmos-examples;3.6.0-beta.1;3.6.0-beta.1 com.microsoft.azure:azure-eventhubs;3.1.0;3.1.0 com.microsoft.azure:azure-eventhubs-eph;3.1.0;3.1.0 com.microsoft.azure:azure-eventhubs-extensions;3.1.0;3.1.0 diff --git a/sdk/cosmos/README.md b/sdk/cosmos/README.md index b378326f7a99..29b0adec8446 100644 --- a/sdk/cosmos/README.md +++ b/sdk/cosmos/README.md @@ -92,7 +92,7 @@ For example, using maven, you can add the following dependency to your maven pom com.microsoft.azure azure-cosmos - 3.6.0-SNAPSHOT + 3.6.0-beta.1 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml index 5d686187cca4..15ec31cf710e 100644 --- a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml @@ -8,12 +8,12 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.6.0-SNAPSHOT + 3.6.0-beta.1 com.microsoft.azure azure-cosmos-benchmark - 3.6.0-SNAPSHOT + 3.6.0-beta.1 Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Benchmarking tool This package contains Benchmarking tool for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service https://github.com/Azure/azure-sdk-for-java @@ -33,7 +33,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.6.0-SNAPSHOT + 3.6.0-beta.1 diff --git a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml index e442dc9853d3..9a567295a46e 100644 --- a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml @@ -8,12 +8,12 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.6.0-SNAPSHOT + 3.6.0-beta.1 com.microsoft.azure azure-cosmos-examples - 3.6.0-SNAPSHOT + 3.6.0-beta.1 Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Examples This package contains examples for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service https://github.com/Azure/azure-sdk-for-java @@ -94,7 +94,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.6.0-SNAPSHOT + 3.6.0-beta.1 diff --git a/sdk/cosmos/microsoft-azure-cosmos/pom.xml b/sdk/cosmos/microsoft-azure-cosmos/pom.xml index d30ce46e748e..03582cbfa21d 100644 --- a/sdk/cosmos/microsoft-azure-cosmos/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos/pom.xml @@ -7,12 +7,12 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.6.0-SNAPSHOT + 3.6.0-beta.1 com.microsoft.azure azure-cosmos - 3.6.0-SNAPSHOT + 3.6.0-beta.1 Microsoft Azure SDK for SQL API of Azure Cosmos DB Service This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension rx support) for Azure Cosmos DB SQL API jar diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java b/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java index 7ee361e19e75..a0768c88b355 100644 --- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java +++ b/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/HttpConstants.java @@ -257,7 +257,7 @@ public static class Versions { // @see // https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven // {x-version-update-start;com.microsoft.azure:azure-cosmos;current} - public static final String SDK_VERSION = "3.6.0-SNAPSHOT"; + public static final String SDK_VERSION = "3.6.0-beta.1"; // {x-version-update-end} public static final String SDK_NAME = "cosmosdb-java-sdk"; } diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index c7f581628352..f3bf441b0dfa 100644 --- a/sdk/cosmos/pom.xml +++ b/sdk/cosmos/pom.xml @@ -13,7 +13,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.6.0-SNAPSHOT + 3.6.0-beta.1 pom Microsoft Azure Cosmos DB SQL API From 7fbe9a600340211abfdd69f8dd99cebd4a2fa0be Mon Sep 17 00:00:00 2001 From: Kushagra Thapar Date: Mon, 6 Jan 2020 11:38:57 -0800 Subject: [PATCH 3/3] Updated versions to correct dependency and current version. Added helpful comments in version_data.txt file --- eng/versioning/version_data.txt | 6 ++++-- sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml | 2 +- sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml | 2 +- sdk/cosmos/microsoft-azure-cosmos/pom.xml | 2 +- sdk/cosmos/pom.xml | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eng/versioning/version_data.txt b/eng/versioning/version_data.txt index 554d45400b36..72c13b3b7d0f 100644 --- a/eng/versioning/version_data.txt +++ b/eng/versioning/version_data.txt @@ -23,8 +23,10 @@ com.microsoft.azure.cognitiveservices:azure-cognitiveservices-contentmoderator;1 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-customvision-prediction;1.1.0-beta.3;1.1.0-beta.3 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-customvision-training;1.1.0-beta.3;1.1.0-beta.3 com.microsoft.azure.cognitiveservices:azure-cognitiveservices-faceapi;1.1.0-beta.1;1.1.0-beta.1 -com.microsoft.azure:azure-cosmos-parent;3.6.0-beta.1;3.6.0-beta.1 -com.microsoft.azure:azure-cosmos;3.6.0-beta.1;3.6.0-beta.1 +# azure-cosmos-parent doesn't have a dependency management section anymore, it doesn't need to change unless parent pom changes +com.microsoft.azure:azure-cosmos-parent;3.5.0;3.5.0 +com.microsoft.azure:azure-cosmos;3.5.0;3.6.0-beta.1 +# azure-cosmos-benchmark and azure-cosmos-examples don't get released, and should be set to azure-cosmos current-version com.microsoft.azure:azure-cosmos-benchmark;3.6.0-beta.1;3.6.0-beta.1 com.microsoft.azure:azure-cosmos-examples;3.6.0-beta.1;3.6.0-beta.1 com.microsoft.azure:azure-eventhubs;3.1.0;3.1.0 diff --git a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml index 15ec31cf710e..6a51f2b215e1 100644 --- a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml @@ -8,7 +8,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.6.0-beta.1 + 3.5.0 com.microsoft.azure diff --git a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml index 9a567295a46e..2075b939cbf2 100644 --- a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml @@ -8,7 +8,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.6.0-beta.1 + 3.5.0 com.microsoft.azure diff --git a/sdk/cosmos/microsoft-azure-cosmos/pom.xml b/sdk/cosmos/microsoft-azure-cosmos/pom.xml index 03582cbfa21d..d4dbfa7d8e16 100644 --- a/sdk/cosmos/microsoft-azure-cosmos/pom.xml +++ b/sdk/cosmos/microsoft-azure-cosmos/pom.xml @@ -7,7 +7,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.6.0-beta.1 + 3.5.0 com.microsoft.azure diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index f3bf441b0dfa..e6fe8f8ca8b4 100644 --- a/sdk/cosmos/pom.xml +++ b/sdk/cosmos/pom.xml @@ -13,7 +13,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos-parent - 3.6.0-beta.1 + 3.5.0 pom Microsoft Azure Cosmos DB SQL API