Skip to content

Merge spring-cloud-azure_4.4.1 to main - #31857

Merged
chenrujun merged 15 commits into
Azure:mainfrom
Netyyyy:myao/merge441tomain
Nov 1, 2022
Merged

Merge spring-cloud-azure_4.4.1 to main#31857
chenrujun merged 15 commits into
Azure:mainfrom
Netyyyy:myao/merge441tomain

Conversation

@Netyyyy

@Netyyyy Netyyyy commented Nov 1, 2022

Copy link
Copy Markdown
Contributor

As title.

saragluna and others added 9 commits September 26, 2022 11:16
* 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
@ghost ghost added the azure-spring All azure-spring related issues label Nov 1, 2022
@azure-sdk

Copy link
Copy Markdown
Collaborator

API change check

API changes are not detected in this pull request.

import java.net.Proxy;

@Configuration
public class RestTemplateProxyCustomizerConfiguration {

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What caused this?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
chenrujun enabled auto-merge (squash) November 1, 2022 08:37
@chenrujun
chenrujun merged commit 403a14b into Azure:main Nov 1, 2022
@Netyyyy
Netyyyy deleted the myao/merge441tomain branch November 10, 2022 02:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

azure-spring All azure-spring related issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants