Skip to content

Commit 528b736

Browse files
author
Rujun Chen
authored
Make azure-spring-boot-test-keyvault support both spring-web and spring-webflux. (Azure#18670)
1 parent 02314dd commit 528b736

File tree

22 files changed

+252
-328
lines changed

22 files changed

+252
-328
lines changed

‎eng/versioning/pom_file_version_scanner.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $ValidParents = ("azure-sdk-parent", "azure-client-sdk-parent", "azure-data-sdk-
3737
# The problem with this is, it's a BOM file and the spring dependencies are pulled in through that which means any
3838
# dependencies may or may not have versions. Unfortunately, there are still version tags azure sdk client libraries
3939
# which means these files have to be "sort of" scanned.
40-
$SpringSampleParents = ("spring-boot-starter-parent")
40+
$SpringSampleParents = ("spring-boot-starter-parent", "azure-spring-boot-test-parent")
4141

4242
$Path = Resolve-Path ($PSScriptRoot + "/../../")
4343

‎eng/versioning/update_versions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def update_versions_all(update_type, build_type, target_file, skip_readme, auto_
230230
for root, _, files in os.walk("."):
231231
for file_name in files:
232232
file_path = root + os.sep + file_name
233-
if (file_name.endswith('.md') and not skip_readme) or (file_name.startswith('pom.') and file_name.endswith('.xml')):
233+
if (file_name.endswith('.md') and not skip_readme) or (file_name.startswith('pom') and file_name.endswith('.xml')):
234234
update_versions(update_type, version_map, ext_dep_map, file_path, skip_readme, auto_version_increment)
235235

236236
# This is a temporary stop gap to deal with versions hard coded in java files.

‎eng/versioning/version_client.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ com.azure.spring:azure-spring-boot-test-aad-resource-server-by-filter;1.0.0;1.0.
151151
com.azure.spring:azure-spring-boot-test-core;1.0.0;1.0.0
152152
com.azure.spring:azure-spring-boot-test-cosmosdb;1.0.0;1.0.0
153153
com.azure.spring:azure-spring-boot-test-keyvault;1.0.0;1.0.0
154+
com.azure.spring:azure-spring-boot-test-keyvault-reactive;1.0.0;1.0.0
155+
com.azure.spring:azure-spring-boot-test-parent;1.0.0;1.0.0
154156
com.azure.spring:azure-spring-boot-test-servicebus-jms;1.0.0;1.0.0
155157
com.azure.spring:azure-spring-cloud-test-eventhubs;1.0.0;1.0.0
156158
com.azure.spring:azure-spring-cloud-test-storage;1.0.0;1.0.0

‎sdk/spring/azure-spring-boot-test-aad-b2c/pom.xml‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
58
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.7.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
9-
<relativePath/> <!-- lookup parent from repository -->
9+
<groupId>com.azure.spring</groupId>
10+
<artifactId>azure-spring-boot-test-parent</artifactId>
11+
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-parent;current} -->
12+
<relativePath>../azure-spring-boot-test-parent</relativePath>
1013
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1214

13-
<groupId>com.azure.spring</groupId>
1415
<artifactId>azure-spring-boot-test-aad-b2c</artifactId>
1516
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-b2c;current} -->
1617

@@ -25,28 +26,25 @@
2526
<groupId>org.springframework.boot</groupId>
2627
<artifactId>spring-boot-starter-web</artifactId>
2728
</dependency>
28-
2929
<dependency>
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-thymeleaf</artifactId>
3232
</dependency>
33-
34-
<dependency>
35-
<groupId>org.springframework.boot</groupId>
36-
<artifactId>spring-boot-starter-test</artifactId>
37-
<scope>test</scope>
38-
</dependency>
39-
4033
<dependency>
4134
<groupId>org.springframework.boot</groupId>
4235
<artifactId>spring-boot-starter-security</artifactId>
4336
</dependency>
44-
4537
<dependency>
4638
<groupId>org.thymeleaf.extras</groupId>
4739
<artifactId>thymeleaf-extras-springsecurity5</artifactId>
4840
</dependency>
4941

42+
<!-- test dependencies. -->
43+
<dependency>
44+
<groupId>org.springframework.boot</groupId>
45+
<artifactId>spring-boot-starter-test</artifactId>
46+
<scope>test</scope>
47+
</dependency>
5048
<dependency>
5149
<groupId>com.azure.spring</groupId>
5250
<artifactId>azure-spring-boot-test-selenium-common</artifactId>
@@ -55,20 +53,4 @@
5553
</dependency>
5654
</dependencies>
5755

58-
<properties>
59-
<skipSpringITs>true</skipSpringITs>
60-
</properties>
61-
62-
<build>
63-
<plugins>
64-
<plugin>
65-
<groupId>org.apache.maven.plugins</groupId>
66-
<artifactId>maven-failsafe-plugin</artifactId>
67-
<version>2.22.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-failsafe-plugin;external_dependency} -->
68-
<configuration>
69-
<skipITs>${skipSpringITs}</skipITs>
70-
</configuration>
71-
</plugin>
72-
</plugins>
73-
</build>
7456
</project>

‎sdk/spring/azure-spring-boot-test-aad-obo/pom.xml‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
58
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.7.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
9-
<relativePath/> <!-- lookup parent from repository -->
9+
<groupId>com.azure.spring</groupId>
10+
<artifactId>azure-spring-boot-test-parent</artifactId>
11+
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-parent;current} -->
12+
<relativePath>../azure-spring-boot-test-parent</relativePath>
1013
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1214

13-
<groupId>com.azure.spring</groupId>
1415
<artifactId>azure-spring-boot-test-aad-obo</artifactId>
1516
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-aad-obo;current} -->
1617

@@ -49,20 +50,4 @@
4950
</dependency>
5051
</dependencies>
5152

52-
<properties>
53-
<skipSpringITs>true</skipSpringITs>
54-
</properties>
55-
56-
<build>
57-
<plugins>
58-
<plugin>
59-
<groupId>org.apache.maven.plugins</groupId>
60-
<artifactId>maven-failsafe-plugin</artifactId>
61-
<version>2.22.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-failsafe-plugin;external_dependency} -->
62-
<configuration>
63-
<skipITs>${skipSpringITs}</skipITs>
64-
</configuration>
65-
</plugin>
66-
</plugins>
67-
</build>
6853
</project>

‎sdk/spring/azure-spring-boot-test-aad-resource-server-by-filter/pom.xml‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
58
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.7.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
9-
<relativePath/> <!-- lookup parent from repository -->
9+
<groupId>com.azure.spring</groupId>
10+
<artifactId>azure-spring-boot-test-parent</artifactId>
11+
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-parent;current} -->
12+
<relativePath>../azure-spring-boot-test-parent</relativePath>
1013
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1214

13-
<groupId>com.azure.spring</groupId>
1415
<artifactId>azure-spring-boot-test-aad-resource-server-by-filter</artifactId>
1516
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-aad;current} -->
1617

@@ -41,20 +42,4 @@
4142
</dependency>
4243
</dependencies>
4344

44-
<properties>
45-
<skipSpringITs>true</skipSpringITs>
46-
</properties>
47-
48-
<build>
49-
<plugins>
50-
<plugin>
51-
<groupId>org.apache.maven.plugins</groupId>
52-
<artifactId>maven-failsafe-plugin</artifactId>
53-
<version>2.22.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-failsafe-plugin;external_dependency} -->
54-
<configuration>
55-
<skipITs>${skipSpringITs}</skipITs>
56-
</configuration>
57-
</plugin>
58-
</plugins>
59-
</build>
6045
</project>

‎sdk/spring/azure-spring-boot-test-aad-resource-server/pom.xml‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
58
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.7.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
9-
<relativePath/> <!-- lookup parent from repository -->
9+
<groupId>com.azure.spring</groupId>
10+
<artifactId>azure-spring-boot-test-parent</artifactId>
11+
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-parent;current} -->
12+
<relativePath>../azure-spring-boot-test-parent</relativePath>
1013
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1214

13-
<groupId>com.azure.spring</groupId>
1415
<artifactId>azure-spring-boot-test-aad-resource-server</artifactId>
1516
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-aad-resource-server;current} -->
1617

