Skip to content

Commit

Permalink
Merge release branch to main branch (#26756)
Browse files Browse the repository at this point in the history
* Prepare for spring release (#26695)
* Increment version for keyvault releases (#26717)
* Increment version for spring releases (#26718)
* Prepare for bom release (#26735)

Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
  • Loading branch information
backwind1233 and azure-sdk authored Jan 27, 2022
1 parent 8a507b4 commit 36ad9d6
Show file tree
Hide file tree
Showing 87 changed files with 401 additions and 210 deletions.
60 changes: 30 additions & 30 deletions eng/jacoco-test-coverage/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-jca</artifactId>
<version>2.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;current} -->
<version>2.6.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -429,52 +429,52 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-identity-spring</artifactId>
<version>1.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-identity-spring;current} -->
<version>1.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-identity-spring;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-keyvault-certificates</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-certificates;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-certificates;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-keyvault-secrets</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-secrets;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-secrets;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-servicebus-jms</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-servicebus-jms;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-servicebus-jms;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory-b2c</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory-b2c;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory-b2c;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-cosmos</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-cosmos;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-cosmos;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-storage</artifactId>
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-storage;current} -->
<version>3.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-storage;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -484,47 +484,47 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-context</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-context;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-context;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-core</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-core;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-test</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-test;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-test;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-eventhubs</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-eventhubs;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-servicebus</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-servicebus;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-servicebus;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-integration-storage-queue</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-storage-queue;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-storage</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-storage;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-storage;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-autoconfigure</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-autoconfigure;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-autoconfigure;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-messaging</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-messaging;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-messaging;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand All @@ -534,52 +534,52 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-cache</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-cache;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-cache;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-eventhubs-kafka</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-servicebus</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-servicebus;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-servicebus;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-storage-queue;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-storage-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-servicebus-core</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-test</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-test;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-test;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-servicebus-topic</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-servicebus-queue</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;current} -->
</dependency>
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-stream-binder-eventhubs</artifactId>
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;current} -->
<version>2.14.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
64 changes: 32 additions & 32 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ com.azure:azure-security-attestation;1.0.0-beta.1;1.0.0
com.azure:azure-security-confidentialledger;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-security-keyvault-administration;4.0.6;4.1.0-beta.5
com.azure:azure-security-keyvault-certificates;4.2.6;4.3.0-beta.5
com.azure:azure-security-keyvault-jca;2.4.0;2.5.0-beta.1
com.azure:azure-security-keyvault-jca;2.5.0;2.6.0-beta.1
com.azure:azure-security-test-keyvault-jca;1.0.0;1.0.0
com.azure:azure-security-keyvault-keys;4.3.6;4.4.0-beta.7
com.azure:azure-security-keyvault-secrets;4.3.6;4.4.0-beta.5
Expand Down Expand Up @@ -153,37 +153,37 @@ com.azure.spring:azure-spring-cloud-appconfiguration-config;2.3.0;2.4.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management-web;2.2.0;2.3.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management;2.2.0;2.3.0-beta.1
com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.3.0;2.4.0-beta.1
com.azure.spring:azure-identity-spring;1.12.0;1.13.0-beta.1
com.azure.spring:azure-spring-boot-bom;3.12.0;3.12.1
com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-boot-starter-active-directory;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-boot-starter-cosmos;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-certificates;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-boot-starter-storage;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-boot-starter;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-boot;3.12.0;3.13.0-beta.1
com.azure.spring:azure-spring-cloud-autoconfigure;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-context;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-dependencies;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-messaging;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-starter-cache;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-starter-eventhubs;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-starter-servicebus;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-starter-storage-queue;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-storage;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-test;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-integration-core;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-integration-eventhubs;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-integration-servicebus;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-integration-storage-queue;2.12.0;2.13.0-beta.1
com.azure.spring:azure-spring-integration-test;2.12.0;2.13.0-beta.1
com.azure.spring:azure-identity-spring;1.13.0;1.14.0-beta.1
com.azure.spring:azure-spring-boot-bom;3.12.1;3.13.0
com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-boot-starter-active-directory;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-boot-starter-cosmos;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-certificates;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-boot-starter-storage;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-boot-starter;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-boot;3.13.0;3.14.0-beta.1
com.azure.spring:azure-spring-cloud-autoconfigure;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-context;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-dependencies;2.12.0;2.13.0
com.azure.spring:azure-spring-cloud-messaging;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-starter-cache;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-starter-eventhubs;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-starter-servicebus;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-starter-storage-queue;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-storage;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-cloud-stream-binder-test;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-integration-core;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-integration-eventhubs;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-integration-servicebus;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-integration-storage-queue;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-integration-test;2.13.0;2.14.0-beta.1
com.azure.spring:azure-spring-boot-test-aad;1.0.0;1.0.0
com.azure.spring:azure-spring-boot-test-aad-b2c;1.0.0;1.0.0
com.azure.spring:azure-spring-boot-test-selenium-common;1.0.0;1.0.0
Expand Down
6 changes: 6 additions & 0 deletions sdk/boms/azure-spring-boot-bom/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Release History

## 3.13.0 (2022-01-26)
This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.2.

### Dependency Upgrades
- Upgrade to [spring-boot-dependencies:2.6.2](https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.6.2/spring-boot-dependencies-2.6.2.pom).

## 3.12.1 (2022-01-06)
This release is compatible with Spring Boot 2.5.5-2.5.8, 2.6.0-2.6.1.

Expand Down
6 changes: 3 additions & 3 deletions sdk/boms/azure-spring-boot-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-bom</artifactId>
<version>3.12.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-bom;current} -->
<version>3.13.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-bom;current} -->
<packaging>pom</packaging>

<name>Azure Spring Boot BOM</name>
Expand Down Expand Up @@ -38,10 +38,10 @@
<packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
<azure.spring.boot.version>3.12.0</azure.spring.boot.version>
<azure.core.version>1.22.0</azure.core.version>
<azure.core.version>1.24.1</azure.core.version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
<azure.identity.version>1.4.3</azure.identity.version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
<azure.keyvault.secret.version>4.3.6</azure.keyvault.secret.version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
<azure.keyvault.jca.version>2.4.0</azure.keyvault.jca.version>
<azure.keyvault.jca.version>2.5.0</azure.keyvault.jca.version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;dependency} -->
<azure.msal.version>1.11.0</azure.msal.version> <!-- {x-version-update;com.microsoft.azure:msal4j;external_dependency} -->
<azure.servicebus.jms.version>0.0.9</azure.servicebus.jms.version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms;external_dependency} -->
<azure.spring.data.cosmos.version>3.17.0</azure.spring.data.cosmos.version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;dependency} -->
Expand Down
Loading

0 comments on commit 36ad9d6

Please sign in to comment.