diff --git a/eng/versioning/pom_file_version_scanner.ps1 b/eng/versioning/pom_file_version_scanner.ps1
index 472e946e8a858..6bccd6577f1fe 100644
--- a/eng/versioning/pom_file_version_scanner.ps1
+++ b/eng/versioning/pom_file_version_scanner.ps1
@@ -37,7 +37,7 @@ $ValidParents = ("azure-sdk-parent", "azure-client-sdk-parent", "azure-data-sdk-
# The problem with this is, it's a BOM file and the spring dependencies are pulled in through that which means any
# dependencies may or may not have versions. Unfortunately, there are still version tags azure sdk client libraries
# which means these files have to be "sort of" scanned.
-$SpringSampleParents = ("spring-boot-starter-parent")
+$SpringSampleParents = ("spring-boot-starter-parent", "azure-spring-boot-test-parent")
$Path = Resolve-Path ($PSScriptRoot + "/../../")
diff --git a/eng/versioning/update_versions.py b/eng/versioning/update_versions.py
index 4366dbf3fdd9e..f5fb1e9b63b73 100644
--- a/eng/versioning/update_versions.py
+++ b/eng/versioning/update_versions.py
@@ -230,7 +230,7 @@ def update_versions_all(update_type, build_type, target_file, skip_readme, auto_
for root, _, files in os.walk("."):
for file_name in files:
file_path = root + os.sep + file_name
- if (file_name.endswith('.md') and not skip_readme) or (file_name.startswith('pom.') and file_name.endswith('.xml')):
+ if (file_name.endswith('.md') and not skip_readme) or (file_name.startswith('pom') and file_name.endswith('.xml')):
update_versions(update_type, version_map, ext_dep_map, file_path, skip_readme, auto_version_increment)
# This is a temporary stop gap to deal with versions hard coded in java files.
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index bcd3aef5a4988..753220635becd 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -151,6 +151,8 @@ com.azure.spring:azure-spring-boot-test-aad-resource-server-by-filter;1.0.0;1.0.
com.azure.spring:azure-spring-boot-test-core;1.0.0;1.0.0
com.azure.spring:azure-spring-boot-test-cosmosdb;1.0.0;1.0.0
com.azure.spring:azure-spring-boot-test-keyvault;1.0.0;1.0.0
+com.azure.spring:azure-spring-boot-test-keyvault-reactive;1.0.0;1.0.0
+com.azure.spring:azure-spring-boot-test-parent;1.0.0;1.0.0
com.azure.spring:azure-spring-boot-test-servicebus-jms;1.0.0;1.0.0
com.azure.spring:azure-spring-cloud-test-eventhubs;1.0.0;1.0.0
com.azure.spring:azure-spring-cloud-test-storage;1.0.0;1.0.0
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 9ddedfb976cfd..5894d58642f74 100644
--- a/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml
@@ -2,15 +2,16 @@
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- 4.0.0
- com.azure.spring
azure-spring-boot-test-aad-b2c
1.0.0
@@ -25,28 +26,25 @@
org.springframework.boot
spring-boot-starter-web
-
org.springframework.boot
spring-boot-starter-thymeleaf
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
org.springframework.boot
spring-boot-starter-security
-
org.thymeleaf.extras
thymeleaf-extras-springsecurity5
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
com.azure.spring
azure-spring-boot-test-selenium-common
@@ -55,20 +53,4 @@
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
-
-
\ No newline at end of file
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 2d10e275df57d..2ec60d3dc96fc 100644
--- a/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad-obo/pom.xml
@@ -2,15 +2,16 @@
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- 4.0.0
- com.azure.spring
azure-spring-boot-test-aad-obo
1.0.0
@@ -49,20 +50,4 @@
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
-
-
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 aab79926ac53a..aa02fc296fa0c 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
@@ -2,15 +2,16 @@
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- 4.0.0
- com.azure.spring
azure-spring-boot-test-aad-resource-server-by-filter
1.0.0
@@ -41,20 +42,4 @@
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
-
-
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 f6383c959a5a6..96964134455d3 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
@@ -2,15 +2,16 @@
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- 4.0.0
- com.azure.spring
azure-spring-boot-test-aad-resource-server
1.0.0
@@ -45,20 +46,4 @@
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
-
-
diff --git a/sdk/spring/azure-spring-boot-test-aad/pom.xml b/sdk/spring/azure-spring-boot-test-aad/pom.xml
index 8f0a7df57dde8..a5b6e27517230 100644
--- a/sdk/spring/azure-spring-boot-test-aad/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-aad/pom.xml
@@ -2,15 +2,16 @@
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- 4.0.0
- com.azure.spring
azure-spring-boot-test-aad
1.0.0
@@ -45,20 +46,4 @@
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
-
-
diff --git a/sdk/spring/azure-spring-boot-test-application/pom.xml b/sdk/spring/azure-spring-boot-test-application/pom.xml
index 632c75098e97f..4c7aa11c47a97 100644
--- a/sdk/spring/azure-spring-boot-test-application/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-application/pom.xml
@@ -2,18 +2,18 @@
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- 4.0.0
- com.azure.spring
azure-spring-boot-test-application
1.0.0
- jar
1.8
@@ -26,13 +26,11 @@
org.springframework.boot
spring-boot-starter-web
-
org.springframework.boot
spring-boot-starter-test
test
-
com.azure.spring
azure-spring-boot-starter-keyvault-secrets
diff --git a/sdk/spring/azure-spring-boot-test-core/pom.xml b/sdk/spring/azure-spring-boot-test-core/pom.xml
index 3380b36b5a572..c5461d66df871 100644
--- a/sdk/spring/azure-spring-boot-test-core/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-core/pom.xml
@@ -2,18 +2,19 @@
+
+ 4.0.0
+
org.springframework.boot
spring-boot-starter-parent
2.3.7.RELEASE
- 4.0.0
com.azure.spring
azure-spring-boot-test-core
1.0.0
- jar
@@ -25,10 +26,6 @@
spring-context
5.2.10.RELEASE
-
- org.springframework.boot
- spring-boot-starter-web
-
org.apache.maven
maven-embedder
diff --git a/sdk/spring/azure-spring-boot-test-cosmos/pom.xml b/sdk/spring/azure-spring-boot-test-cosmos/pom.xml
index 298e9296b20e6..37d0ace166f97 100644
--- a/sdk/spring/azure-spring-boot-test-cosmos/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-cosmos/pom.xml
@@ -2,15 +2,16 @@
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- 4.0.0
- com.azure.spring
azure-spring-boot-test-cosmos
1.0.0
@@ -44,21 +45,4 @@
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
-
-
-
diff --git a/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml b/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml
new file mode 100644
index 0000000000000..b37d6735ba72a
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-test-keyvault/pom-reactive.xml
@@ -0,0 +1,59 @@
+
+
+
+ 4.0.0
+
+
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
+
+
+ azure-spring-boot-test-keyvault-reactive
+ 1.0.0
+
+
+
+ com.azure.spring
+ azure-spring-boot-starter-keyvault-secrets
+ 3.1.0
+
+
+ com.azure.spring
+ azure-spring-boot-test-core
+ 1.0.0
+
+
+ com.microsoft.azure
+ azure
+ 1.34.0
+
+
+ com.fasterxml.jackson.core
+ jackson-core
+
+
+ com.google.code.gson
+ gson
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-webflux
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
diff --git a/sdk/spring/azure-spring-boot-test-keyvault/pom.xml b/sdk/spring/azure-spring-boot-test-keyvault/pom.xml
index 49cf8c6009a19..7d39359ef2c7f 100644
--- a/sdk/spring/azure-spring-boot-test-keyvault/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-keyvault/pom.xml
@@ -2,32 +2,20 @@
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- 4.0.0
- com.azure.spring
azure-spring-boot-test-keyvault
1.0.0
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
-
- org.springframework.boot
- spring-boot-starter-web
-
com.azure.spring
azure-spring-boot-starter-keyvault-secrets
@@ -53,22 +41,19 @@
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
-
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
-
-
diff --git a/sdk/spring/azure-spring-boot-test-parent/CHANGELOG.md b/sdk/spring/azure-spring-boot-test-parent/CHANGELOG.md
new file mode 100644
index 0000000000000..3bae488de73c9
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-test-parent/CHANGELOG.md
@@ -0,0 +1,3 @@
+# Release History
+
+## 1.0.0 (Unreleased)
diff --git a/sdk/spring/azure-spring-boot-test-parent/README.md b/sdk/spring/azure-spring-boot-test-parent/README.md
new file mode 100644
index 0000000000000..bc18d9e9c993c
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-test-parent/README.md
@@ -0,0 +1,8 @@
+# Azure Spring Boot Integration tests client library for Java
+
+## Key concepts
+## Getting started
+## Examples
+## Troubleshooting
+## Next steps
+## Contributing
diff --git a/sdk/spring/azure-spring-boot-test-parent/pom.xml b/sdk/spring/azure-spring-boot-test-parent/pom.xml
new file mode 100644
index 0000000000000..c74dc1a3d7618
--- /dev/null
+++ b/sdk/spring/azure-spring-boot-test-parent/pom.xml
@@ -0,0 +1,57 @@
+
+
+
+ 4.0.0
+
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.3.7.RELEASE
+
+
+
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ pom
+
+
+ true
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ Hoxton.SR8
+ pom
+ import
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 2.22.0
+
+
+ default
+
+ integration-test
+
+
+ ${skipSpringITs}
+
+
+
+
+
+
+
+
diff --git a/sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml b/sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml
index f81e6e642c3a0..a36d1ca310994 100644
--- a/sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml
@@ -1,54 +1,37 @@
- 4.0.0
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ 4.0.0
+
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- com.azure.spring
- azure-spring-boot-test-servicebus-jms
- 1.0.0
-
-
- 1.8
- true
-
+ azure-spring-boot-test-servicebus-jms
+ 1.0.0
-
+
com.azure.spring
azure-spring-boot-starter-servicebus-jms
3.2.0-beta.1
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.junit.vintage
- junit-vintage-engine
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
-
-
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.junit.vintage
+ junit-vintage-engine
+
+
+
+
diff --git a/sdk/spring/azure-spring-boot-test-storage/pom.xml b/sdk/spring/azure-spring-boot-test-storage/pom.xml
index 62f2ccf9d6196..734023e39079b 100644
--- a/sdk/spring/azure-spring-boot-test-storage/pom.xml
+++ b/sdk/spring/azure-spring-boot-test-storage/pom.xml
@@ -2,23 +2,19 @@
+
4.0.0
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- com.azure.spring
azure-spring-boot-test-storage
1.0.0
-
- true
-
-
com.azure.spring
@@ -68,14 +64,6 @@
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
diff --git a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
index 87cf54b0c5037..8c35f4ce69332 100644
--- a/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
+++ b/sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml
@@ -2,39 +2,22 @@
+
4.0.0
- org.springframework.boot
- spring-boot-starter-parent
- 2.3.7.RELEASE
-
+ com.azure.spring
+ azure-spring-boot-test-parent
+ 1.0.0
+ ../azure-spring-boot-test-parent
- com.azure.spring
azure-spring-cloud-test-eventhubs
1.0.0
azure-spring-cloud-test-eventhubs
EventHubs Test project for Spring Cloud
-
- 1.8
- true
-
-
-
-
-
- org.springframework.cloud
- spring-cloud-dependencies
- Hoxton.SR8
- pom
- import
-
-
-
-
org.springframework.cloud
@@ -80,14 +63,6 @@
-
- org.apache.maven.plugins
- maven-failsafe-plugin
- 2.22.0
-
- ${skipSpringITs}
-
-
diff --git a/sdk/spring/pom.xml b/sdk/spring/pom.xml
index 2551dfc7cf1c8..fb2f29214bfc0 100644
--- a/sdk/spring/pom.xml
+++ b/sdk/spring/pom.xml
@@ -191,7 +191,9 @@
azure-spring-boot-test-selenium-common
azure-spring-boot-test-core
azure-spring-boot-test-cosmos
- azure-spring-boot-test-keyvault
+ azure-spring-boot-test-keyvault/pom.xml
+ azure-spring-boot-test-keyvault/pom-reactive.xml
+ azure-spring-boot-test-parent
azure-spring-boot-test-servicebus-jms
azure-spring-boot-test-storage
azure-spring-boot
diff --git a/sdk/spring/scripts/replace_util.py b/sdk/spring/scripts/replace_util.py
index db9ef7d7cb866..ff905d83fde3f 100644
--- a/sdk/spring/scripts/replace_util.py
+++ b/sdk/spring/scripts/replace_util.py
@@ -33,52 +33,7 @@
}
},
'spring': {
- 'sdk/spring/azure-spring-boot-test-core/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-boot-test-aad/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-boot-test-aad-obo/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-boot-test-application/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-boot-test-cosmos/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-boot-test-keyvault/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-boot-test-storage/pom.xml': {
- VERSION_UPDATE_ITEMS: (
- VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
- )
- },
- 'sdk/spring/azure-spring-cloud-test-eventhubs/pom.xml': {
+ 'sdk/spring/azure-spring-boot-test-parent/pom.xml': {
VERSION_UPDATE_ITEMS: (
VersionUpdateItem('org.springframework.boot:spring-boot-starter-parent', '2.2.11.RELEASE'),
)
diff --git a/sdk/spring/tests.yml b/sdk/spring/tests.yml
index 507c636d9f60f..1e33f99ead27b 100644
--- a/sdk/spring/tests.yml
+++ b/sdk/spring/tests.yml
@@ -37,6 +37,12 @@ jobs:
- name: azure-spring-boot-test-keyvault
groupId: com.azure.spring
safeName: azurespringboottestkeyvault
+ - name: azure-spring-boot-test-keyvault-reactive
+ groupId: com.azure.spring
+ safeName: azurespringboottestkeyvaultreactive
+ - name: azure-spring-boot-test-parent
+ groupId: com.azure.spring
+ safeName: azurespringboottestparent
- name: azure-spring-boot-test-servicebus-jms
groupId: com.azure.spring
safeName: azurespringboottestservicebusjms