diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index e1560d274bfe6..33b0b28b830d4 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -183,12 +183,12 @@ com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 com.azure azure-cosmos-encryption - 1.4.0-beta.1 + 1.4.0 com.azure @@ -619,7 +619,7 @@ com.azure azure-spring-data-cosmos - 3.24.0-beta.1 + 3.24.0 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index e6327b68232c1..f31a3346ea07c 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -83,13 +83,13 @@ com.azure:azure-core-serializer-json-gson;1.1.18;1.2.0-beta.1 com.azure:azure-core-serializer-json-jackson;1.2.19;1.3.0-beta.1 com.azure:azure-core-test;1.10.0;1.11.0-beta.1 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.26;1.0.0-beta.27 -com.azure:azure-cosmos;4.32.1;4.33.0-beta.1 +com.azure:azure-cosmos;4.32.1;4.33.0 com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1 com.azure:azure-cosmos-dotnet-benchmark;4.0.1-beta.1;4.0.1-beta.1 com.azure.cosmos.spark:azure-cosmos-spark_3_2-12;1.0.0-beta.1;1.0.0-beta.1 -com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.11.2;4.12.0-beta.1 -com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.11.2;4.12.0-beta.1 -com.azure:azure-cosmos-encryption;1.3.0;1.4.0-beta.1 +com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.11.2;4.12.0 +com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.11.2;4.12.0 +com.azure:azure-cosmos-encryption;1.3.0;1.4.0 com.azure:azure-data-appconfiguration;1.3.5;1.4.0-beta.1 com.azure:azure-data-appconfiguration-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-data-schemaregistry;1.2.2;1.3.0-beta.1 @@ -135,7 +135,7 @@ com.azure:azure-security-keyvault-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-sdk-template;1.1.1234;1.2.2-beta.1 com.azure:azure-sdk-template-two;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-sdk-template-three;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-spring-data-cosmos;3.23.0;3.24.0-beta.1 +com.azure:azure-spring-data-cosmos;3.23.0;3.24.0 com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1 com.azure:azure-storage-blob;12.18.0;12.19.0-beta.1 com.azure:azure-storage-blob-batch;12.14.0;12.15.0-beta.1 diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml index 721c335647af0..a940b83931f52 100644 --- a/sdk/cosmos/azure-cosmos-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-benchmark/pom.xml @@ -51,13 +51,13 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 com.azure azure-cosmos-encryption - 1.4.0-beta.1 + 1.4.0 diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml index 81b12afe1319b..87ac63a279748 100644 --- a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml +++ b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml @@ -50,7 +50,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 diff --git a/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md b/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md index 99318cc8ee6be..07a9b71498102 100644 --- a/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md @@ -1,14 +1,9 @@ ## Release History -### 1.4.0-beta.1 (Unreleased) - -#### Features Added - -#### Breaking Changes - -#### Bugs Fixed +### 1.4.0 (2022-07-14) #### Other Changes +* Updated `azure-cosmos` to version `4.33.0`. ### 1.3.0 (2022-06-08) #### Other Changes diff --git a/sdk/cosmos/azure-cosmos-encryption/README.md b/sdk/cosmos/azure-cosmos-encryption/README.md index aa7f6d4355951..fd55d6726e6c7 100644 --- a/sdk/cosmos/azure-cosmos-encryption/README.md +++ b/sdk/cosmos/azure-cosmos-encryption/README.md @@ -12,7 +12,7 @@ The Azure Cosmos Encryption Plugin is used for encrypting data with a user-provi com.azure azure-cosmos-encryption - 1.3.0 + 1.4.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml index 9d4d1c0b07e90..64ad7d2e0de71 100644 --- a/sdk/cosmos/azure-cosmos-encryption/pom.xml +++ b/sdk/cosmos/azure-cosmos-encryption/pom.xml @@ -13,7 +13,7 @@ Licensed under the MIT License. com.azure azure-cosmos-encryption - 1.4.0-beta.1 + 1.4.0 Encryption Plugin for Azure Cosmos DB SDK This Package contains Encryption Plugin for Microsoft Azure Cosmos SDK jar @@ -56,7 +56,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md index ef784e2e35a50..6a3c339e73f47 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md @@ -1,19 +1,15 @@ ## Release History -### 4.12.0-beta.1 (Unreleased) +### 4.12.0 (2022-07-14) #### Features Added * Added a new config option `spark.cosmos.changeFeed.batchCheckpointLocation` that allows to also proceed a change feed batch query from a checkpoint/offset - See [PR 29771](https://github.com/Azure/azure-sdk-for-java/pull/29771) * Added an option to also restrict the memory consumption for batch change feed queries (via the `spark.cosmos.changeFeed.itemCountPerTriggerHint` config option) - See [PR 29771](https://github.com/Azure/azure-sdk-for-java/pull/29771) * Added a UDF `CreateChangeFeedOffsetFromSpark2` that allows creating a Spark 3.* offset/checkpoint from a Spark 2.4 checkpoint - See [PR 29771](https://github.com/Azure/azure-sdk-for-java/pull/29771) -#### Breaking Changes - #### Bugs Fixed * Fixed a bug preventing use patch on container not partitioned by `id`. - See [PR 29883](https://github.com/Azure/azure-sdk-for-java/pull/29883) -#### Other Changes - ### 4.11.2 (2022-06-17) #### Bugs Fixed diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md index 683a3e005cc87..3c0fcc03dbc03 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/README.md @@ -27,58 +27,60 @@ https://github.com/Azure/azure-sdk-for-java/issues/new ### Version Compatibility #### azure-cosmos-spark_3-1_2-12 -| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | -| ------------- | ------------------------ | -------------------- | ----------------------- | ----------------------------- | -| 4.11.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.11.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.11.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.10.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.10.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.9.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.8.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.7.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.6.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.6.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.6.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.5.3 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.5.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.5.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.5.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.4.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.4.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.4.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.3.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.3.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.2.0 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.1.0 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.0.0 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.0.0-beta.3 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.0.0-beta.2 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.0.0-beta.1 | 3.1.1 | 8 | 2.12 | 8.\* | +| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | +|--------------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.12.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.11.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.11.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.11.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.10.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.10.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.9.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.8.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.7.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.6.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.6.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.6.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.5.3 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.5.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.5.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.5.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.4.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.4.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.4.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.3.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.3.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.2.0 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.1.0 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.0.0 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.0.0-beta.3 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.0.0-beta.2 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.0.0-beta.1 | 3.1.1 | 8 | 2.12 | 8.\* | #### azure-cosmos-spark_3-2_2-12 -| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | -| ------------- | ------------------------ | -------------------- | ----------------------- | ----------------------------- | -| 4.11.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.11.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.11.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.10.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.10.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.9.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.8.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.7.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.6.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.6.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.6.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | +|-----------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.12.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.11.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.11.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.11.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.10.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.10.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.9.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.8.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.7.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.6.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.6.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.6.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | ### Download You can use the maven coordinate of the jar to auto install the Spark Connector to your Databricks Runtime 8 from Maven: -`com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.11.2` +`com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.12.0` You can also integrate against Cosmos DB Spark Connector in your SBT project: ```scala -libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-1_2-12" % "4.11.2" +libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-1_2-12" % "4.12.0" ``` Cosmos DB Spark Connector is available on [Maven Central Repo](https://search.maven.org/search?q=g:com.azure.cosmos.spark). diff --git a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml index f0d57e2de23bc..a1fb53af66176 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-1_2-12/pom.xml @@ -11,7 +11,7 @@ com.azure.cosmos.spark azure-cosmos-spark_3-1_2-12 - 4.12.0-beta.1 + 4.12.0 jar https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-cosmos-spark_3-1_2-12 OLTP Spark 3.1 Connector for Azure Cosmos DB SQL API @@ -106,7 +106,7 @@ com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 com.fasterxml.jackson.core diff --git a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md index 781f7e618e964..0d6b82ca415d8 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md @@ -1,19 +1,15 @@ ## Release History -### 4.12.0-beta.1 (Unreleased) +### 4.12.0 (2022-07-14) #### Features Added * Added a new config option `spark.cosmos.changeFeed.batchCheckpointLocation` that allows to also proceed a change feed batch query from a checkpoint/offset - See [PR 29771](https://github.com/Azure/azure-sdk-for-java/pull/29771) * Added an option to also restrict the memory consumption for batch change feed queries (via the `spark.cosmos.changeFeed.itemCountPerTriggerHint` config option) - See [PR 29771](https://github.com/Azure/azure-sdk-for-java/pull/29771) * Added a UDF `CreateChangeFeedOffsetFromSpark2` that allows creating a Spark 3.* offset/checkpoint from a Spark 2.4 checkpoint - See [PR 29771](https://github.com/Azure/azure-sdk-for-java/pull/29771) -#### Breaking Changes - #### Bugs Fixed * Fixed a bug preventing use patch on container not partitioned by `id`. - See [PR 29883](https://github.com/Azure/azure-sdk-for-java/pull/29883) -#### Other Changes - ### 4.11.2 (2022-06-17) #### Bugs Fixed diff --git a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md index c3ad2d528d2b6..b53abeafc52a5 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md +++ b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/README.md @@ -26,58 +26,60 @@ https://github.com/Azure/azure-sdk-for-java/issues/new ### Version Compatibility #### azure-cosmos-spark_3-2_2-12 -| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | -| ------------- | ------------------------ | -------------------- | ----------------------- | ----------------------------- | -| 4.11.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.11.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.11.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.10.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.10.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.9.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.8.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.7.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.6.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.6.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | -| 4.6.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | +|-----------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.12.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.11.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.11.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.11.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.10.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.10.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.9.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.8.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.7.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.6.2 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.6.1 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | +| 4.6.0 | 3.2.0 - 3.2.1 | 8 | 2.12 | 10.\* | #### azure-cosmos-spark_3-1_2-12 -| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | -| ------------- | ------------------------ | -------------------- | ----------------------- | ----------------------------- | -| 4.11.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.11.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.11.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.10.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.10.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.9.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.8.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.7.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.6.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.6.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.6.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.5.3 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.5.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.5.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.5.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.4.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.4.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.4.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.3.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.3.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | -| 4.2.0 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.1.0 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.0.0 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.0.0-beta.3 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.0.0-beta.2 | 3.1.1 | 8 | 2.12 | 8.\* | -| 4.0.0-beta.1 | 3.1.1 | 8 | 2.12 | 8.\* | +| Connector | Supported Spark Versions | Minimum Java Version | Supported Scala Versions | Supported Databricks Runtimes | +|--------------| ------------------------ | -------------------- | ----------------------- | ----------------------------- | +| 4.12.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.11.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.11.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.11.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.10.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.10.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.9.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.8.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.7.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.6.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.6.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.6.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.5.3 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.5.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.5.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.5.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.4.2 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.4.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.4.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.3.1 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.3.0 | 3.1.1 - 3.1.2 | 8 | 2.12 | 8.\*, 9.\* | +| 4.2.0 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.1.0 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.0.0 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.0.0-beta.3 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.0.0-beta.2 | 3.1.1 | 8 | 2.12 | 8.\* | +| 4.0.0-beta.1 | 3.1.1 | 8 | 2.12 | 8.\* | ### Download You can use the maven coordinate of the jar to auto install the Spark Connector to your Databricks Runtime 8 from Maven: -`com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.11.2` +`com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.12.0` You can also integrate against Cosmos DB Spark Connector in your SBT project: ```scala -libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-2_2-12" % "4.11.2" +libraryDependencies += "com.azure.cosmos.spark" % "azure-cosmos-spark_3-2_2-12" % "4.12.0" ``` Cosmos DB Spark Connector is available on [Maven Central Repo](https://search.maven.org/search?q=g:com.azure.cosmos.spark). diff --git a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml index fe831f3fc3696..01a759deb767c 100644 --- a/sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3-2_2-12/pom.xml @@ -11,7 +11,7 @@ com.azure.cosmos.spark azure-cosmos-spark_3-2_2-12 - 4.12.0-beta.1 + 4.12.0 jar https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/cosmos/azure-cosmos-spark_3-2_2-12 OLTP Spark 3.2 Connector for Azure Cosmos DB SQL API @@ -108,7 +108,7 @@ com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 com.fasterxml.jackson.core diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md b/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md index 6e7b4bf5b4d66..255fd1c520fe4 100644 --- a/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md +++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/docs/quick-start.md @@ -23,10 +23,10 @@ You can use any other Spark 3.1.1 spark offering as well, also you should be abl SLF4J is only needed if you plan to use logging, please also download an SLF4J binding which will link the SLF4J API with the logging implementation of your choice. See the [SLF4J user manual](https://www.slf4j.org/manual.html) for more information. For Spark 3.1: -- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.11.2](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-1_2-12/4.11.2/jar) +- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12:4.12.0](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-1_2-12/4.11.2/jar) For Spark 3.2: -- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.11.2](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-2_2-12/4.11.2/jar) +- Install Cosmos DB Spark Connector, in your spark Cluster [com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12:4.12.0](https://search.maven.org/artifact/com.azure.cosmos.spark/azure-cosmos-spark_3-2_2-12/4.11.2/jar) The getting started guide is based on PySpark however you can use the equivalent scala version as well, and you can run the following code snippet in an Azure Databricks PySpark notebook. diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml index f2c0523c0f06b..930a0034bffd2 100644 --- a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml +++ b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml @@ -63,7 +63,7 @@ com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 org.scala-lang.modules diff --git a/sdk/cosmos/azure-cosmos/CHANGELOG.md b/sdk/cosmos/azure-cosmos/CHANGELOG.md index 667bf090987cd..808e4fd9275bf 100644 --- a/sdk/cosmos/azure-cosmos/CHANGELOG.md +++ b/sdk/cosmos/azure-cosmos/CHANGELOG.md @@ -1,14 +1,9 @@ ## Release History -### 4.33.0-beta.1 (Unreleased) - -#### Features Added - -#### Breaking Changes - -#### Bugs Fixed - +### 4.33.0 (2022-07-14) #### Other Changes +* Updated netty library version to `4.1.78.Final`. +* Updated `reactor-core` version to `3.4.19`. ### 4.32.1 (2022-06-30) diff --git a/sdk/cosmos/azure-cosmos/README.md b/sdk/cosmos/azure-cosmos/README.md index b63bdfcaf5adf..2741e77b25e1e 100644 --- a/sdk/cosmos/azure-cosmos/README.md +++ b/sdk/cosmos/azure-cosmos/README.md @@ -45,7 +45,7 @@ add the direct dependency to your project as follows. com.azure azure-cosmos - 4.32.1 + 4.33.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml index bb3cff85f1475..b9942375dd6ad 100644 --- a/sdk/cosmos/azure-cosmos/pom.xml +++ b/sdk/cosmos/azure-cosmos/pom.xml @@ -13,7 +13,7 @@ Licensed under the MIT License. com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 Microsoft Azure SDK for SQL API of Azure Cosmos DB Service This Package contains Microsoft Azure Cosmos SDK (with Reactive Extension Reactor support) for Azure Cosmos DB SQL API jar diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/feedranges/FeedRangeEpkImpl.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/feedranges/FeedRangeEpkImpl.java index 5c3f9c93408e3..8265cd89d38f8 100644 --- a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/feedranges/FeedRangeEpkImpl.java +++ b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/feedranges/FeedRangeEpkImpl.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import static com.azure.cosmos.BridgeInternal.setProperty; import static com.azure.cosmos.implementation.guava25.base.Preconditions.checkNotNull; @@ -175,10 +176,19 @@ public Mono populateFeedRangeFilteringHeaders( } final List pkRanges = pkRangeHolder.v; - if (pkRanges == null || pkRanges.size() == 0) { + if (pkRanges == null) { return Mono.error(new NotFoundException( - String.format("Stale cache for collection rid '%s'.", - containerRid))); + String.format( + "Stale cache for collection rid '%s', EpkRange '%s': pkRanges are null", + containerRid, + this.range))); + } + if (pkRanges.size() == 0) { + return Mono.error(new NotFoundException( + String.format( + "Stale cache for collection rid '%s', EpkRange '%s': pkRanges are empty", + containerRid, + this.range))); } // For epk range filtering we can end up in one of 3 cases: @@ -189,7 +199,12 @@ public Mono populateFeedRangeFilteringHeaders( // we need to bubble that up to the higher layers to update their // datastructures GoneException goneException = new GoneException( - String.format("Epk Range '%s' is gone.", this.range)); + String.format( + "EpkRange %s spans %s physical partitions: %s", + this.range, + pkRanges.size(), + pkRanges.stream().map(pkRange -> pkRange.getId()).collect(Collectors.toList()), + this.range)); BridgeInternal.setSubStatusCode( goneException, HttpConstants.SubStatusCodes.PARTITION_KEY_RANGE_GONE); diff --git a/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml b/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml index ff2eed19526b2..a508cf6589607 100644 --- a/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml @@ -30,7 +30,7 @@ com.azure azure-spring-data-cosmos - 3.24.0-beta.1 + 3.24.0 diff --git a/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md b/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md index 87e3d071c5707..02d4599c45f9e 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md +++ b/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md @@ -1,14 +1,9 @@ ## Release History -### 3.24.0-beta.1 (Unreleased) - -#### Features Added - -#### Breaking Changes - -#### Bugs Fixed +### 3.24.0 (2022-07-14) #### Other Changes +* Updated `azure-cosmos` to version `4.33.0`. ### 3.23.0 (2022-06-27) > [!IMPORTANT] diff --git a/sdk/cosmos/azure-spring-data-cosmos/README.md b/sdk/cosmos/azure-spring-data-cosmos/README.md index 6113c8a1a224a..31535f339531c 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/README.md +++ b/sdk/cosmos/azure-spring-data-cosmos/README.md @@ -82,7 +82,7 @@ If you are using Maven, add the following dependency. com.azure azure-spring-data-cosmos - 3.23.0 + 3.24.0 ``` [//]: # ({x-version-update-end}) diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml index 406fd265aab24..15796891b9ce6 100644 --- a/sdk/cosmos/azure-spring-data-cosmos/pom.xml +++ b/sdk/cosmos/azure-spring-data-cosmos/pom.xml @@ -12,7 +12,7 @@ com.azure azure-spring-data-cosmos - 3.24.0-beta.1 + 3.24.0 jar Spring Data for Azure Cosmos DB SQL API Spring Data for Azure Cosmos DB SQL API @@ -88,7 +88,7 @@ com.azure azure-cosmos - 4.33.0-beta.1 + 4.33.0 com.fasterxml.jackson.module