Merged latest post release version commits and resolved conflicts (Azure#45399)

Co-authored-by: azure-sdk <azuresdk@microsoft.com>

Author: kushagraThapar

eng/versioning/version_client.txt

@@ -100,7 +100,7 @@ com.azure:azure-core-test;1.27.0-beta.8;1.27.0-beta.9
 com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.56;1.0.0-beta.57
 com.azure:azure-core-tracing-opentelemetry-samples;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-core-version-tests;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-cosmos;4.70.0;4.71.0-beta.1
+com.azure:azure-cosmos;4.70.0;4.71.0-beta.2
 com.azure:azure-cosmos-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:azure-cosmos-encryption;2.20.0;2.21.0-beta.1

sdk/cosmos/azure-cosmos-benchmark/pom.xml

@@ -52,7 +52,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.71.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.71.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

sdk/cosmos/azure-cosmos-encryption/pom.xml

@@ -59,7 +59,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.71.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.71.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

sdk/cosmos/azure-cosmos-kafka-connect/pom.xml

@@ -86,7 +86,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.71.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.71.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <!-- Added this provided dependency to include necessary annotations used by "reactor-core".

sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml

@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.71.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.71.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>org.scala-lang.modules</groupId>

sdk/cosmos/azure-cosmos-test/pom.xml

@@ -59,7 +59,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.71.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.71.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
 
     <dependency>

sdk/cosmos/azure-cosmos-tests/pom.xml

@@ -100,7 +100,7 @@ Licensed under the MIT License.
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.71.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+      <version>4.71.0-beta.2</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

sdk/cosmos/azure-cosmos/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## Release History
 
-### 4.71.0-beta.1 (Unreleased)
+### 4.71.0-beta.2 (Unreleased)
 
 #### Features Added
 
@@ -10,6 +10,11 @@
 
 #### Other Changes
 
+### 4.71.0-beta.1 (2025-05-19)
+
+#### Features Added
+* Added Weighted RRF for Hybrid and Full Text Search queries - [PR 45328](https://github.com/Azure/azure-sdk-for-java/pull/45328)
+
 ### 4.70.0 (2025-05-16)
 
 #### Bugs Fixed
@@ -18,6 +23,13 @@
 #### Other Changes
 * Added a way to opt-in into Per-Partition Automatic Failover using enablement flag from the account metadata. - [PR 45317](https://github.com/Azure/azure-sdk-for-java/pull/45317)
 
+### 4.68.1 (2025-05-16)
+> [!IMPORTANT]
+> We strongly recommend customers with an upgrade-intent to upgrade to version 4.70.0 or later to include this bug fix.
+
+#### Bugs Fixed
+* Fixed an issue where child partition is getting overridden with null continuation token if a split happens during the first request of a parent partition. - See [PR 45363](https://github.com/Azure/azure-sdk-for-java/pull/45363)
+
 ### 4.69.0 (2025-05-14)
 
 #### Features Added
@@ -39,13 +51,6 @@
 * Added user agent suffixing if Per-Partition Automatic Failover or Per-Partition Circuit Breaker are enabled at client scope. - [PR 45197](https://github.com/Azure/azure-sdk-for-java/pull/45197)
 * Enable threshold-based availability strategy for reads by default when Per-Partition Automatic Failover is also enabled. - [PR 45267](https://github.com/Azure/azure-sdk-for-java/pull/45267) 
 
-### 4.68.1 (2025-05-16)
-> [!IMPORTANT]
-> We strongly recommend customers with an intent to upgrade to version 4.70.0 or later to include this bug fix.
-
-#### Bugs Fixed
-* Fixed an issue where child partition is getting overridden with null continuation token if a split happens during the first request of a parent partition. - See [PR 45363](https://github.com/Azure/azure-sdk-for-java/pull/45363)
-
 ### 4.68.0 (2025-03-20)
 
 #### Bugs Fixed

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.71.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
+  <version>4.71.0-beta.2</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>