Merge branch 'main' into enableHttp2PublicAPI

eng/automation/generate.py

@@ -249,6 +249,8 @@ def sdk_automation_typespec_project(tsp_project: str, config: dict) -> dict:
     head_sha: str = config["headSha"]
     repo_url: str = config["repoHttpsUrl"]
     breaking: bool = False
+    changelog = ""
+    breaking_change_items = []
 
     succeeded, require_sdk_integration, sdk_folder, service, module = generate_typespec_project(
         tsp_project, sdk_root, spec_root, head_sha, repo_url, remove_before_regen=True, group_id=GROUP_ID

eng/automation/generate_utils.py

@@ -389,9 +389,7 @@ def generate_typespec_project(
             logging.info("SDK folder: " + sdk_folder)
             if sdk_folder:
                 # parse service and module
-                match = re.match(r"sdk[\\/](.*)[\\/](.*)", sdk_folder)
-                service = match.group(1)
-                module = match.group(2)
+                module, service = parse_service_module(sdk_folder)
                 # check require_sdk_integration
                 cmd = ["git", "add", "."]
                 check_call(cmd, sdk_root)
@@ -418,10 +416,27 @@ def generate_typespec_project(
                 succeeded = True
     except subprocess.CalledProcessError as error:
         logging.error(f"[GENERATE] Code generation failed. tsp-client init fails: {error}")
+        try:
+            sdk_folder = find_sdk_folder(sdk_root)
+            logging.info("SDK folder: " + sdk_folder)
+            if sdk_folder:
+                # parse service and module
+                module, service = parse_service_module(sdk_folder)
+            else:
+                logging.info(f"[GENERATE] Code generation failed. No sdk folder found.")
+        except Exception as e:
+            logging.error(f"[GENERATE] Code generation failed. Finding sdk folder fails: {e}")
 
     return succeeded, require_sdk_integration, sdk_folder, service, module
 
 
+def parse_service_module(sdk_folder: str) -> Tuple:
+    match = re.match(r"sdk[\\/](.*)[\\/](.*)", sdk_folder)
+    service = match.group(1)
+    module = match.group(2)
+    return module, service
+
+
 def check_call(cmd: List[str], work_dir: str, shell: bool = False):
     logging.info("Command line: " + " ".join(cmd))
     subprocess.check_call(cmd, cwd=work_dir, shell=shell)

eng/versioning/version_client.txt

@@ -107,11 +107,11 @@ 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:azure-cosmos-encryption;2.16.0;2.17.0-beta.1
-com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.34.0;4.35.0-beta.1
-com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.34.0;4.35.0-beta.1
-com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12;4.34.0;4.35.0-beta.1
-com.azure.cosmos.spark:azure-cosmos-spark_3-4_2-12;4.34.0;4.35.0-beta.1
-com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;4.34.0;4.35.0-beta.1
+com.azure.cosmos.spark:azure-cosmos-spark_3-1_2-12;4.34.0;4.35.0
+com.azure.cosmos.spark:azure-cosmos-spark_3-2_2-12;4.34.0;4.35.0
+com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12;4.34.0;4.35.0
+com.azure.cosmos.spark:azure-cosmos-spark_3-4_2-12;4.34.0;4.35.0
+com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;4.34.0;4.35.0
 com.azure.cosmos.spark:azure-cosmos-spark-account-data-resolver-sample;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-cosmos-test;1.0.0-beta.9;1.0.0-beta.10
 com.azure:azure-cosmos-tests;1.0.0-beta.1;1.0.0-beta.1
@@ -264,32 +264,32 @@ com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.18.0;5.19.0-
 com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.18.0;5.19.0-beta.1
 com.azure.spring:spring-cloud-azure-testcontainers;5.18.0;5.19.0-beta.1
 com.azure:azure-spring-data-cosmos;5.18.0;5.19.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-appplatform;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-appservice;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-authorization;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-cdn;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-compute;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-containerservice;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-cosmos;2.44.1;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-dns;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-keyvault;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-monitor;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-msi;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-network;2.44.0;2.45.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-appplatform;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-appservice;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-authorization;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-cdn;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-compute;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-containerinstance;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-containerregistry;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-containerservice;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-cosmos;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-dns;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-eventhubs;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-keyvault;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-monitor;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-msi;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-network;2.45.0;2.46.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-privatedns;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-resources;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-redis;2.44.0;2.45.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-privatedns;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-resources;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-redis;2.45.0;2.46.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-samples;2.0.0-beta.1;2.0.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-search;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-servicebus;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-sql;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-storage;2.44.0;2.45.0-beta.1
-com.azure.resourcemanager:azure-resourcemanager-trafficmanager;2.44.0;2.45.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-search;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-servicebus;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-sql;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-storage;2.45.0;2.46.0-beta.1
+com.azure.resourcemanager:azure-resourcemanager-trafficmanager;2.45.0;2.46.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-test;2.0.0-beta.1;2.0.0-beta.1
 com.azure.resourcemanager:azure-resourcemanager-mediaservices;2.3.0;2.4.0-beta.3
 com.azure.resourcemanager:azure-resourcemanager-mysql;1.0.2;1.1.0-beta.1

sdk/apicenter/azure-resourcemanager-apicenter/pom.xml

@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/apimanagement/azure-resourcemanager-apimanagement/pom.xml

@@ -93,7 +93,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/applicationinsights/azure-resourcemanager-applicationinsights/pom.xml

@@ -92,7 +92,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/avs/azure-resourcemanager-avs/pom.xml

@@ -78,7 +78,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/batch/azure-compute-batch/pom.xml

@@ -87,7 +87,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/batch/azure-resourcemanager-batch/pom.xml

@@ -77,7 +77,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-storage</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-storage;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/boms/spring-cloud-azure-dependencies/pom.xml

@@ -60,7 +60,7 @@
       <dependency>
         <groupId>com.azure.resourcemanager</groupId>
         <artifactId>azure-resourcemanager</artifactId>
-        <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
+        <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
       </dependency>
 
       <!-- Spring Cloud Azure -->

sdk/changeanalysis/azure-resourcemanager-changeanalysis/pom.xml

@@ -56,7 +56,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/chaos/azure-resourcemanager-chaos/pom.xml

@@ -90,13 +90,13 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-keyvault</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-keyvault;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/cognitiveservices/azure-resourcemanager-cognitiveservices/pom.xml

@@ -92,7 +92,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/computefleet/azure-resourcemanager-computefleet/pom.xml

@@ -78,13 +78,13 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-network</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-network;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/confidentialledger/azure-resourcemanager-confidentialledger/pom.xml

@@ -91,7 +91,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/confluent/azure-resourcemanager-confluent/pom.xml

@@ -90,7 +90,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/containerregistry/azure-containers-containerregistry-perf/pom.xml

@@ -53,7 +53,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-containerregistry</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

sdk/containerregistry/azure-containers-containerregistry/pom.xml

@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-containerregistry</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-containerregistry;dependency} -->
       <scope>test</scope>
     </dependency>
     <dependency>

sdk/containerservicefleet/azure-resourcemanager-containerservicefleet/pom.xml

@@ -73,7 +73,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-resources</artifactId>
-      <version>2.44.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-resources;dependency} -->
       <scope>test</scope>
     </dependency>
   </dependencies>

sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/pom.xml

@@ -97,7 +97,7 @@
     <dependency>
       <groupId>com.azure.cosmos.spark</groupId>
       <artifactId>azure-cosmos-spark_3-5_2-12</artifactId>
-      <version>4.35.0-beta.1</version> <!-- {x-version-update;com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;current} -->
+      <version>4.35.0</version> <!-- {x-version-update;com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;current} -->
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-cosmos</artifactId>
-      <version>2.44.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-cosmos;dependency} -->
+      <version>2.45.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-cosmos;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -293,7 +293,7 @@
                 <include>com.fasterxml.jackson.core:jackson-databind:[2.15.2]</include> <!-- {x-include-update;cosmos_com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
                 <include>com.fasterxml.jackson.module:jackson-module-scala_2.12:[2.15.2]</include> <!-- {x-include-update;cosmos_com.fasterxml.jackson.module:jackson-module-scala_2.12;external_dependency} -->
                 <include>com.globalmentor:hadoop-bare-naked-local-fs:[0.1.0]</include> <!-- {x-include-update;cosmos_com.globalmentor:hadoop-bare-naked-local-fs;external_dependency} -->
-                <include>com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12:[4.35.0-beta.1]</include> <!-- {x-include-update;com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;current} -->
+                <include>com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12:[4.35.0]</include> <!-- {x-include-update;com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;current} -->
               </includes>
             </bannedDependencies>
           </rules>

sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md

@@ -1,16 +1,10 @@
 ## Release History
 
-### 4.35.0-beta.1 (Unreleased)
-
-#### Features Added
-
-#### Breaking Changes
+### 4.35.0 (2024-11-27)
 
 #### Bugs Fixed
 * Fixed an issue when using `ChangeFeed` causing some cosmos partitions to not be fully processed in some cases. - See [PR 42553](https://github.com/Azure/azure-sdk-for-java/pull/42553)
 
-#### Other Changes
-
 ### 4.34.0 (2024-10-10)
 > [!IMPORTANT]
 > We strongly recommend our customers to use version 4.34.0 and above.