From a8056677280c22665178b06a2c323517ea94e3de Mon Sep 17 00:00:00 2001 From: milismsft-mac Date: Wed, 25 Sep 2019 14:05:59 -0700 Subject: [PATCH 1/4] Update cosmos versions; up the minor build. --- 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 ++-- .../java/com/azure/data/cosmos/internal/HttpConstants.java | 2 +- sdk/cosmos/pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml index d0f8d64edec5..66a86c08d3db 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.3.0 + 3.3.1 com.microsoft.azure azure-cosmos-benchmark - 3.3.0 + 3.3.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.3.0 + 3.3.1 diff --git a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml index 31fc7f1ab690..e83c2fd96427 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.3.0 + 3.3.1 com.microsoft.azure azure-cosmos-examples - 3.3.0 + 3.3.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 @@ -89,7 +89,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.3.0 + 3.3.1 diff --git a/sdk/cosmos/microsoft-azure-cosmos/pom.xml b/sdk/cosmos/microsoft-azure-cosmos/pom.xml index d845ecd66627..fec3fea972cc 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.3.0 + 3.3.1 com.microsoft.azure azure-cosmos - 3.3.0 + 3.3.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 8530ba2816e4..76d0f627c6f8 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 @@ -252,7 +252,7 @@ public static class Versions { // TODO: FIXME we can use maven plugin for generating a version file // @see // https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven - public static final String SDK_VERSION = "3.2.0"; + public static final String SDK_VERSION = "3.3.1"; public static final String SDK_NAME = "cosmosdb-java-sdk"; } diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index 532301e16c4d..8e0bcba32d27 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.3.0 + 3.3.1 pom Microsoft Azure Cosmos DB SQL API @@ -54,7 +54,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.3.0 + 3.3.1 From e77088f2ef6097a57f29a5b49a7a8e21fead1eea Mon Sep 17 00:00:00 2001 From: milismsft-mac Date: Wed, 25 Sep 2019 14:14:22 -0700 Subject: [PATCH 2/4] Hot fix version should be 3.2.1 --- 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 ++-- .../java/com/azure/data/cosmos/internal/HttpConstants.java | 2 +- sdk/cosmos/pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml index 66a86c08d3db..944c0ffaa650 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.3.1 + 3.2.1 com.microsoft.azure azure-cosmos-benchmark - 3.3.1 + 3.2.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.3.1 + 3.2.1 diff --git a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml index e83c2fd96427..8cf57f0b1d40 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.3.1 + 3.2.1 com.microsoft.azure azure-cosmos-examples - 3.3.1 + 3.2.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 @@ -89,7 +89,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.3.1 + 3.2.1 diff --git a/sdk/cosmos/microsoft-azure-cosmos/pom.xml b/sdk/cosmos/microsoft-azure-cosmos/pom.xml index fec3fea972cc..8abf953d97c9 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.3.1 + 3.2.1 com.microsoft.azure azure-cosmos - 3.3.1 + 3.2.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 76d0f627c6f8..c20372409331 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 @@ -252,7 +252,7 @@ public static class Versions { // TODO: FIXME we can use maven plugin for generating a version file // @see // https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven - public static final String SDK_VERSION = "3.3.1"; + public static final String SDK_VERSION = "3.2.1"; public static final String SDK_NAME = "cosmosdb-java-sdk"; } diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index 8e0bcba32d27..1ae7a7907df2 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.3.1 + 3.2.1 pom Microsoft Azure Cosmos DB SQL API @@ -54,7 +54,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.3.1 + 3.2.1 From 4483b62dc843291eab391eaba3e4390e03a21758 Mon Sep 17 00:00:00 2001 From: milismsft-mac Date: Thu, 26 Sep 2019 16:04:10 -0700 Subject: [PATCH 3/4] update versions to the next build number --- 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 ++-- .../java/com/azure/data/cosmos/internal/HttpConstants.java | 2 +- sdk/cosmos/pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml index 944c0ffaa650..d76c1527bff3 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.2.1 + 3.3.0-SNAPSHOT com.microsoft.azure azure-cosmos-benchmark - 3.2.1 + 3.3.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.2.1 + 3.3.0-SNAPSHOT diff --git a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml index 8cf57f0b1d40..c64116bffa3d 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.2.1 + 3.3.0-SNAPSHOT com.microsoft.azure azure-cosmos-examples - 3.2.1 + 3.3.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 @@ -89,7 +89,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.2.1 + 3.3.0-SNAPSHOT diff --git a/sdk/cosmos/microsoft-azure-cosmos/pom.xml b/sdk/cosmos/microsoft-azure-cosmos/pom.xml index 8abf953d97c9..4202247de480 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.2.1 + 3.3.0-SNAPSHOT com.microsoft.azure azure-cosmos - 3.2.1 + 3.3.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 c20372409331..6ebbc707babe 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 @@ -252,7 +252,7 @@ public static class Versions { // TODO: FIXME we can use maven plugin for generating a version file // @see // https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven - public static final String SDK_VERSION = "3.2.1"; + public static final String SDK_VERSION = "3.3.0-SNAPSHOT"; public static final String SDK_NAME = "cosmosdb-java-sdk"; } diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index 1ae7a7907df2..a932e07eac5a 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.2.1 + 3.3.0-SNAPSHOT pom Microsoft Azure Cosmos DB SQL API @@ -54,7 +54,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.2.1 + 3.3.0-SNAPSHOT From 3007449319dd0f50752c59285d9b20c7711aa60f Mon Sep 17 00:00:00 2001 From: milismsft-mac Date: Fri, 27 Sep 2019 12:29:21 -0700 Subject: [PATCH 4/4] Remove snapshot from the version --- 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 ++-- .../java/com/azure/data/cosmos/internal/HttpConstants.java | 2 +- sdk/cosmos/pom.xml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml index d76c1527bff3..d0f8d64edec5 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.3.0-SNAPSHOT + 3.3.0 com.microsoft.azure azure-cosmos-benchmark - 3.3.0-SNAPSHOT + 3.3.0 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.3.0-SNAPSHOT + 3.3.0 diff --git a/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml b/sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml index c64116bffa3d..31fc7f1ab690 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.3.0-SNAPSHOT + 3.3.0 com.microsoft.azure azure-cosmos-examples - 3.3.0-SNAPSHOT + 3.3.0 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 @@ -89,7 +89,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.3.0-SNAPSHOT + 3.3.0 diff --git a/sdk/cosmos/microsoft-azure-cosmos/pom.xml b/sdk/cosmos/microsoft-azure-cosmos/pom.xml index 4202247de480..d845ecd66627 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.3.0-SNAPSHOT + 3.3.0 com.microsoft.azure azure-cosmos - 3.3.0-SNAPSHOT + 3.3.0 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 6ebbc707babe..7253be23fe5e 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 @@ -252,7 +252,7 @@ public static class Versions { // TODO: FIXME we can use maven plugin for generating a version file // @see // https://stackoverflow.com/questions/2469922/generate-a-version-java-file-in-maven - public static final String SDK_VERSION = "3.3.0-SNAPSHOT"; + public static final String SDK_VERSION = "3.3.0"; public static final String SDK_NAME = "cosmosdb-java-sdk"; } diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml index a932e07eac5a..532301e16c4d 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.3.0-SNAPSHOT + 3.3.0 pom Microsoft Azure Cosmos DB SQL API @@ -54,7 +54,7 @@ Licensed under the MIT License. com.microsoft.azure azure-cosmos - 3.3.0-SNAPSHOT + 3.3.0