Skip to content

Commit

Permalink
Merge Spring December release branch to main (#26352)
Browse files Browse the repository at this point in the history
  • Loading branch information
yiliuTo committed Jan 11, 2022
1 parent b1569cd commit 8438ec9
Show file tree
Hide file tree
Showing 108 changed files with 788 additions and 244 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 @@ -268,7 +268,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-jca</artifactId>
<version>2.4.0</version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;current} -->
<version>2.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -424,52 +424,52 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-identity-spring</artifactId>
<version>1.12.0</version> <!-- {x-version-update;com.azure.spring:azure-identity-spring;current} -->
<version>1.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot;current} -->
<version>3.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter;current} -->
<version>3.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory;current} -->
<version>3.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-certificates;current} -->
<version>3.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-secrets;current} -->
<version>3.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-servicebus-jms;current} -->
<version>3.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-active-directory-b2c;current} -->
<version>3.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-cosmos;current} -->
<version>3.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-storage;current} -->
<version>3.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-storage;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand All @@ -479,47 +479,47 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-context</artifactId>
<version>2.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-context;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-core;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-test;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-eventhubs;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-servicebus;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-integration-storage-queue;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-storage;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-autoconfigure;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-messaging;current} -->
<version>2.13.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-messaging;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand All @@ -529,52 +529,52 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-starter-cache</artifactId>
<version>2.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-cache;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-servicebus;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-starter-storage-queue;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-test;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;current} -->
<version>2.13.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.12.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;current} -->
<version>2.13.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
5 changes: 4 additions & 1 deletion eng/pipelines/templates/jobs/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ parameters:
- name: PreBuildSteps
type: object
default: []
- name: MavenVerifyAdditionalOptions
type: string
default: ''

jobs:
- job: 'Build'
Expand Down Expand Up @@ -297,7 +300,7 @@ jobs:
displayName: 'Run SpotBugs, Checkstyle, RevApi, and Javadoc'
inputs:
mavenPomFile: pom.xml
options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true -pl $(ProjectList)'
options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip -Dverify-readme -Dmaven.main.skip=true -Dmaven.test.skip=true ${{ parameters.MavenVerifyAdditionalOptions }} -pl $(ProjectList)'
mavenOptions: '$(MemoryOptions)'
javaHomeOption: 'JDKVersion'
jdkVersionOption: $(JavaBuildVersion)
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/templates/stages/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ parameters:
- name: PreBuildSteps
type: object
default: []
- name: MavenVerifyAdditionalOptions
type: string
default: ''

stages:
- stage: Build
Expand Down Expand Up @@ -79,6 +82,7 @@ stages:
- TestOptions=.*/-am
- AZURE_TEST.*=.*/
PreBuildSteps: ${{ parameters.PreBuildSteps }}
MavenVerifyAdditionalOptions: ${{ parameters.MavenVerifyAdditionalOptions }}


# The Prerelease and Release stages are conditioned on whether we are building a pull request and the branch.
Expand Down
72 changes: 36 additions & 36 deletions eng/versioning/version_client.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ com.azure:azure-security-attestation;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-security-confidentialledger;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-security-keyvault-administration;4.0.5;4.1.0-beta.4
com.azure:azure-security-keyvault-certificates;4.2.5;4.3.0-beta.4
com.azure:azure-security-keyvault-jca;2.3.0;2.4.0
com.azure:azure-security-keyvault-jca;2.4.0;2.5.0-beta.1
com.azure:azure-security-test-keyvault-jca;1.0.0;1.0.0
com.azure:azure-security-keyvault-keys;4.3.5;4.4.0-beta.6
com.azure:azure-security-keyvault-secrets;4.3.5;4.4.0-beta.4
Expand Down Expand Up @@ -146,42 +146,42 @@ com.microsoft.azure:spring-cloud-azure-appconfiguration-config;1.3.0;1.4.0-beta.
com.microsoft.azure:spring-cloud-azure-feature-management-web;1.3.0;1.4.0-beta.1
com.microsoft.azure:spring-cloud-azure-feature-management;1.3.0;1.4.0-beta.1
com.microsoft.azure:spring-cloud-starter-azure-appconfiguration-config;1.3.0;1.4.0-beta.1
com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.2.0;2.3.0-beta.1
com.azure.spring:azure-spring-cloud-appconfiguration-config;2.2.0;2.3.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management-web;2.1.0;2.2.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management;2.1.0;2.2.0-beta.1
com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.2.0;2.3.0-beta.1
com.azure.spring:azure-identity-spring;1.11.0;1.12.0
com.azure.spring:azure-spring-boot-bom;3.11.0;3.12.0
com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.11.0;3.12.0
com.azure.spring:azure-spring-boot-starter-active-directory;3.11.0;3.12.0
com.azure.spring:azure-spring-boot-starter-cosmos;3.11.0;3.12.0
com.azure.spring:azure-spring-boot-starter-keyvault-certificates;3.11.0;3.12.0
com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.11.0;3.12.0
com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.11.0;3.12.0
com.azure.spring:azure-spring-boot-starter-storage;3.11.0;3.12.0
com.azure.spring:azure-spring-boot-starter;3.11.0;3.12.0
com.azure.spring:azure-spring-boot;3.11.0;3.12.0
com.azure.spring:azure-spring-cloud-autoconfigure;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-context;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.3.0;2.4.0-beta.1
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.11.0;2.12.0
com.azure.spring:azure-spring-cloud-starter-cache;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-starter-eventhubs-kafka;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-starter-eventhubs;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-starter-servicebus;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-starter-storage-queue;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-storage;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-stream-binder-eventhubs;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-core;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-queue;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-stream-binder-servicebus-topic;2.11.0;2.12.0
com.azure.spring:azure-spring-cloud-stream-binder-test;2.11.0;2.12.0
com.azure.spring:azure-spring-integration-core;2.11.0;2.12.0
com.azure.spring:azure-spring-integration-eventhubs;2.11.0;2.12.0
com.azure.spring:azure-spring-integration-servicebus;2.11.0;2.12.0
com.azure.spring:azure-spring-integration-storage-queue;2.11.0;2.12.0
com.azure.spring:azure-spring-integration-test;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-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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 2.3.0-beta.1 (Unreleased)
## 2.4.0-beta.1 (Unreleased)

### Features Added

Expand All @@ -10,6 +10,9 @@

### Other Changes

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

## 2.2.0 (2021-11-25)

* Fixed a bug where JsonNode type was passed to Spring instead of a String, when the JsonNode was a number Spring had issues resolving the value.
Expand Down
Loading

0 comments on commit 8438ec9

Please sign in to comment.