@@ -45,20 +46,4 @@
4546
</dependency>
4647
</dependencies>
4748

48-
<properties>
49-
<skipSpringITs>true</skipSpringITs>
50-
</properties>
51-
52-
<build>
53-
<plugins>
54-
<plugin>
55-
<groupId>org.apache.maven.plugins</groupId>
56-
<artifactId>maven-failsafe-plugin</artifactId>
57-
<version>2.22.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-failsafe-plugin;external_dependency} -->
58-
<configuration>
59-
<skipITs>${skipSpringITs}</skipITs>
60-
</configuration>
61-
</plugin>
62-
</plugins>
63-
</build>
6449
</project>

‎sdk/spring/azure-spring-boot-test-aad/pom.xml‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
58
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.7.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
9-
<relativePath/> <!-- lookup parent from repository -->
9+
<groupId>com.azure.spring</groupId>
10+
<artifactId>azure-spring-boot-test-parent</artifactId>
11+
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-parent;current} -->
12+
<relativePath>../azure-spring-boot-test-parent</relativePath>
1013
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1214

13-
<groupId>com.azure.spring</groupId>
1415
<artifactId>azure-spring-boot-test-aad</artifactId>
1516
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-aad;current} -->
1617

@@ -45,20 +46,4 @@
4546
</dependency>
4647
</dependencies>
4748

48-
<properties>
49-
<skipSpringITs>true</skipSpringITs>
50-
</properties>
51-
52-
<build>
53-
<plugins>
54-
<plugin>
55-
<groupId>org.apache.maven.plugins</groupId>
56-
<artifactId>maven-failsafe-plugin</artifactId>
57-
<version>2.22.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-failsafe-plugin;external_dependency} -->
58-
<configuration>
59-
<skipITs>${skipSpringITs}</skipITs>
60-
</configuration>
61-
</plugin>
62-
</plugins>
63-
</build>
6449
</project>

‎sdk/spring/azure-spring-boot-test-application/pom.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
58
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.7.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
9-
<relativePath/> <!-- lookup parent from repository -->
9+
<groupId>com.azure.spring</groupId>
10+
<artifactId>azure-spring-boot-test-parent</artifactId>
11+
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-parent;current} -->
12+
<relativePath>../azure-spring-boot-test-parent</relativePath>
1013
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1214

13-
<groupId>com.azure.spring</groupId>
1415
<artifactId>azure-spring-boot-test-application</artifactId>
1516
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-application;current} -->
16-
<packaging>jar</packaging>
1717

1818
<properties>
1919
<java.version>1.8</java.version>
@@ -26,13 +26,11 @@
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-web</artifactId>
2828
</dependency>
29-
3029
<dependency>
3130
<groupId>org.springframework.boot</groupId>
3231
<artifactId>spring-boot-starter-test</artifactId>
3332
<scope>test</scope>
3433
</dependency>
35-
3634
<dependency>
3735
<groupId>com.azure.spring</groupId>
3836
<artifactId>azure-spring-boot-starter-keyvault-secrets</artifactId>

‎sdk/spring/azure-spring-boot-test-core/pom.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
6+
<modelVersion>4.0.0</modelVersion>
7+
58
<parent>
69
<groupId>org.springframework.boot</groupId>
710
<artifactId>spring-boot-starter-parent</artifactId>
811
<version>2.3.7.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
912
<relativePath/> <!-- lookup parent from repository -->
1013
</parent>
11-
<modelVersion>4.0.0</modelVersion>
1214

1315
<groupId>com.azure.spring</groupId>
1416
<artifactId>azure-spring-boot-test-core</artifactId>
1517
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-core;current} -->
16-
<packaging>jar</packaging>
1718

1819
<dependencies>
1920
<dependency>
@@ -25,10 +26,6 @@
2526
<artifactId>spring-context</artifactId>
2627
<version>5.2.10.RELEASE</version> <!-- {x-version-update;org.springframework:spring-context;external_dependency} -->
2728
</dependency>
28-
<dependency>
29-
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-web</artifactId>
31-
</dependency>
3229
<dependency>
3330
<groupId>org.apache.maven</groupId>
3431
<artifactId>maven-embedder</artifactId>

0 commit comments

Comments
 (0)