Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -465,117 +465,117 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-core</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-core;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-resourcemanager</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-resourcemanager;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-resourcemanager;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-messaging-azure</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-messaging-azure;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-messaging-azure;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-messaging-azure-eventhubs</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-messaging-azure-eventhubs;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-messaging-azure-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-messaging-azure-servicebus</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-messaging-azure-servicebus;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-messaging-azure-servicebus;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-messaging-azure-storage-queue</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-messaging-azure-storage-queue;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-messaging-azure-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-integration-azure-core</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-integration-azure-core;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-integration-azure-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-integration-azure-eventhubs</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-integration-azure-eventhubs;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-integration-azure-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-integration-azure-servicebus</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-integration-azure-servicebus;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-integration-azure-servicebus;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-integration-azure-storage-queue</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-integration-azure-storage-queue;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-integration-azure-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-autoconfigure</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-autoconfigure;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-autoconfigure;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-stream-binder-servicebus-core</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-stream-binder-servicebus</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-servicebus;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-stream-binder-eventhubs</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-stream-binder-eventhubs-core</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-service</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-service;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-service;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-actuator</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-actuator-autoconfigure</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator-autoconfigure;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-actuator-autoconfigure;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-feature-management</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-feature-management;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-feature-management;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-feature-management-web</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-feature-management-web;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-feature-management-web;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-spring-data-cosmos</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
100 changes: 50 additions & 50 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -190,56 +190,56 @@ com.azure:azure-identity-extensions;1.1.7;1.2.0-beta.2
com.azure:azure-analytics-purview-sharing;1.0.0-beta.2;1.0.0-beta.3
com.azure.spring:azure-monitor-spring-native;1.0.0-beta.1;1.0.0-beta.1
com.azure.spring:azure-monitor-spring-native-test;1.0.0-beta.1;1.0.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-feature-management-web;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-feature-management;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-dependencies;5.4.0;5.5.0-beta.1
com.azure.spring:spring-messaging-azure;5.4.0;5.5.0-beta.1
com.azure.spring:spring-messaging-azure-eventhubs;5.4.0;5.5.0-beta.1
com.azure.spring:spring-messaging-azure-servicebus;5.4.0;5.5.0-beta.1
com.azure.spring:spring-messaging-azure-storage-queue;5.4.0;5.5.0-beta.1
com.azure.spring:spring-integration-azure-core;5.4.0;5.5.0-beta.1
com.azure.spring:spring-integration-azure-eventhubs;5.4.0;5.5.0-beta.1
com.azure.spring:spring-integration-azure-servicebus;5.4.0;5.5.0-beta.1
com.azure.spring:spring-integration-azure-storage-queue;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-core;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-actuator;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-autoconfigure;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-resourcemanager;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-service;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-active-directory;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-actuator;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-cosmos;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-eventhubs;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-eventgrid;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-keyvault;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-servicebus;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-storage;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-storage-blob;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-storage-queue;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-starter;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.4.0;5.5.0-beta.1
com.azure:azure-spring-data-cosmos;5.4.0;5.5.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-appconfiguration-config;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-feature-management-web;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-feature-management;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-dependencies;5.4.0;5.5.0
com.azure.spring:spring-messaging-azure;5.4.0;5.5.0
com.azure.spring:spring-messaging-azure-eventhubs;5.4.0;5.5.0
com.azure.spring:spring-messaging-azure-servicebus;5.4.0;5.5.0
com.azure.spring:spring-messaging-azure-storage-queue;5.4.0;5.5.0
com.azure.spring:spring-integration-azure-core;5.4.0;5.5.0
com.azure.spring:spring-integration-azure-eventhubs;5.4.0;5.5.0
com.azure.spring:spring-integration-azure-servicebus;5.4.0;5.5.0
com.azure.spring:spring-integration-azure-storage-queue;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-core;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-actuator-autoconfigure;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-actuator;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-autoconfigure;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-resourcemanager;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-service;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-active-directory;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-active-directory-b2c;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-actuator;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-appconfiguration;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-cosmos;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-data-cosmos;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-eventhubs;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-eventgrid;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-jdbc-mysql;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-jdbc-postgresql;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-keyvault;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-keyvault-certificates;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-keyvault-secrets;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-servicebus-jms;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-servicebus;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-storage;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-storage-blob;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-storage-file-share;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-storage-queue;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-integration-eventhubs;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-integration-servicebus;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-integration-storage-queue;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-stream-eventhubs;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter-stream-servicebus;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-starter;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs-core;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-stream-binder-eventhubs;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-stream-binder-servicebus-core;5.4.0;5.5.0
com.azure.spring:spring-cloud-azure-stream-binder-servicebus;5.4.0;5.5.0
com.azure:azure-spring-data-cosmos;5.4.0;5.5.0
com.azure.resourcemanager:azure-resourcemanager;2.29.0;2.30.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-appplatform;2.29.0;2.30.0-beta.1
com.azure.resourcemanager:azure-resourcemanager-appservice;2.29.0;2.30.0-beta.1
Expand Down
4 changes: 2 additions & 2 deletions sdk/boms/spring-cloud-azure-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-dependencies</artifactId>
<version>5.5.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
<version>5.5.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-dependencies;current} -->
<packaging>pom</packaging>

