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
8 changes: 4 additions & 4 deletions eng/versioning/version_data.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ com.microsoft.azure.cognitiveservices:azure-cognitiveservices-customvision-train
com.microsoft.azure.cognitiveservices:azure-cognitiveservices-faceapi;1.1.0-beta.1;1.1.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-cosmos;3.6.0-beta.1;3.6.0-beta.2
# benchmark and examples aren't released but we're keeping the version in sync with the current cosmos version
com.microsoft.azure:azure-cosmos-benchmark;3.6.0-beta.2;3.6.0-beta.2
com.microsoft.azure:azure-cosmos-examples;3.6.0-beta.2;3.6.0-beta.2
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.6.0-beta.1</version>
<version>3.6.0-beta.2</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
4 changes: 3 additions & 1 deletion sdk/cosmos/changelog/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Changelog
### unreleased
### 3.6.0-beta.1
- Added the ability to select default Direct TCP options

In priority order we will take default Direct TCP options from:
Expand All @@ -22,6 +22,8 @@
Otherwise, if none of these values are set or an error occurs we create default options based on a set of hard-wired
values defined in the default private parameterless constructor for `RntbdTransportClient.Options` as we did before
this release.

- Fixed Reactor Netty connection re-use issue: https://github.com/Azure/azure-sdk-for-java/issues/6973

### 3.5.0
- Changefeed bug fixes (includes all the bug fixes released in 3.3.3)
Expand Down
4 changes: 2 additions & 2 deletions sdk/cosmos/microsoft-azure-cosmos-benchmark/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-benchmark</artifactId>
<version>3.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-benchmark;current} -->
<version>3.6.0-beta.2</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.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
<version>3.6.0-beta.2</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-examples/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-examples</artifactId>
<version>3.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos-examples;current} -->
<version>3.6.0-beta.2</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.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
<version>3.6.0-beta.2</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/cosmos/microsoft-azure-cosmos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Licensed under the MIT License.

<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmos</artifactId>
<version>3.6.0-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmos;current} -->
<version>3.6.0-beta.2</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.6.0-beta.1";
public static final String SDK_VERSION = "3.6.0-beta.2";
// {x-version-update-end}
public static final String SDK_NAME = "cosmosdb-java-sdk";
}
Expand Down