Merge spring-cloud-azure_4.4.1 to main - #31857
Merged
Merged
Conversation
* Update spring-cloud-azure related version manually * Update release version * update ChangeLog * update ChangeLog
* Fix Azure#31716. NoClassDefFoundError. * Make UserPrincipalManager#getRoles more robust.
# Conflicts: # .vscode/cspell.json # eng/code-quality-reports/src/main/resources/revapi/revapi.json # eng/jacoco-test-coverage/pom.xml # eng/versioning/version_client.txt # sdk/boms/spring-cloud-azure-dependencies/pom.xml # sdk/spring/CHANGELOG.md # sdk/spring/README.md # sdk/spring/spring-cloud-azure-actuator-autoconfigure/CHANGELOG.md # sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml # sdk/spring/spring-cloud-azure-actuator/CHANGELOG.md # sdk/spring/spring-cloud-azure-actuator/pom.xml # sdk/spring/spring-cloud-azure-autoconfigure/CHANGELOG.md # sdk/spring/spring-cloud-azure-autoconfigure/pom.xml # sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/aadb2c/AadB2cOidcLoginConfigurer.java # sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/AbstractAzureServiceConfigurationTests.java # sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/oauth2/AadOAuth2ClientConfigurationTests.java # sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aad/implementation/webapp/AadOAuth2AuthorizationCodeGrantRequestEntityConverterTests.java # sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/aadb2c/implementation/AadB2cAutoConfigurationTests.java # sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/useragent/CosmosUserAgentTests.java # sdk/spring/spring-cloud-azure-autoconfigure/src/test/resources/aad/access-token-response.json # sdk/spring/spring-cloud-azure-core/CHANGELOG.md # sdk/spring/spring-cloud-azure-core/pom.xml # sdk/spring/spring-cloud-azure-integration-tests/pom.xml # sdk/spring/spring-cloud-azure-resourcemanager/CHANGELOG.md # sdk/spring/spring-cloud-azure-resourcemanager/pom.xml # sdk/spring/spring-cloud-azure-service/CHANGELOG.md # sdk/spring/spring-cloud-azure-service/pom.xml # sdk/spring/spring-cloud-azure-starter-active-directory-b2c/pom.xml # sdk/spring/spring-cloud-azure-starter-active-directory/pom.xml # sdk/spring/spring-cloud-azure-starter-actuator/pom.xml # sdk/spring/spring-cloud-azure-starter-appconfiguration/pom.xml # sdk/spring/spring-cloud-azure-starter-cosmos/pom.xml # sdk/spring/spring-cloud-azure-starter-data-cosmos/pom.xml # sdk/spring/spring-cloud-azure-starter-eventhubs/pom.xml # sdk/spring/spring-cloud-azure-starter-integration-eventhubs/pom.xml # sdk/spring/spring-cloud-azure-starter-integration-servicebus/pom.xml # sdk/spring/spring-cloud-azure-starter-integration-storage-queue/pom.xml # sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml # sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml # sdk/spring/spring-cloud-azure-starter-keyvault/pom.xml # sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml # sdk/spring/spring-cloud-azure-starter-servicebus/pom.xml # sdk/spring/spring-cloud-azure-starter-storage-blob/pom.xml # sdk/spring/spring-cloud-azure-starter-storage-file-share/pom.xml # sdk/spring/spring-cloud-azure-starter-storage-queue/pom.xml # sdk/spring/spring-cloud-azure-starter-storage/pom.xml # sdk/spring/spring-cloud-azure-starter-stream-eventhubs/pom.xml # sdk/spring/spring-cloud-azure-starter-stream-servicebus/pom.xml # sdk/spring/spring-cloud-azure-starter/pom.xml # sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/CHANGELOG.md # sdk/spring/spring-cloud-azure-stream-binder-eventhubs-core/pom.xml # sdk/spring/spring-cloud-azure-stream-binder-eventhubs/CHANGELOG.md # sdk/spring/spring-cloud-azure-stream-binder-eventhubs/pom.xml # sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/CHANGELOG.md # sdk/spring/spring-cloud-azure-stream-binder-servicebus-core/pom.xml # sdk/spring/spring-cloud-azure-stream-binder-servicebus/CHANGELOG.md # sdk/spring/spring-cloud-azure-stream-binder-servicebus/pom.xml # sdk/spring/spring-cloud-azure-trace-sleuth/CHANGELOG.md # sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml # sdk/spring/spring-integration-azure-core/CHANGELOG.md # sdk/spring/spring-integration-azure-core/pom.xml # sdk/spring/spring-integration-azure-eventhubs/CHANGELOG.md # sdk/spring/spring-integration-azure-eventhubs/pom.xml # sdk/spring/spring-integration-azure-servicebus/CHANGELOG.md # sdk/spring/spring-integration-azure-servicebus/pom.xml # sdk/spring/spring-integration-azure-storage-queue/CHANGELOG.md # sdk/spring/spring-integration-azure-storage-queue/pom.xml # sdk/spring/spring-messaging-azure-eventhubs/CHANGELOG.md # sdk/spring/spring-messaging-azure-eventhubs/pom.xml # sdk/spring/spring-messaging-azure-servicebus/CHANGELOG.md # sdk/spring/spring-messaging-azure-servicebus/pom.xml # sdk/spring/spring-messaging-azure-storage-queue/CHANGELOG.md # sdk/spring/spring-messaging-azure-storage-queue/pom.xml # sdk/spring/spring-messaging-azure/CHANGELOG.md # sdk/spring/spring-messaging-azure/pom.xml
Collaborator
|
API change check API changes are not detected in this pull request. |
Netyyyy
marked this pull request as ready for review
November 1, 2022 07:18
Netyyyy
requested review from
JonathanGiles,
backwind1233,
chenrujun,
fangjian0423,
hui1110,
moarychan,
mssfang,
saragluna,
stliu and
yiliuTo
as code owners
November 1, 2022 07:18
chenrujun
suggested changes
Nov 1, 2022
| import java.net.Proxy; | ||
|
|
||
| @Configuration | ||
| public class RestTemplateProxyCustomizerConfiguration { |
There was a problem hiding this comment.
It should be in source/test/java folder.
It's my mistake.
Could you please help to fix it in this PR?
It won't cause any API change problem because it's in implementation package.
Let's ignore this error in the 4.4.1 version.
There was a problem hiding this comment.
In this PR: https://github.com/Azure/azure-sdk-for-java/pull/31665/files
I didn't use cherry-pick to avoid conflicts.
When copy file, I put it in the wrong folder.
chenrujun
approved these changes
Nov 1, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As title.