<name>Spring Cloud Azure Dependencies</name>
Expand Down Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-sdk-bom</artifactId>
<version>1.2.15</version> <!-- NOTE: This should be updated manually. -->
<version>1.2.16</version> <!-- NOTE: This should be updated manually. -->
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
15 changes: 13 additions & 2 deletions sdk/spring/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# Release History
# (Unreleased)
Upgrade Spring Boot dependencies version to 3.1.2 and Spring Cloud dependencies version to 2022.0.4

## 5.5.0 (2023-08-28)
- This release is compatible with Spring Boot 3.0.0-3.1.2. (Note: 3.1.x (x>2) should be supported, but they aren't tested with this release.)
- This release is compatible with Spring Cloud 2022.0.0-2022.0.4. (Note: 2022.0.x (x>4) should be supported, but they aren't tested with this release.)

### Spring Cloud Azure Dependencies (BOM)

#### Dependency Updates
- Upgrade `azure-sdk-bom` to 1.2.16.

### Azure Spring Data Cosmos
This section includes changes in `azure-spring-data-cosmos` module.
Please refer to [azure-spring-data-cosmos/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/blob/main/sdk/spring/azure-spring-data-cosmos/CHANGELOG.md#550-2023-08-28) for more details.

## 5.4.0 (2023-08-02)
- This release is compatible with Spring Boot 3.0.0-3.1.0. (Note: 3.0.x (x>1) should be supported, but they aren't tested with this release.)
Expand Down
4 changes: 2 additions & 2 deletions sdk/spring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@ Current binder implementations include:

If you’re a Maven user, add our BOM to your pom.xml `<dependencyManagement>` section. This will allow you to not specify versions for any of the Maven dependencies and instead delegate versioning to the BOM.

[//]: # ({x-version-update-start;com.azure.spring:spring-cloud-azure-dependencies;dependency})
[//]: # ({x-version-update-start;com.azure.spring:spring-cloud-azure-dependencies;current})
```xml
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-dependencies</artifactId>
<version>5.3.0</version>
<version>5.5.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
8 changes: 1 addition & 7 deletions sdk/spring/azure-spring-data-cosmos/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
## Release History

### 5.5.0-beta.1 (Unreleased)

#### Features Added

#### Breaking Changes
### 5.5.0 (2023-08-28)

#### Bugs Fixed
* Fixed an issue with IN statement in annotated queries not working for `Long` data type - See [PR 36267](https://github.com/Azure/azure-sdk-for-java/pull/36267).

#### Other Changes

### 5.4.0 (2023-08-02)

#### Features Added
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-data-cosmos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ If you are using Maven, add the following dependency.
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-spring-data-cosmos</artifactId>
<version>5.4.0</version>
<version>5.5.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
Loading