diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml
index 2eb730687d70a..06a85a8b72297 100644
--- a/eng/jacoco-test-coverage/pom.xml
+++ b/eng/jacoco-test-coverage/pom.xml
@@ -415,7 +415,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
com.azure.spring
@@ -425,7 +425,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
com.azure.spring
@@ -440,12 +440,12 @@
com.azure.spring
azure-spring-boot-starter-active-directory-b2c
- 3.6.0
+ 3.7.0-beta.1
com.azure.spring
azure-spring-boot-starter-cosmos
- 3.6.0
+ 3.7.0-beta.1
com.azure.spring
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index d5ec52099c722..c693f6ebdd921 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -143,15 +143,15 @@ com.azure.spring:azure-spring-cloud-feature-management-web;2.0.0;2.1.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management;2.0.0;2.1.0-beta.1
com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.0.0-beta.2;2.0.0-beta.3
com.azure.spring:azure-identity-spring;1.5.0;1.6.0
-com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.5.0;3.6.0
-com.azure.spring:azure-spring-boot-starter-active-directory;3.5.0;3.6.0
-com.azure.spring:azure-spring-boot-starter-cosmos;3.5.0;3.6.0
+com.azure.spring:azure-spring-boot-starter-active-directory-b2c;3.6.0;3.7.0-beta.1
+com.azure.spring:azure-spring-boot-starter-active-directory;3.6.0;3.7.0-beta.1
+com.azure.spring:azure-spring-boot-starter-cosmos;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-boot-starter-keyvault-certificates;3.0.0-beta.7;3.0.0
com.azure.spring:azure-spring-boot-starter-keyvault-secrets;3.5.0;3.6.0
com.azure.spring:azure-spring-boot-starter-servicebus-jms;3.5.0;3.6.0
com.azure.spring:azure-spring-boot-starter-storage;3.5.0;3.6.0
com.azure.spring:azure-spring-boot-starter;3.5.0;3.6.0
-com.azure.spring:azure-spring-boot;3.5.0;3.6.0
+com.azure.spring:azure-spring-boot;3.6.0;3.7.0-beta.1
com.azure.spring:azure-spring-cloud-autoconfigure;2.5.0;2.6.0
com.azure.spring:azure-spring-cloud-context;2.5.0;2.6.0
com.azure.spring:azure-spring-cloud-messaging;2.5.0;2.6.0
diff --git a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-complete/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-complete/pom.xml
index 0997f8c448ece..7cd107eece542 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-complete/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-complete/pom.xml
@@ -29,7 +29,7 @@
com.azure.spring
azure-spring-boot-starter-cosmos
- 3.6.0
+ 3.7.0-beta.1
com.google.guava
diff --git a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-initial/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-initial/pom.xml
index 353587de90c10..8e8576625e674 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-initial/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-appconfiguration-conversion-sample-initial/pom.xml
@@ -30,7 +30,7 @@
com.azure.spring
azure-spring-boot-starter-cosmos
- 3.6.0
+ 3.7.0-beta.1
com.google.guava
diff --git a/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml
index 77b52cc62d970..5941ed92877fa 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-cloud-foundry-service-sample/pom.xml
@@ -32,7 +32,7 @@
com.azure.spring
azure-spring-boot-starter-cosmos
- 3.6.0
+ 3.7.0-beta.1
com.azure.spring
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml
index 8d1ebaa5a1f1b..34d547df6e7a8 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml
@@ -32,7 +32,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory-b2c
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-resource-server/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-resource-server/pom.xml
index de5407702dad9..134b873039bd1 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-resource-server/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-resource-server/pom.xml
@@ -18,7 +18,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory-b2c
- 3.6.0
+ 3.7.0-beta.1
org.springframework.boot
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter-stateless/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter-stateless/pom.xml
index 9dba0a79011fd..fb53468d03f16 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter-stateless/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter-stateless/pom.xml
@@ -32,7 +32,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter/pom.xml
index 361fb1deedbb3..11fd58fab9466 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-by-filter/pom.xml
@@ -32,7 +32,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml
index 4bd6696f66681..48b26a6358152 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server-obo/pom.xml
@@ -28,7 +28,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml
index 8282b76be2f26..68fdfaf9996e5 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-resource-server/pom.xml
@@ -28,7 +28,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-webapp/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-webapp/pom.xml
index a1c09516b8e63..2aa164fb7ac08 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-webapp/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-webapp/pom.xml
@@ -32,7 +32,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmos/pom.xml b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmos/pom.xml
index 86cb97dc9fd7a..6714ac6a8c330 100644
--- a/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmos/pom.xml
+++ b/sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmos/pom.xml
@@ -32,7 +32,7 @@
com.azure.spring
azure-spring-boot-starter-cosmos
- 3.6.0
+ 3.7.0-beta.1
org.springframework.boot
diff --git a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md
index cc5b7f90eff4f..00d0e89d831f3 100644
--- a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md
+++ b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md
@@ -1,5 +1,8 @@
# Release History
+## 3.7.0-beta.1 (Unreleased)
+
+
## 3.6.0 (2021-06-23)
### Breaking Changes
- Deprecated `allowTelemetry` configuration item.
diff --git a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml
index f38ebabcf7d3c..650ab3d6118b2 100644
--- a/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml
+++ b/sdk/spring/azure-spring-boot-starter-active-directory-b2c/pom.xml
@@ -13,7 +13,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory-b2c
- 3.6.0
+ 3.7.0-beta.1
Azure Spring Boot Starter for Azure AD B2C Spring Security Integration
Spring Boot Starter for Azure AD B2C and Spring Security Integration
@@ -34,7 +34,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md
index d46a6cab4d019..b3a49589f486f 100644
--- a/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md
+++ b/sdk/spring/azure-spring-boot-starter-active-directory/CHANGELOG.md
@@ -1,5 +1,8 @@
# Release History
+## 3.7.0-beta.1 (Unreleased)
+
+
## 3.6.0 (2021-06-23)
### Breaking Changes
- Deprecate aad.group.enable-full-list, use aad.group.allowed-group-ids=all instead.
diff --git a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
index 273dab34ad2a8..4ac09c2ef5fa2 100644
--- a/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
+++ b/sdk/spring/azure-spring-boot-starter-active-directory/pom.xml
@@ -13,7 +13,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
Azure Spring Boot Starter for Azure AD Spring Security Integration
Spring Boot Starter for Azure AD and Spring Security Integration
@@ -38,7 +38,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
org.springframework
diff --git a/sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md b/sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md
index a9e6ef3dfa4dd..64c15b18da692 100644
--- a/sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md
+++ b/sdk/spring/azure-spring-boot-starter-cosmos/CHANGELOG.md
@@ -1,5 +1,8 @@
# Release History
+## 3.7.0-beta.1 (Unreleased)
+
+
## 3.6.0 (2021-06-23)
### Breaking Changes
- Deprecated `allowTelemetry` configuration item.
diff --git a/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml b/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml
index 794fe2e6c746e..aed3f349a46c7 100644
--- a/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml
+++ b/sdk/spring/azure-spring-boot-starter-cosmos/pom.xml
@@ -13,7 +13,7 @@
com.azure.spring
azure-spring-boot-starter-cosmos
- 3.6.0
+ 3.7.0-beta.1
Azure Spring Boot Starter for Azure Cosmos DB
Spring Boot Starter for Azure Document DB service
@@ -33,7 +33,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
com.azure
diff --git a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml
index b0034dc8d04a0..422034c8abff5 100644
--- a/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml
+++ b/sdk/spring/azure-spring-boot-starter-keyvault-secrets/pom.xml
@@ -33,7 +33,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
com.azure
diff --git a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml
index 4cf7e45d4cd1c..712420d1fe205 100644
--- a/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml
+++ b/sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml
@@ -23,7 +23,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-starter-storage/pom.xml b/sdk/spring/azure-spring-boot-starter-storage/pom.xml
index dd4ace6f8cead..a9609534e07a0 100644
--- a/sdk/spring/azure-spring-boot-starter-storage/pom.xml
+++ b/sdk/spring/azure-spring-boot-starter-storage/pom.xml
@@ -23,7 +23,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-starter/pom.xml b/sdk/spring/azure-spring-boot-starter/pom.xml
index 14969e4538749..126b2c21b7897 100644
--- a/sdk/spring/azure-spring-boot-starter/pom.xml
+++ b/sdk/spring/azure-spring-boot-starter/pom.xml
@@ -33,7 +33,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml b/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml
index 4016dd64f54ee..95d143585e784 100644
--- a/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml
@@ -20,7 +20,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory-b2c
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml b/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml
index d930218d27051..cea00f56473c9 100644
--- a/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml
@@ -20,7 +20,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml b/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml
index 4b49538152c6a..ef32624bdf60b 100644
--- a/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml
@@ -20,7 +20,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml b/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml
index fa7d877264acf..0348d96e076ea 100644
--- a/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml
@@ -20,7 +20,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-test-aad/pom.xml b/sdk/spring/azure-spring-boot-test-aad/pom.xml
index 94657a8c1d1d7..457a88a85dd89 100644
--- a/sdk/spring/azure-spring-boot-test-aad/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad/pom.xml
@@ -20,7 +20,7 @@
com.azure.spring
azure-spring-boot-starter-active-directory
- 3.6.0
+ 3.7.0-beta.1
diff --git a/sdk/spring/azure-spring-boot-test-cosmos/pom.xml b/sdk/spring/azure-spring-boot-test-cosmos/pom.xml
index f8698f5c2a507..93b4f86bac57a 100644
--- a/sdk/spring/azure-spring-boot-test-cosmos/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-cosmos/pom.xml
@@ -20,7 +20,7 @@
com.azure.spring
azure-spring-boot-starter-cosmos
- 3.6.0
+ 3.7.0-beta.1
com.azure.spring
diff --git a/sdk/spring/azure-spring-boot/CHANGELOG.md b/sdk/spring/azure-spring-boot/CHANGELOG.md
index 1a43a3867df95..81551375ef496 100644
--- a/sdk/spring/azure-spring-boot/CHANGELOG.md
+++ b/sdk/spring/azure-spring-boot/CHANGELOG.md
@@ -1,5 +1,8 @@
# Release History
+## 3.7.0-beta.1 (Unreleased)
+
+
## 3.6.0 (2021-06-23)
### Breaking Changes
- Deprecate aad.group.enable-full-list, use aad.group.allowed-group-ids=all instead.
diff --git a/sdk/spring/azure-spring-boot/pom.xml b/sdk/spring/azure-spring-boot/pom.xml
index 302403998a0bb..89d8dbd9bc1ad 100644
--- a/sdk/spring/azure-spring-boot/pom.xml
+++ b/sdk/spring/azure-spring-boot/pom.xml
@@ -13,7 +13,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
jar
Azure Spring Boot AutoConfigure
diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml
index 82f5f066b84aa..68c0f47a8d47f 100644
--- a/sdk/spring/pom.xml
+++ b/sdk/spring/pom.xml
@@ -37,7 +37,7 @@
com.azure.spring
azure-spring-boot
- 3.6.0
+ 3.7.0-beta.1
com.azure.spring