From 7536e0a83a77ba5011d88790d015a68ea9526339 Mon Sep 17 00:00:00 2001
From: Moary Chen <v-shilichen@microsoft.com>
Date: Fri, 4 Nov 2022 14:25:56 +0800
Subject: [PATCH] Use the jdbc release version (#31931)

---
 eng/versioning/version_client.txt             |  3 ---
 .../spring-cloud-azure-dependencies/pom.xml   | 22 +++++++++++++++++++
 .../spring-cloud-azure-autoconfigure/pom.xml  |  4 ++--
 sdk/spring/spring-cloud-azure-service/pom.xml |  2 +-
 .../pom.xml                                   | 18 ++++++++++++++-
 .../pom.xml                                   | 18 ++++++++++++++-
 6 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index e3a5fb499c90..591adeb88202 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -394,9 +394,6 @@ com.azure.tools:azure-sdk-build-tool;1.0.0-beta.1;1.0.0-beta.2
 # In the pom, the version update tag after the version should name the unreleased package and the dependency version:
 # <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
 unreleased_com.azure:azure-identity;1.7.0-beta.2
-unreleased_com.azure:azure-identity-providers-core;1.0.0-beta.2
-unreleased_com.azure:azure-identity-providers-jdbc-mysql;1.0.0-beta.2
-unreleased_com.azure:azure-identity-providers-jdbc-postgresql;1.0.0-beta.2
 unreleased_com.azure:azure-core-amqp;2.8.0-beta.1
 
 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
diff --git a/sdk/boms/spring-cloud-azure-dependencies/pom.xml b/sdk/boms/spring-cloud-azure-dependencies/pom.xml
index 62b574834f0c..ccf77e7c6ec1 100644
--- a/sdk/boms/spring-cloud-azure-dependencies/pom.xml
+++ b/sdk/boms/spring-cloud-azure-dependencies/pom.xml
@@ -61,6 +61,18 @@
         <version>2.20.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
       </dependency>
 
+      <dependency>
+        <groupId>com.azure</groupId>
+        <artifactId>azure-identity-providers-jdbc-mysql</artifactId>
+        <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity-providers-jdbc-mysql;dependency} -->
+      </dependency>
+
+      <dependency>
+        <groupId>com.azure</groupId>
+        <artifactId>azure-identity-providers-jdbc-postgresql</artifactId>
+        <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity-providers-jdbc-postgresql;dependency} -->
+      </dependency>
+
       <!-- Spring Cloud Azure -->
       <dependency>
         <groupId>com.azure.spring</groupId>
@@ -264,6 +276,16 @@
         <artifactId>spring-messaging-azure-storage-queue</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-jdbc-mysql</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.azure.spring</groupId>
+        <artifactId>spring-cloud-azure-starter-jdbc-postgresql</artifactId>
+        <version>${project.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
index 7b88715c3209..26d7b177c1a3 100644
--- a/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
+++ b/sdk/spring/spring-cloud-azure-autoconfigure/pom.xml
@@ -276,14 +276,14 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity-providers-jdbc-mysql</artifactId>
-      <version>1.0.0-beta.2</version> <!-- {x-version-update;unreleased_com.azure:azure-identity-providers-jdbc-mysql;dependency} -->
+      <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity-providers-jdbc-mysql;dependency} -->
       <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity-providers-jdbc-postgresql</artifactId>
-      <version>1.0.0-beta.2</version> <!-- {x-version-update;unreleased_com.azure:azure-identity-providers-jdbc-postgresql;dependency} -->
+      <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity-providers-jdbc-postgresql;dependency} -->
       <optional>true</optional>
     </dependency>
 
diff --git a/sdk/spring/spring-cloud-azure-service/pom.xml b/sdk/spring/spring-cloud-azure-service/pom.xml
index f0cb5bfd94c4..b35745415337 100644
--- a/sdk/spring/spring-cloud-azure-service/pom.xml
+++ b/sdk/spring/spring-cloud-azure-service/pom.xml
@@ -111,7 +111,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity-providers-core</artifactId>
-      <version>1.0.0-beta.2</version> <!-- {x-version-update;unreleased_com.azure:azure-identity-providers-core;dependency} -->
+      <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity-providers-core;dependency} -->
       <optional>true</optional>
     </dependency>
 
diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml
index ad73d03cf7d8..88cea95f98d6 100644
--- a/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml
+++ b/sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml
@@ -55,6 +55,14 @@
         <updatePolicy>daily</updatePolicy>
       </snapshots>
     </repository>
+    <repository>
+      <id>spring-milestones</id>
+      <name>Spring Milestones</name>
+      <url>https://repo.spring.io/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
   </repositories>
 
   <pluginRepositories>
@@ -68,6 +76,14 @@
         <updatePolicy>always</updatePolicy>
       </snapshots>
     </pluginRepository>
+    <pluginRepository>
+      <id>spring-milestones</id>
+      <name>Spring Milestones</name>
+      <url>https://repo.spring.io/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
   </pluginRepositories>
 
   <distributionManagement>
@@ -94,7 +110,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity-providers-jdbc-mysql</artifactId>
-      <version>1.0.0-beta.2</version> <!-- {x-version-update;unreleased_com.azure:azure-identity-providers-jdbc-mysql;dependency} -->
+      <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity-providers-jdbc-mysql;dependency} -->
     </dependency>
 
     <dependency>
diff --git a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml
index 1710d59b432a..6b098328bee4 100644
--- a/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml
+++ b/sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml
@@ -55,6 +55,14 @@
         <updatePolicy>daily</updatePolicy>
       </snapshots>
     </repository>
+    <repository>
+      <id>spring-milestones</id>
+      <name>Spring Milestones</name>
+      <url>https://repo.spring.io/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
   </repositories>
 
   <pluginRepositories>
@@ -68,6 +76,14 @@
         <updatePolicy>always</updatePolicy>
       </snapshots>
     </pluginRepository>
+    <pluginRepository>
+      <id>spring-milestones</id>
+      <name>Spring Milestones</name>
+      <url>https://repo.spring.io/milestone</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </pluginRepository>
   </pluginRepositories>
 
   <distributionManagement>
@@ -94,7 +110,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity-providers-jdbc-postgresql</artifactId>
-      <version>1.0.0-beta.2</version> <!-- {x-version-update;unreleased_com.azure:azure-identity-providers-jdbc-postgresql;dependency} -->
+      <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity-providers-jdbc-postgresql;dependency} -->
     </dependency>
 
     <dependency>