Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address some issues found when merging code to feature/spring-boot-3 branch #31855

Merged
merged 5 commits into from
Nov 14, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* {@link EnableAutoConfiguration Auto-configuration} for Azure Identify JDBC support.
* Provide Azure AD based authentication with Azure managed MySql and Postgresql services.
*
* @since 4.4.0
* @since 4.5.0-beta.1
saragluna marked this conversation as resolved.
Show resolved Hide resolved
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(DataSourceProperties.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

/**
* Disable this IT in China cloud, because it can't provision MySQL resource in China cloud with test subscription.
* Running test only on 1.1, 4.1, 7.1, 11.1 every year.
* Running test after 2023-02-01 .
*/
@DisabledIfEnvironmentVariable(named = "AZURE_MYSQL_IT_SKIPRUNNING", matches = "skipRunning")
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/spring-cloud-azure-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity-providers-core</artifactId>
<version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity-providers-core;dependency} -->
<version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-identity-providers-core;current} -->
<optional>true</optional>
</dependency>

Expand Down