Updated release versions for azure-cosmos 4.15.0, azure-spring-data-c…

…osmos 3.7.0 and azure-cosmos-encryption 1.0.0-beta.4 (#21357)
Azure · May 12, 2021 · 343255c · 343255c
1 parent 4e656fd
commit 343255c
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 32 deletions.
diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
@@ -159,7 +159,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.15.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -446,7 +446,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <version>3.7.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
@@ -71,7 +71,7 @@ com.azure:azure-core-serializer-json-gson;1.1.2;1.2.0-beta.1
 com.azure:azure-core-serializer-json-jackson;1.2.3;1.3.0-beta.1
 com.azure:azure-core-test;1.6.2;1.7.0-beta.1
 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.10;1.0.0-beta.11
-com.azure:azure-cosmos;4.14.0;4.15.0-beta.3
+com.azure:azure-cosmos;4.14.0;4.15.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:azure-cosmos-encryption;1.0.0-beta.3;1.0.0-beta.4
@@ -108,7 +108,7 @@ com.azure:azure-security-keyvault-jca;1.0.0-beta.6;1.0.0-beta.7
 com.azure:azure-security-keyvault-keys;4.2.7;4.3.0-beta.8
 com.azure:azure-security-keyvault-secrets;4.2.7;4.3.0-beta.6
 com.azure:azure-sdk-template;1.2.1-beta.2;1.2.1-beta.16
-com.azure:azure-spring-data-cosmos;3.6.0;3.7.0-beta.1
+com.azure:azure-spring-data-cosmos;3.6.0;3.7.0
 com.azure:azure-spring-data-cosmos-test;3.0.0-beta.1;3.0.0-beta.1
 com.azure:azure-storage-blob;12.11.0;12.12.0-beta.1
 com.azure:azure-storage-blob-batch;12.9.0;12.10.0-beta.1

diff --git a/sdk/cosmos/azure-cosmos-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-benchmark/pom.xml
@@ -43,7 +43,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.15.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

diff --git a/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml b/sdk/cosmos/azure-cosmos-dotnet-benchmark/pom.xml
@@ -42,7 +42,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.15.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

diff --git a/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md b/sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Release History
 
-## 1.0.0-beta.4 (Unreleased)
-
+## 1.0.0-beta.4 (2021-05-12)
+#### New Features
+* Todo
 
 ## 1.0.0-beta.3 (2021-04-26)
 #### New Features

diff --git a/sdk/cosmos/azure-cosmos-encryption/pom.xml b/sdk/cosmos/azure-cosmos-encryption/pom.xml
@@ -51,7 +51,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.15.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

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
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.15.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>org.scala-lang.modules</groupId>

diff --git a/sdk/cosmos/azure-cosmos/CHANGELOG.md b/sdk/cosmos/azure-cosmos/CHANGELOG.md
@@ -1,6 +1,15 @@
 ## Release History
 
-### 4.15.0-beta.3 (Unreleased)
+### 4.15.0 (2021-05-12)
+#### New Features
+* Added `backendLatencyInMs` in `CosmosDiagnostics` for `DIRECT` connection mode.
+* Added `retryContext` in `CosmosDiagnostics` for query operations.
+
+#### Key Bug Fixes
+* Fixed ignored `HttpClient` decoder configuration issue.
+* Fixed incorrect connection mode issue in `CosmosDiagnostics`.
+* Fixed issue with handling collisions in the effective partition key.
+* Fixed `CosmosQueryRequestOptions` NPE in `readAllItems` API.
 
 ### 4.15.0-beta.2 (2021-04-26)
 #### Key Bug Fixes

diff --git a/sdk/cosmos/azure-cosmos/README.md b/sdk/cosmos/azure-cosmos/README.md
@@ -14,7 +14,7 @@ This project provides SDK library in Java for interacting with [SQL API][sql_api
 <dependency>
   <groupId>com.azure</groupId>
   <artifactId>azure-cosmos</artifactId>
-  <version>4.14.0</version>
+  <version>4.15.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/cosmos/azure-cosmos/pom.xml b/sdk/cosmos/azure-cosmos/pom.xml
@@ -13,7 +13,7 @@ Licensed under the MIT License.
 
   <groupId>com.azure</groupId>
   <artifactId>azure-cosmos</artifactId>
-  <version>4.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+  <version>4.15.0</version> <!-- {x-version-update;com.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 Reactor support) for Azure Cosmos DB SQL API</description>
   <packaging>jar</packaging>

diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientEncryptionKey.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientEncryptionKey.java
@@ -10,7 +10,7 @@
  * The type Cosmos clientEncryptionKey. This contains methods to operate on a cosmos clientEncryptionKey
  * synchronously
  */
-@Beta(value = Beta.SinceVersion.V4_16_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
+@Beta(value = Beta.SinceVersion.V4_15_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
 public class CosmosClientEncryptionKey {
     private final CosmosDatabase database;
     private String id;
@@ -29,7 +29,7 @@ public class CosmosClientEncryptionKey {
      *
      * @return the id of the {@link CosmosClientEncryptionKey}
      */
-    @Beta(value = Beta.SinceVersion.V4_16_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
+    @Beta(value = Beta.SinceVersion.V4_15_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
     public String getId() {
         return id;
     }
@@ -39,7 +39,7 @@ public String getId() {
      *
      * @return the single resource response with the read client encryption key or an error.
      */
-    @Beta(value = Beta.SinceVersion.V4_16_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
+    @Beta(value = Beta.SinceVersion.V4_15_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
     public CosmosClientEncryptionKeyResponse read() {
         return this.database.blockClientEncryptionKeyResponse(this.cosmosAsyncClientEncryptionKey.read());
     }

diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDatabase.java
@@ -510,7 +510,7 @@ public ThroughputResponse readThroughput() {
      * @param id id of the clientEncryptionKey
      * @return Cosmos ClientEncryptionKey
      */
-    @Beta(value = Beta.SinceVersion.V4_16_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
+    @Beta(value = Beta.SinceVersion.V4_15_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
     public CosmosClientEncryptionKey getClientEncryptionKey(String id) {
         return new CosmosClientEncryptionKey(id, this, this.databaseWrapper.getClientEncryptionKey(id));
     }
@@ -520,7 +520,7 @@ public CosmosClientEncryptionKey getClientEncryptionKey(String id) {
      *
      * @return a {@link CosmosPagedIterable}.
      */
-    @Beta(value = Beta.SinceVersion.V4_16_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
+    @Beta(value = Beta.SinceVersion.V4_15_0, warningText = Beta.PREVIEW_SUBJECT_TO_CHANGE_WARNING)
     public CosmosPagedIterable<CosmosClientEncryptionKeyProperties> readAllClientEncryptionKeys() {
         return getCosmosPagedIterable(this.databaseWrapper.readAllClientEncryptionKeys(new CosmosQueryRequestOptions()));
     }

diff --git a/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/util/Beta.java b/sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/util/Beta.java
@@ -62,8 +62,6 @@ public enum SinceVersion {
         /** v4.14.0 */
         V4_14_0,
         /** v4.15.0 */
-        V4_15_0,
-        /** v4.16.0 */
-        V4_16_0;
+        V4_15_0;
     }
 }
diff --git a/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml b/sdk/cosmos/azure-spring-data-cosmos-test/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <version>3.7.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
     </dependency>
     <!-- Test -->
     <dependency>

diff --git a/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md b/sdk/cosmos/azure-spring-data-cosmos/CHANGELOG.md
@@ -1,10 +1,11 @@
 ## Release History
 
-### 3.7.0-beta.1 (Unreleased)
+### 3.7.0 (2021-05-12)
 #### New Features
-- Upgrade to [spring-boot-dependencies:2.4.5](https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-dependencies/2.4.5/).
-- Upgrade to [spring-cloud-dependencies:2020.0.2](https://repo.maven.apache.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2020.0.2/).
-
+* Updated Spring Boot to [spring-boot-dependencies:2.4.5](https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-dependencies/2.4.5/).
+* Updated Spring Cloud to [spring-cloud-dependencies:2020.0.2](https://repo.maven.apache.org/maven2/org/springframework/cloud/spring-cloud-dependencies/2020.0.2/).
+* Added `slice` support for queries that do not require page count.
+* Updated `azure-cosmos` to version 4.15.0.
 
 ### 3.6.0 (2021-04-06)
 #### New Features

diff --git a/sdk/cosmos/azure-spring-data-cosmos/README.md b/sdk/cosmos/azure-spring-data-cosmos/README.md
@@ -68,7 +68,7 @@ If you are using Maven, add the following dependency.
 <dependency>
     <groupId>com.azure</groupId>
     <artifactId>azure-spring-data-cosmos</artifactId>
-    <version>3.6.0</version>
+    <version>3.7.0</version>
 </dependency>
 ```
 [//]: # ({x-version-update-end})

diff --git a/sdk/cosmos/azure-spring-data-cosmos/pom.xml b/sdk/cosmos/azure-spring-data-cosmos/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>com.azure</groupId>
   <artifactId>azure-spring-data-cosmos</artifactId>
-  <version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+  <version>3.7.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
   <packaging>jar</packaging>
   <name>Spring Data for Azure Cosmos DB SQL API</name>
   <description>Spring Data for Azure Cosmos DB SQL API</description>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.15.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>

diff --git a/sdk/cosmos/pom.xml b/sdk/cosmos/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
           <groupId>com.azure</groupId>
           <artifactId>azure-cosmos</artifactId>
-          <version>4.15.0-beta.3</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+          <version>4.15.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
         </dependency>
       </dependencies>
 

diff --git a/...-spring-boot-samples/azure-spring-boot-sample-cosmos-multi-database-multi-account/pom.xml b/...-spring-boot-samples/azure-spring-boot-sample-cosmos-multi-database-multi-account/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <version>3.7.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
     </dependency>
   </dependencies>
 </project>
diff --git a/...spring-boot-samples/azure-spring-boot-sample-cosmos-multi-database-single-account/pom.xml b/...spring-boot-samples/azure-spring-boot-sample-cosmos-multi-database-single-account/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-spring-data-cosmos</artifactId>
-      <version>3.7.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
+      <version>3.7.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
     </dependency>
   </dependencies>
 </project>