Skip to content

Commit 9c59040

Browse files
trasktrask
authored
Merge branch 'main' into stable-code-attrs
2 parents 9b25e89 + 751a37d commit 9c59040

File tree

32 files changed

+371
-293
lines changed

32 files changed

+371
-293
lines changed

‎eng/common/TestResources/TestResources-Helpers.ps1‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ function LintBicepFile([string] $path) {
185185
}
186186

187187
# Work around lack of config file override: https://github.com/Azure/bicep/issues/5013
188-
$output = bicep lint $path 2>&1
189-
190188
if ($useBicepCli) {
191189
$output = bicep lint $path 2>&1
192190
} else {

‎eng/versioning/version_client.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,19 +102,19 @@ com.azure:azure-core-test;1.27.0-beta.13;1.27.0-beta.14
102102
com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.61;1.0.0-beta.62
103103
com.azure:azure-core-tracing-opentelemetry-samples;1.0.0-beta.1;1.0.0-beta.1
104104
com.azure:azure-core-version-tests;1.0.0-beta.1;1.0.0-beta.1
105-
com.azure:azure-cosmos;4.74.0;4.75.0-beta.1
105+
com.azure:azure-cosmos;4.74.0;4.75.0
106106
com.azure:azure-cosmos-benchmark;4.0.1-beta.1;4.0.1-beta.1
107107
com.azure.cosmos.spark:azure-cosmos-spark_3_2-12;1.0.0-beta.1;1.0.0-beta.1
108-
com.azure:azure-cosmos-encryption;2.23.0;2.24.0-beta.1
108+
com.azure:azure-cosmos-encryption;2.23.0;2.24.0
109109
com.azure.cosmos.spark:azure-cosmos-spark-account-data-resolver-sample;1.0.0-beta.1;1.0.0-beta.1
110110
com.azure:azure-cosmos-test;1.0.0-beta.14;1.0.0-beta.15
111-
com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12;4.40.0;4.41.0-beta.1
112-
com.azure.cosmos.spark:azure-cosmos-spark_3-4_2-12;4.40.0;4.41.0-beta.1
113-
com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;4.40.0;4.41.0-beta.1
114-
com.azure.cosmos.spark:fabric-cosmos-spark-auth_3;1.0.0;1.1.0-beta.1
111+
com.azure.cosmos.spark:azure-cosmos-spark_3-3_2-12;4.40.0;4.41.0
112+
com.azure.cosmos.spark:azure-cosmos-spark_3-4_2-12;4.40.0;4.41.0
113+
com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;4.40.0;4.41.0
114+
com.azure.cosmos.spark:fabric-cosmos-spark-auth_3;1.0.0;1.1.0
115115
com.azure:azure-cosmos-tests;1.0.0-beta.1;1.0.0-beta.1
116116
com.azure:azure-data-appconfiguration;1.8.4;1.9.0-beta.1
117-
com.azure.cosmos.kafka:azure-cosmos-kafka-connect;2.5.0;2.6.0-beta.1
117+
com.azure.cosmos.kafka:azure-cosmos-kafka-connect;2.5.0;2.6.0
118118
com.azure:azure-data-appconfiguration-perf;1.0.0-beta.1;1.0.0-beta.1
119119
com.azure:azure-data-schemaregistry;1.5.8;1.6.0-beta.1
120120
com.azure:azure-data-schemaregistry-apacheavro;1.1.29;1.2.0-beta.3

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ Licensed under the MIT License.
5252
<dependency>
5353
<groupId>com.azure</groupId>
5454
<artifactId>azure-cosmos</artifactId>
55-
<version>4.75.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
55+
<version>4.75.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
5656
</dependency>
5757

5858
<dependency>
5959
<groupId>com.azure</groupId>
6060
<artifactId>azure-cosmos-encryption</artifactId>
61-
<version>2.24.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
61+
<version>2.24.0</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
6262
</dependency>
6363

6464
<dependency>

‎sdk/cosmos/azure-cosmos-encryption/CHANGELOG.md‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
## Release History
22

3-
### 2.24.0-beta.1 (Unreleased)
4-
5-
#### Features Added
6-
7-
#### Breaking Changes
8-
9-
#### Bugs Fixed
10-
3+
### 2.24.0 (2025-10-21)
114
#### Other Changes
5+
* Updated `azure-cosmos` to version `4.75.0`.
126

137
### 2.23.0 (2025-09-05)
148

‎sdk/cosmos/azure-cosmos-encryption/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The Azure Cosmos Encryption Plugin is used for encrypting data with a user-provi
1212
<dependency>
1313
<groupId>com.azure</groupId>
1414
<artifactId>azure-cosmos-encryption</artifactId>
15-
<version>2.23.0</version>
15+
<version>2.24.0</version>
1616
</dependency>
1717
```
1818
[//]: # ({x-version-update-end})

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Licensed under the MIT License.
1313

1414
<groupId>com.azure</groupId>
1515
<artifactId>azure-cosmos-encryption</artifactId>
16-
<version>2.24.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
16+
<version>2.24.0</version> <!-- {x-version-update;com.azure:azure-cosmos-encryption;current} -->
1717
<name>Encryption Plugin for Azure Cosmos DB SDK</name>
1818
<description>This Package contains Encryption Plugin for Microsoft Azure Cosmos SDK</description>
1919
<packaging>jar</packaging>
@@ -59,7 +59,7 @@ Licensed under the MIT License.
5959
<dependency>
6060
<groupId>com.azure</groupId>
6161
<artifactId>azure-cosmos</artifactId>
62-
<version>4.75.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
62+
<version>4.75.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
6363
</dependency>
6464

6565
<dependency>

‎sdk/cosmos/azure-cosmos-kafka-connect/CHANGELOG.md‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
## Release History
22

3-
### 2.6.0-beta.1 (Unreleased)
4-
5-
#### Features Added
6-
7-
#### Breaking Changes
8-
9-
#### Bugs Fixed
10-
3+
### 2.6.0 (2025-10-21)
114
#### Other Changes
5+
* Updated `azure-cosmos` to version `4.75.0`.
126

137
### 2.5.1 (2025-08-22)
148

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Licensed under the MIT License.
1313

1414
<groupId>com.azure.cosmos.kafka</groupId>
1515
<artifactId>azure-cosmos-kafka-connect</artifactId>
16-
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure.cosmos.kafka:azure-cosmos-kafka-connect;current} -->
16+
<version>2.6.0</version> <!-- {x-version-update;com.azure.cosmos.kafka:azure-cosmos-kafka-connect;current} -->
1717
<name>Apache Kafka Connect connector for Azure Cosmos DB</name>
1818
<description>This Package contains an Apache Kafka Connect source and sink connector for Azure Cosmos DB</description>
1919
<packaging>jar</packaging>
@@ -86,7 +86,7 @@ Licensed under the MIT License.
8686
<dependency>
8787
<groupId>com.azure</groupId>
8888
<artifactId>azure-cosmos</artifactId>
89-
<version>4.75.0-beta.1</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
89+
<version>4.75.0</version> <!-- {x-version-update;com.azure:azure-cosmos;current} -->
9090
</dependency>
9191

9292
<!-- Added this provided dependency to include necessary annotations used by "reactor-core".

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<dependency>
9898
<groupId>com.azure.cosmos.spark</groupId>
9999
<artifactId>azure-cosmos-spark_3-5_2-12</artifactId>
100-
<version>4.41.0-beta.1</version> <!-- {x-version-update;com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;current} -->
100+
<version>4.41.0</version> <!-- {x-version-update;com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;current} -->
101101
<scope>provided</scope>
102102
</dependency>
103103
<dependency>
@@ -292,7 +292,7 @@
292292
<include>com.fasterxml.jackson.core:jackson-databind:[2.15.2]</include> <!-- {x-include-update;cosmos_com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
293293
<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} -->
294294
<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} -->
295-
<include>com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12:[4.41.0-beta.1]</include> <!-- {x-include-update;com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;current} -->
295+
<include>com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12:[4.41.0]</include> <!-- {x-include-update;com.azure.cosmos.spark:azure-cosmos-spark_3-5_2-12;current} -->
296296
</includes>
297297
</bannedDependencies>
298298
</rules>

‎sdk/cosmos/azure-cosmos-spark_3-3_2-12/CHANGELOG.md‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
## Release History
22

3-
### 4.41.0-beta.1 (Unreleased)
3+
### 4.41.0 (2025-10-21)
44

55
#### Features Added
66
* Added support `spark.cosmos.write.strategy` value `ItemPatchIfExists` which allows gracefully ignoring documents/patch-instructions when the document does not exist (anymore). - See [47034](https://github.com/Azure/azure-sdk-for-java/pull/47034)
77
* Added support to optionally omit info about spark environment and/or machine-info for driver/executors from `UserAgent` header via new config `spark.cosmos.userAgent.format` (allowed values are `SparkEnvAndWorkers` (default value), `OnlySparkEnv` and `NoSparkEnv`. - See [47047](https://github.com/Azure/azure-sdk-for-java/pull/47047)
88

9-
#### Breaking Changes
10-
11-
#### Bugs Fixed
12-
13-
#### Other Changes
14-
159
### 4.40.0 (2025-09-27)
1610

1711
#### Features Added

0 commit comments

Comments
 (0)