Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions eng/versioning/version_data.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ 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
# 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why set them to a moving target which is "azure-cosmos" current-version? Wouldn't it be easier if they were set to a fixed version?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have always kept them in sync with azure-cosmos version. That is the only reason to keep incrementing them so as to avoid confusion within the Cosmos SDK team.

Once we publish v4, we will try to get rid of azure-cosmos-parent, azure-cosmos-benchmark and azure-cosmos-examples

For now, we would like to keep them updated with 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
com.microsoft.azure:azure-eventhubs-eph;3.1.0;3.1.0
com.microsoft.azure:azure-eventhubs-extensions;3.1.0;3.1.0
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ For example, using maven, you can add the following dependency to your maven pom
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>3.5.1-beta1</version>
<version>3.6.0-beta.1</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
6 changes: 3 additions & 3 deletions sdk/cosmos/microsoft-azure-cosmos-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ Licensed under the MIT License.
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos-parent</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
<version>3.5.0</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
</parent>

<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos-benchmark</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-benchmark;current} -->
<version>3.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-benchmark;current} -->
<name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Benchmarking tool</name>
<description>This package contains Benchmarking tool for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
Expand All @@ -33,7 +33,7 @@ Licensed under the MIT License.
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
<version>3.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions sdk/cosmos/microsoft-azure-cosmos-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ Licensed under the MIT License.
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos-parent</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
<version>3.5.0</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
</parent>

<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos-examples</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-examples;current} -->
<version>3.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-examples;current} -->
<name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Examples</name>
<description>This package contains examples for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>
Expand Down Expand Up @@ -94,7 +94,7 @@ Licensed under the MIT License.
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
<version>3.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions sdk/cosmos/microsoft-azure-cosmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ Licensed under the MIT License.
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos-parent</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
<version>3.5.0</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
</parent>

<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
<version>3.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
<name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</name>
<description>This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension rx support) for Azure Cosmos DB SQL API</description>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-beta.1";
// {x-version-update-end}
public static final String SDK_NAME = "cosmosdb-java-sdk";
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Licensed under the MIT License.

<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos-parent</artifactId>
<version>3.5.1-beta1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
<version>3.5.0</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-parent;current} -->
<packaging>pom</packaging>

<name>Microsoft Azure Cosmos DB SQL API</name>
Expand Down